I misunderstood the purpose of alsa.m4 - apologies...

1 files changed, 18 insertions, 99 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 5b6c1e84..ec09e7f0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,109 +1,28 @@
-dnl Configure Paths for Alsa
-dnl Christopher Lansdown (lansdoct@cs.alfred.edu)
-dnl 29/10/1998
-dnl AM_PATH_ALSA(MINIMUM-VERSION)
-dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate.
-dnl enables arguments --with-alsa-prefix= --with-alsa-enc-prefix= --disable-alsatest
-dnl
-AC_DEFUN(AM_PATH_ALSA,
-[dnl
-dnl Get the clfags and libraries for alsa
-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_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
-AC_MSG_CHECKING(for ALSA CFLAGS)
-if test "$alsa_inc_prefix" != "" ; then
-	ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix"
-	CFLAGS="-I$alsa_inc_prefix"
-fi
-AC_MSG_RESULT($ALSA_CFLAGS)
-
-dnl add any special lib dirs
-AC_MSG_CHECKING(for ALSA LDFLAGS)
-if test "$alsa_prefix" != "" ; then
-	ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix"
-	LIBS="-L$alsa_prefix"
+dnl Check for ALSA driver package.
+AC_DEFUN(ALSA_CHECK_DRIVER, [
+myprefix=$prefix
+if test "$myprefix" = "NONE"; then
+  myprefix=$ac_default_prefix
 fi
-
-dnl add the alsa library
-ALSA_LIBS="$ALSA_LIBS -lasound"
-LDFLAGS="$ALSA_LIBS -lasound"
-AC_MSG_RESULT($ALSA_LIBS)
-
-dnl Check for the presence of the library
-dnl if test $enable_alsatest = yes; then
-dnl   AC_MSG_CHECKING(for working libasound)
-dnl   AC_TRY_RUN([
-dnl #include <sys/asoundlib.h>
-dnl void main(void)
-dnl {
-dnl   snd_cards();
-dnl   exit(0);
-dnl }
-dnl ],
-dnl    [AC_MSG_RESULT("present")],
-dnl    [AC_MSG_RESULT("not found. ")
-dnl    AC_MSG_ERROR(Fatal error: Install alsa-lib package or use --with-alsa-prefix option...)],
-dnl    [AC_MSG_RESULT(unsopported)
-dnl     AC_MSG_ERROR(Cross-compiling isn't supported...)]
-dnl  )
-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 headers version >= $min_alsa_version)
-no_alsa=""
-    alsa_min_major_version=`echo $min_alsa_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    alsa_min_minor_version=`echo $min_alsa_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    alsa_min_micro_version=`echo $min_alsa_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+OLD_CFLAGS="$CFLAGS"
+CFLAGS="-I$myprefix/include"
+AC_MSG_CHECKING(for alsa-driver package)
 
 AC_TRY_COMPILE([
-#include <sys/asoundlib.h>
-], [
+#include <linux/asound.h>
+],[
 void main(void)
 {
-#  if(SOUNDLIB_VERSION_MAJOR > $alsa_min_major_version)
+#if !defined( SND_PROTOCOL_VERSION ) || !defined( SND_PROTOCOL_UNCOMPATIBLE )
+#error not found
+#else
   exit(0);
-#  else
-#    if(SOUNDLIB_VERSION_MAJOR < $alsa_min_major_version)
-#       error not present
-#    endif
-
-#   if(SOUNDLIB_VERSION_MINOR > $alsa_min_minor_version)
-  exit(0);
-#   else
-#     if(SOUNDLIB_VERSION_MINOR < $alsa_min_minor_version)
-#          error not present
-#      endif
-
-#      if(SOUNDLIB_VERSION_SUBMINOR < $alsa_min_micro_version)
-#        error not present
-#      endif
-#    endif
-#  endif
-exit(0);
+#endif
 }
 ],
-  [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.)]
+  AC_MSG_RESULT(present),
+  [AC_MSG_RESULT(not found);
+   AC_MSG_ERROR([Install alsa-driver v0.2.0pre6+ package first...])]
 )
-
-dnl That should be it.  Now just export out symbols:
-AC_SUBST(ALSA_CFLAGS)
-AC_SUBST(ALSA_LIBS)
+CFLAGS="$OLD_CFLAGS"
 ])
-