[Sumover-dev] [svn commit] r4232 - rat/trunk

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Wed Jul 30 17:15:37 2008
New Revision: 4232

Modified:
   rat/trunk/configure
   rat/trunk/configure.in

Log:
Added --disable-alsa to allow for ALSA driver to be disabled.


Modified: rat/trunk/configure
==============================================================================
--- rat/trunk/configure	(original)
+++ rat/trunk/configure	Wed Jul 30 17:15:37 2008
@@ -1295,6 +1295,7 @@
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-alsa          disable ALSA driver
   --enable-ipv6           enable ipv6
   --enable-kame-ipv6      enable kame implementation of ipv6
   --enable-optimize       enable optimization
@@ -5943,7 +5944,17 @@
 
 
 	# Do we have ALSA?
-	if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
+	{ echo "$as_me:$LINENO: checking for ALSA driver" >&5
+echo $ECHO_N "checking for ALSA driver... $ECHO_C" >&6; }
+	# Check whether --enable-alsa was given.
+if test "${enable_alsa+set}" = set; then
+  enableval=$enable_alsa; alsa=$enableval
+else
+  alsa=yes
+fi
+
+	if test $alsa = yes ; then
+	    if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5
 echo $ECHO_N "checking for alsa/asoundlib.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
@@ -6070,15 +6081,15 @@
 fi
 if test $ac_cv_header_alsa_asoundlib_h = yes; then
 
-		AUD_OBJ="$AUD_OBJ auddev_alsa.o"
-		AUD_LIB="$AUD_LIB -lasound"
-		cat >>confdefs.h <<\_ACEOF
+		    AUD_OBJ="$AUD_OBJ auddev_alsa.o"
+		    AUD_LIB="$AUD_LIB -lasound"
+		    cat >>confdefs.h <<\_ACEOF
 #define HAVE_ALSA_AUDIO 1
 _ACEOF
 
-		# HAVE_OSS_AUDIO is defined so that the ALSA OSS emulation
-		# works for those cards which are not supported natively
-		cat >>confdefs.h <<\_ACEOF
+		    # HAVE_OSS_AUDIO is defined so that the ALSA OSS emulation
+		    # works for those cards which are not supported natively
+		    cat >>confdefs.h <<\_ACEOF
 #define HAVE_OSS_AUDIO 1
 _ACEOF
 
@@ -6086,6 +6097,10 @@
 fi
 
 
+	else
+            { echo "$as_me:$LINENO: result: Disabled by configure" >&5
+echo "${ECHO_T}Disabled by configure" >&6; }
+	fi
 	# Default is to use OSS drivers...
 	AUD_OBJ="$AUD_OBJ auddev_oss.o"
 

Modified: rat/trunk/configure.in
==============================================================================
--- rat/trunk/configure.in	(original)
+++ rat/trunk/configure.in	Wed Jul 30 17:15:37 2008
@@ -188,14 +188,22 @@
 		],AC_MSG_RESULT(missing))
 	])
 	# Do we have ALSA?
-	AC_CHECK_HEADER(alsa/asoundlib.h,[
-		AUD_OBJ="$AUD_OBJ auddev_alsa.o"
-		AUD_LIB="$AUD_LIB -lasound"
-		AC_DEFINE(HAVE_ALSA_AUDIO)
-		# HAVE_OSS_AUDIO is defined so that the ALSA OSS emulation
-		# works for those cards which are not supported natively
-		AC_DEFINE(HAVE_OSS_AUDIO)
-	])
+	AC_MSG_CHECKING([for ALSA driver])
+	AC_ARG_ENABLE(alsa,
+	[  --disable-alsa          disable ALSA driver],
+	[alsa=$enableval],[alsa=yes])
+	if test $alsa = yes ; then
+	    AC_CHECK_HEADER(alsa/asoundlib.h,[
+		    AUD_OBJ="$AUD_OBJ auddev_alsa.o"
+		    AUD_LIB="$AUD_LIB -lasound"
+		    AC_DEFINE(HAVE_ALSA_AUDIO)
+		    # HAVE_OSS_AUDIO is defined so that the ALSA OSS emulation
+		    # works for those cards which are not supported natively
+		    AC_DEFINE(HAVE_OSS_AUDIO)
+	    ])
+	else
+            AC_MSG_RESULT(Disabled by configure)
+	fi
 	# Default is to use OSS drivers...
 	AUD_OBJ="$AUD_OBJ auddev_oss.o"
 	AC_CHECK_HEADERS(sys/soundcard.h soundcard.h)