SF.net SVN: jazzplusplus: [492] trunk/jazz/configure.ac

[<pst...@us...>]

Revision: 492
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=492&view=rev
Author:   pstieber
Date:     2008-05-06 07:11:22 -0700 (Tue, 06 May 2008)

Log Message:
-----------
Changed to attempt to deal with ALSA on all platforms.

Modified Paths:
--------------
    trunk/jazz/configure.ac

Modified: trunk/jazz/configure.ac
===================================================================
--- trunk/jazz/configure.ac	2008-05-06 04:31:13 UTC (rev 491)
+++ trunk/jazz/configure.ac	2008-05-06 14:11:22 UTC (rev 492)
@@ -72,52 +72,39 @@
 fi
 AC_MSG_RESULT($result)
 
-dnl optional stuff, like alsa oss...
-
 dnl To support a new system, you need to add its canonical name (as determined
 dnl by config.sub or specified by the configure command line) to this "case"
 dnl and also define the shared library flags below - search for
 dnl SHARED_LIB_SETUP to find the exact place.
 case "${host}" in
   *-darwin* )
-    mac_build=yes
   ;;
   *-*-linux* )
-    mac_build=no
+    AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
+    if [[ $have_alsa = "yes" ]] ; then
+      LIBS="$LIBS -lasound"
+    fi
   ;;
   *)
     AC_MSG_ERROR(unknown system type ${host}.)
 esac
 
-if test x$mac_build = xno ; then
+dnl ---------------------------------------
+dnl check if we are to enable alsa support
+dnl ---------------------------------------
+dnl AC_ARG_ENABLE(alsa,  --enable-alsa     Support ALSA)
+dnl 
+dnl if test x$enable_alsa = xyes ; then
+dnl   AC_MSG_RESULT(alsa is enabled)
+dnl   AC_DEFINE(DEV_ALSA,1,[use alsa drivers])
+dnl 
+dnl   dnl This test comes with the alsa distribution!
+dnl  AM_PATH_ALSA(0.9.0)
+dnl 
+dnl fi
 
-  dnl ---------------------------------------
-  dnl check if we are to enable alsa support
-  dnl ---------------------------------------
-  AC_ARG_ENABLE(alsa,  --enable-alsa     Support ALSA)
+AM_CONDITIONAL(USE_ALSA, test "$have_alsa" = yes)
 
-  if test x$enable_alsa = xyes ; then
-    AC_MSG_RESULT(alsa is enabled)
-    AC_DEFINE(DEV_ALSA,1,[use alsa drivers])
-
-    dnl for alsa to work it must be installed(logical no?)
-    dnl this test is just preliminary
-dnl  if test -f /proc/asound/version; then
-dnl    AC_MSG_RESULT(alsa seems to be running...very good!)
-dnl    LIBS="$LIBS -lasound"
-dnl  else
-dnl    AC_MSG_ERROR(no alsa i can use! check if its at least 090 and running)
-dnl  fi
-
-    dnl This test comes with the alsa distribution!
-    AM_PATH_ALSA(0.9.0)
-
-    LIBS="$LIBS $ALSA_LIBS"
-  fi
-fi
-
-AM_CONDITIONAL(USE_ALSA, test "$enable_alsa" = yes)
-
 dnl --------------------------------------------
 dnl check if we are to enable sequencer2 support
 dnl --------------------------------------------


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.