utils/alsa.m4 renamed to aclocal.m4

diff --git a/utils/alsa.m4 b/aclocal.m4
similarity index 74%
rename from utils/alsa.m4
rename to aclocal.m4
index a8b595901e3e2c47a2a00a1d67bf6bdddd4a1722..6fd0241b6a1454eb19ebde7d4049b4c544a80530 100644 (file)
--- a/utils/alsa.m4
+++ b/aclocal.m4
@@ -12,7 +12,7 @@ dnl
 AC_ARG_WITH(alsa-prefix,[ --with-alsa-prefix=PFX  Prefix where Alsa library is installed(optional)],
        [alsa_prefix="$withval"], [alsa_prefix=""])
 AC_ARG_WITH(alsa-inc-prefix, [ --with-alsa-inc-prefix=PFX  Prefix where include libraries are (optional)],
-       [alsa_in_prefix="$withval"], [alsa_inc_prefix=""])
+       [alsa_inc_prefix="$withval"], [alsa_inc_prefix=""])
 AC_ARG_ENABLE(alsatest, [ --disable-alsatest       Do not try to compile and run a test Alsa program], [enable_alsatest=no], [enable_alsatest=yes])
 
 dnl Add any special include directories
@@ -32,7 +32,7 @@ fi
 
 dnl add the alsa library
 ALSA_LIBS="$ALSA_LIBS -lasound"
-LIBS="$ALSA_LIBS -lasound"
+LDFLAGS="$ALSA_LIBS -lasound"
 AC_MSG_RESULT($ALSA_LIBS)
 
 dnl Check for the presence of the library
@@ -56,7 +56,7 @@ dnl fi
 
 dnl Check for a working version of libasound that is of the right version.
 min_alsa_version=ifelse([$1], ,0.1.1,$1)
-AC_MSG_CHECKING(for libasound version >= $min_alsa_version)
+AC_MSG_CHECKING(for libasound headers version >= $min_alsa_version)
 no_alsa=""
     alsa_min_major_version=`echo $min_alsa_version | \
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
@@ -65,23 +65,34 @@ no_alsa=""
     alsa_min_micro_version=`echo $min_alsa_version | \
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
 
-AC_TRY_RUN([
+AC_TRY_COMPILE([
 #include <sys/asoundlib.h>
+], [
 void main(void)
 {
-  if(SOUNDLIB_VERSION_MAJOR >= $alsa_min_major_version)
-    if(SOUNDLIB_VERSION_MINOR >= $alsa_min_minor_version) 
-      if(SOUNDLIB_VERSION_SUBMINOR >= $alsa_min_micro_version)
+#  if(SOUNDLIB_VERSION_MAJOR >= $alsa_min_major_version)
+#    if(SOUNDLIB_VERSION_MINOR >= $alsa_min_minor_version) 
+#      if(SOUNDLIB_VERSION_SUBMINOR >= $alsa_min_micro_version)
        exit(0);
-
-  exit(1);
+#      else
+#        error not present
+#      endif
+#    else
+#      error not present
+#    endif
+#  else
+#  error not present
+#  endif
 }
 ],
-  [AC_MSG_RESULT("found.")],
-  [AC_MSG_RESULT("not present.")
-  AC_MSG_ERROR(Fatal error: Installed version of alsa-lib is too old.)],
-  [AC_MSG_RESULT("not supported")
-  AC_MSG_ERROR(Fatal error: Cross-compiling is not supported...)]
+  [AC_MSG_RESULT(found.)],
+  [AC_MSG_RESULT(not present.)
+   AC_MSG_ERROR(Sufficiently new version of libasound not found.)]
+)
+
+dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
+AC_CHECK_LIB([asound], [snd_cards],,
+       [AC_MSG_ERROR(No linkable libasound was found.)]
 )
 
 dnl That should be it.  Now just export out symbols: