diff m4/amidi-plug.m4 @ 527:68f20f7ac954 trunk

[svn] in configure.ac, do not check for ALSA twice if it has been already detected (both alsa output plugin and amidi-plug check its availability)
author giacomo
date Fri, 27 Jan 2006 15:10:44 -0800
parents c41406418769
children b0590e16329f
line wrap: on
line diff
--- a/m4/amidi-plug.m4	Fri Jan 27 14:22:22 2006 -0800
+++ b/m4/amidi-plug.m4	Fri Jan 27 15:10:44 2006 -0800
@@ -8,28 +8,20 @@
 
 AMIDIPLUG_EVERYTHINGOK="yes"
 
-dnl **** Check for ALSA ****
-PKG_CHECK_MODULES(ALSA, [alsa >= 0.9.0],
-  [ap_alsa_found=yes], [ap_alsa_found=no])
-
-if test "x$ap_alsa_found" = "xyes"; then
-  dnl **** Search for a hardware synth (ALSA managed)  ****
-  AC_CHECK_FILE([/proc/asound/card0/wavetableD1],
+dnl **** Search for a hardware synth (ALSA managed)  ****
+AC_CHECK_FILE([/proc/asound/card0/wavetableD1],
+  [ap_hwsynth_found=yes], [ap_hwsynth_found=no])
+if test "x$ap_hwsynth_found" = "xno"; then
+  AC_CHECK_FILE([/proc/asound/card1/wavetableD1],
     [ap_hwsynth_found=yes], [ap_hwsynth_found=no])
   if test "x$ap_hwsynth_found" = "xno"; then
-    AC_CHECK_FILE([/proc/asound/card1/wavetableD1],
+    AC_CHECK_FILE([/proc/asound/card2/wavetableD1],
       [ap_hwsynth_found=yes], [ap_hwsynth_found=no])
     if test "x$ap_hwsynth_found" = "xno"; then
-      AC_CHECK_FILE([/proc/asound/card2/wavetableD1],
-        [ap_hwsynth_found=yes], [ap_hwsynth_found=no])
-      if test "x$ap_hwsynth_found" = "xno"; then
-        AMIDIPLUG_EVERYTHINGOK="no"
-        AC_MSG_WARN([*** Could not find an ALSA-supported hardware synth, amidi-plug won't be compiled. If you wish to compile it anyway, use --enable-amidiplug in configure. ***])
-      fi
+      AMIDIPLUG_EVERYTHINGOK="no"
+      AC_MSG_WARN([*** Could not find an ALSA-supported hardware synth, amidi-plug won't be compiled. If you wish to compile it anyway, use --enable-amidiplug in configure. ***])
     fi
   fi
-else
-  AMIDIPLUG_EVERYTHINGOK="no"
 fi
 
 if test "x$AMIDIPLUG_EVERYTHINGOK" = "xyes"; then