Index: kdemultimedia-3.5.6/configure.in.in =================================================================== --- kdemultimedia-3.5.6.orig/configure.in.in +++ kdemultimedia-3.5.6/configure.in.in @@ -152,88 +152,19 @@ AC_DEFUN([KDE_CHECK_OSSAUDIO], AC_DEFUN([KDE_CHECK_ALSA], [ - have_alsa=no + AC_CHECK_LIB([asound], [snd_pcm_open], [have_alsa05=yes], [have_alsa04=no]) - AC_CHECK_HEADERS([sys/asoundlib.h alsa/asoundlib.h], - [have_alsa=yes]) + PKG_CHECK_MODULES([ALSA], [alsa >= 0.9], [have_alsa09=yes], [have_alsa09=no]) - AC_CHECK_LIB(asound, snd_seq_create_simple_port, - [:], [have_alsa=no]) - - AC_LANG_SAVE - AC_LANG_C - if test "x$have_alsa" = xyes; then - AC_TRY_COMPILE([ - #include "confdefs.h" - #ifdef HAVE_SYS_ASOUNDLIB_H - #include - #endif - #ifdef HAVE_ALSA_ASOUNDLIB_H - #include - #endif - ],[ - #if (SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 5) - /* we have ALSA 0.5.x */ - #else - #error not ALSA 0.5.x - #endif - ], - have_alsa_0_5=yes) - - AC_TRY_COMPILE([ - #include "confdefs.h" - #ifdef HAVE_SYS_ASOUNDLIB_H - #include - #endif - #ifdef HAVE_ALSA_ASOUNDLIB_H - #include - #endif - ],[ - #if (SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9) - /* we have ALSA 0.9.x */ - #else - #error not ALSA 0.9.x - #endif - ], - have_alsa_0_9=yes) - - AC_TRY_COMPILE([ - #include "confdefs.h" - #ifdef HAVE_SYS_ASOUNDLIB_H - #include - #endif - #ifdef HAVE_ALSA_ASOUNDLIB_H - #include - #endif - ],[ - #if (SND_LIB_MAJOR == 1) - /* we have ALSA 1.x */ - #else - #error not ALSA 1.x - #endif - ], - have_alsa_1=yes) - fi - AC_LANG_RESTORE - - if test "x$have_alsa_0_9" = xyes || test "x$have_alsa_1" = xyes; then - # for kmix/ and akode/ - LIBASOUND="-lasound" + if test "x$have_alsa09" = "xyes"; then + have_alsa="yes" AC_DEFINE(HAVE_LIBASOUND2, 1, [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)]) - - # for arts/ - ARTS_LIBASOUND="-lasound" - AC_DEFINE(HAVE_ARTS_LIBASOUND2, 1, [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)]) + elif test "x$have_alsa05" = "xyes"; then + have_alsa="yes" + AC_DEFINE(HAVE_LIBASOUND1, 1, [Define if you have libasound.so.1 (required for ALSA 0.5.x support)]) + ALSA_LIBS="-lasound" + AC_SUBST([ALSA_LIBS]) fi - - if test "x$have_alsa_0_5" = xyes; then - # for arts/ - ARTS_LIBASOUND="-lasound" - AC_DEFINE(HAVE_ARTS_LIBASOUND, 1, [Define if you have libasound.so.1 (required for ALSA 0.5.x support)]) - fi - - AC_SUBST(LIBASOUND) - AC_SUBST(ARTS_LIBASOUND) ]) AC_DEFUN([KDE_CHECK_CDPARANOIA], Index: kdemultimedia-3.5.6/kmix/Makefile.am =================================================================== --- kdemultimedia-3.5.6.orig/kmix/Makefile.am +++ kdemultimedia-3.5.6/kmix/Makefile.am @@ -25,13 +25,13 @@ kmix_la_SOURCES = main.cpp kmix.cpp kmix volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel \ kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp -kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(ALSA_LIBS) kmix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -avoid-version kmixctrl_la_SOURCES = kmixctrl.cpp mixer.cpp mixset.cpp mixdevice.cpp volume.cpp mixerIface.skel \ mixertoolbox.cpp mixer_backend.cpp -kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(ALSA_LIBS) kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version kmix_panelapplet_la_SOURCES = kmixapplet.cpp \ @@ -42,7 +42,7 @@ kmix_panelapplet_la_SOURCES = kmixapplet kmixtoolbox.cpp mixertoolbox.cpp dialogselectmaster.cpp kmix_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kmix_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +kmix_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(ALSA_LIBS) xdg_apps_DATA = kmix.desktop