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

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

Author: douglask
Date: Wed Apr 15 10:06:00 2009
New Revision: 4426

Modified:
   rat/trunk/configure

Log:
regenerate configure


Modified: rat/trunk/configure
==============================================================================
--- rat/trunk/configure	(original)
+++ rat/trunk/configure	Wed Apr 15 10:06:00 2009
@@ -6474,7 +6474,7 @@
 
 done
 
-	if test $ac_cv_header_machine_h="yes" ; then
+	if test "$ac_cv_header_machine_h"="yes" ; then
 		AUD_OBJ="$AUD_OBJ auddev_pca.o"
 		cat >>confdefs.h <<\_ACEOF
 #define HAVE_PCA_AUDIO 1
@@ -6495,7 +6495,80 @@
 
 	;;
 *netbsd*)
-	AUD_OBJ="$AUDIOBJ auddev_netbsd.o auddev_oss.o"
+
+{ echo "$as_me:$LINENO: checking for main in -lossaudio" >&5
+echo $ECHO_N "checking for main in -lossaudio... $ECHO_C" >&6; }
+if test "${ac_cv_lib_ossaudio_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lossaudio  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_ossaudio_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_ossaudio_main=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio_main" >&5
+echo "${ECHO_T}$ac_cv_lib_ossaudio_main" >&6; }
+if test $ac_cv_lib_ossaudio_main = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBOSSAUDIO 1
+_ACEOF
+
+  LIBS="-lossaudio $LIBS"
+
+fi
+
+	if test "$ac_cv_lib_ossaudio_main"="yes"; then
+		AUDIOBJ="$AUDIOBJ auddev_oss.o"
+		AUD_LIB="$AUD_LIB -lossaudio"
+		cat >>confdefs.h <<\_ACEOF
+#define HAVE_OSS_AUDIO 1
+_ACEOF
+
+	fi
+	AUD_OBJ="$AUDIOBJ auddev_netbsd.o"
 	cat >>confdefs.h <<\_ACEOF
 #define HAVE_NETBSD_AUDIO 1
 _ACEOF
@@ -6641,10 +6714,6 @@
 
 done
 
-	cat >>confdefs.h <<\_ACEOF
-#define HAVE_OSS_AUDIO 1
-_ACEOF
-
 	;;
 *irix*)
 	AUD_LIB="$AUD_LIB -laudio"