# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1221715196 -10800
# Node ID 597857a52f7cf83a7f537bfbd562d50917c1ff1a
# Parent  a5cb0e914df6a525096f4d3ac16c78b869f0ff3b# Parent  8c48d6793b86f7524a2e4d1509862baee51d67c4
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r a5cb0e914df6 -r 597857a52f7c configure.ac
--- a/configure.ac	Wed Sep 17 12:01:25 2008 +0200
+++ b/configure.ac	Thu Sep 18 08:19:56 2008 +0300
@@ -1024,20 +1024,10 @@
 )
 
 if test "x$enable_alsa" = "xyes"; then
-    PKG_CHECK_MODULES(ALSA, [alsa >= 1.0],
-[
-have_alsa=yes
-alsalib_available=yes
-],
-[
-have_alsa=no
-alsalib_available=no
-]
-    )
+    PKG_CHECK_MODULES([ALSA], [alsa >= 1.0], [have_alsa=yes], [have_alsa=no])
 else
     AC_MSG_RESULT([*** ALSA output plugin disabled per user request ***])
     have_alsa=no
-    alsalib_available=check
 fi
 
 if test "x$have_alsa" = "xyes"; then
@@ -1085,13 +1075,17 @@
   fi
 fi
 
+if test "x$have_alsa" = "xyes"; then
+  AUD_TRY_COMPILE([ALSA MIDI support], [alsalib_hasmidi],
+[#include <alsa/asoundlib.h>],
+[snd_seq_t *seq = NULL;],
+  [alsalib_midi=yes], [alsalib_midi=no])
+fi
+
+
 if test "x$enable_amidiplug" = "xcheck"; then
-  if test "x$alsalib_available" = "xcheck"; then
-    PKG_CHECK_MODULES(ALSA, [alsa >= 1.0],
-      [alsalib_available=yes],[alsalib_available=no])
-  fi
-  if test "x$alsalib_available" = "xyes"; then
-    AM_PATH_AMIDIPLUG_HWSYNTH(ap_have_hwsynth=yes, ap_have_hwsynth=no)
+  if test "x$alsalib_midi" = "xyes"; then
+    AM_PATH_AMIDIPLUG_HWSYNTH([ap_have_hwsynth=yes], [ap_have_hwsynth=no])
     if test "x$ap_have_hwsynth" = "xyes"; then
       enable_amidiplug=yes
       ap_disable_timidity=yes
@@ -1126,11 +1120,7 @@
   AMIDIPLUG_BACKEND_DIR=amidi-plug
   AC_SUBST(AMIDIPLUG_BACKEND_DIR)
   if test "x$enable_amidiplug_alsa" = "xauto" -o "x$enable_amidiplug_alsa" = "xyes"; then
-    if test "x$alsalib_available" = "xcheck"; then
-      PKG_CHECK_MODULES(ALSA, [alsa >= 1.0],
-        [alsalib_available=yes],[alsalib_available=no])
-    fi
-    if test "x$alsalib_available" = "xyes"; then
+    if test "x$alsalib_midi" = "xyes"; then
       AMIDIPLUG_BACKENDS="$AMIDIPLUG_BACKENDS backend-alsa"
       enable_amidiplug_alsa=yes
     else