[cp-patches] DSSI configure bug fixes

[Mark Wielaard]

Hi,

Petteri reported two configure issues with the dssi code. This should
fix them both, but since I don't have dssi installed at the moment I
keep them open for now. Till I (or someone else) can test and confirms
that this fixes the problems.

2005-11-10  Mark Wielaard  <address@hidden>

    Reported by Petteri <address@hidden> bug #24768 and bug #24769.
    * configure.ac (dssi): Change accidental alsa reference to dssi.
    * native/jni/midi-dssi/Makefile.am (libgjsmdssi_la_SOURCES): Add
    dssi_data.h.

Committed,

Mark

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.118
diff -u -r1.118 configure.ac
--- configure.ac        7 Nov 2005 14:25:54 -0000       1.118
+++ configure.ac        10 Nov 2005 10:50:23 -0000
@@ -118,7 +118,7 @@
 dnl -----------------------------------------------------------
 dnl DSSI code (enabled by default)
 dnl -----------------------------------------------------------
-AC_ARG_ENABLE([alsa],
+AC_ARG_ENABLE([dssi],
               [AS_HELP_STRING(--disable-dssi,compile DSSI providers (enable by 
--enable-dssi) [default=yes])],
               [case "${enableval}" in
                 yes) COMPILE_DSSI=yes ;;
Index: native/jni/midi-dssi/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/midi-dssi/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- native/jni/midi-dssi/Makefile.am    23 Oct 2005 16:59:09 -0000      1.2
+++ native/jni/midi-dssi/Makefile.am    10 Nov 2005 10:50:23 -0000
@@ -1,7 +1,8 @@
 nativelib_LTLIBRARIES = libgjsmdssi.la 
 
 libgjsmdssi_la_SOURCES = gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider.c \
-gnu_javax_sound_midi_dssi_DSSISynthesizer.c
+                        gnu_javax_sound_midi_dssi_DSSISynthesizer.c \
+                        dssi_data.h
 
 libgjsmdssi_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo -ljack

signature.asc
Description: This is a digitally signed message part