diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-09-08 01:04:39 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-09-08 01:04:39 +0800 |
commit | 0152c83b89c141966d2cd0025fc5d6a143d9a2a4 (patch) | |
tree | cbe9c3759521120683ae88fc6832372291cc28cc /audio/libcanberra/files/patch-configure | |
parent | 119a9f8c186a29fa7ac86b8be042c81bce4fcc3a (diff) | |
download | marcuscom-ports-0152c83b89c141966d2cd0025fc5d6a143d9a2a4.tar marcuscom-ports-0152c83b89c141966d2cd0025fc5d6a143d9a2a4.tar.gz marcuscom-ports-0152c83b89c141966d2cd0025fc5d6a143d9a2a4.tar.bz2 marcuscom-ports-0152c83b89c141966d2cd0025fc5d6a143d9a2a4.tar.lz marcuscom-ports-0152c83b89c141966d2cd0025fc5d6a143d9a2a4.tar.xz marcuscom-ports-0152c83b89c141966d2cd0025fc5d6a143d9a2a4.tar.zst marcuscom-ports-0152c83b89c141966d2cd0025fc5d6a143d9a2a4.zip |
Update to 0.8.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11462 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio/libcanberra/files/patch-configure')
-rw-r--r-- | audio/libcanberra/files/patch-configure | 954 |
1 files changed, 0 insertions, 954 deletions
diff --git a/audio/libcanberra/files/patch-configure b/audio/libcanberra/files/patch-configure index bbfcd39cf..7faf5bbbf 100644 --- a/audio/libcanberra/files/patch-configure +++ b/audio/libcanberra/files/patch-configure @@ -16,43 +16,6 @@ OS_IS_WIN32_TRUE OS_IS_WIN32_FALSE USE_VERSION_SCRIPT_TRUE -@@ -940,15 +938,19 @@ VORBIS_LIBS - HAVE_DSO - HAVE_PULSE - HAVE_ALSA -+HAVE_OSS - HAVE_NULL - BUILTIN_DSO - BUILTIN_PULSE - BUILTIN_ALSA -+BUILTIN_OSS - BUILTIN_NULL - HAVE_PULSE_TRUE - HAVE_PULSE_FALSE - HAVE_ALSA_TRUE - HAVE_ALSA_FALSE -+HAVE_OSS_TRUE -+HAVE_OSS_FALSE - HAVE_NULL_TRUE - HAVE_NULL_FALSE - BUILTIN_DSO_TRUE -@@ -957,6 +959,8 @@ BUILTIN_PULSE_TRUE - BUILTIN_PULSE_FALSE - BUILTIN_ALSA_TRUE - BUILTIN_ALSA_FALSE -+BUILTIN_OSS_TRUE -+BUILTIN_OSS_FALSE - BUILTIN_NULL_TRUE - BUILTIN_NULL_FALSE - HTML_DIR -@@ -983,6 +987,7 @@ enable_largefile - enable_rpath - with_libiconv_prefix - enable_alsa -+enable_oss - enable_pulse - enable_null - enable_gtk @@ -1015,7 +1020,7 @@ GTK_CFLAGS GTK_LIBS VORBIS_CFLAGS @@ -62,920 +25,3 @@ # Initialize some variables set by options. ac_init_help= -@@ -1656,6 +1661,7 @@ Optional Features: - --disable-largefile omit support for large files - --disable-rpath do not hardcode runtime library paths - --disable-alsa Disable optional ALSA support -+ --disable-oss Disable optional OSS support - --disable-pulse Disable optional PulseAudio support - --disable-null Disable optional null output - --disable-gtk Disable optional GTK+ support -@@ -6320,7 +6326,7 @@ ia64-*-hpux*) - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 6323 "configure"' > conftest.$ac_ext -+ echo '#line 6329 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -8749,11 +8755,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8752: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8758: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:8756: \$? = $ac_status" >&5 -+ echo "$as_me:8762: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -9039,11 +9045,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9042: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9048: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9046: \$? = $ac_status" >&5 -+ echo "$as_me:9052: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -9143,11 +9149,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9146: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9152: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:9150: \$? = $ac_status" >&5 -+ echo "$as_me:9156: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -11545,7 +11551,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 11548 "configure" -+#line 11554 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11645,7 +11651,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 11648 "configure" -+#line 11654 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -14054,11 +14060,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:14057: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14063: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:14061: \$? = $ac_status" >&5 -+ echo "$as_me:14067: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -14158,11 +14164,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:14161: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14167: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:14165: \$? = $ac_status" >&5 -+ echo "$as_me:14171: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -15743,11 +15749,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15746: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15752: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:15750: \$? = $ac_status" >&5 -+ echo "$as_me:15756: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -15847,11 +15853,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15850: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15856: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:15854: \$? = $ac_status" >&5 -+ echo "$as_me:15860: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -18064,11 +18070,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18067: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18073: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:18071: \$? = $ac_status" >&5 -+ echo "$as_me:18077: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -18354,11 +18360,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18357: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18363: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:18361: \$? = $ac_status" >&5 -+ echo "$as_me:18367: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -18458,11 +18464,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18461: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18467: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:18465: \$? = $ac_status" >&5 -+ echo "$as_me:18471: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -21148,10 +21154,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo - - - -- --subdirs="$subdirs libltdl" -- -- - #### Determine build environment #### - - os_is_win32=0 -@@ -21941,6 +21943,46 @@ if test "${ac_cv_c_bigendian+set}" = set - $as_echo_n "(cached) " >&6 - else - ac_cv_c_bigendian=unknown -+ # See if __BIG_ENDIAN__ or __LITTLE_ENDIAN__ is defined. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#if ! (defined __BIG_ENDIAN__ || defined __LITTLE_ENDIAN__) -+ neither is defined; -+ #endif -+ typedef int dummy; -+ -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_c_bigendian=universal -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test $ac_cv_c_bigendian = unknown; then - # See if sys/param.h defines the BYTE_ORDER macro. - cat >conftest.$ac_ext <<_ACEOF -@@ -23646,6 +23688,108 @@ fi - done - - -+# GNU -+ -+for ac_func in strndup -+do -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif -+ -+int -+main () -+{ -+return $ac_func (); -+ ; -+ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$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 -+ $as_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 && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ eval "$as_ac_var=yes" -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ eval "$as_ac_var=no" -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+if test `eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+done -+ -+ - #### POSIX threads #### - - -@@ -25984,6 +26128,197 @@ fi - - - -+### OSS support (optional) ### -+# Check whether --enable-oss was given. -+if test "${enable_oss+set}" = set; then -+ enableval=$enable_oss; -+ case "${enableval}" in -+ yes) oss=yes ;; -+ no) oss=no ;; -+ *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-oss" >&5 -+$as_echo "$as_me: error: bad value ${enableval} for --disable-oss" >&2;} -+ { (exit 1); exit 1; }; } ;; -+ esac -+ -+else -+ oss=auto -+fi -+ -+ -+if test "x${oss}" != xno ; then -+ -+ -+ -+for ac_header in soundcard.h sys/soundcard.h machine/soundcard.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## --------------------------------------------------- ## -+## Report this to mzyvopnaoreen (at) 0pointer (dot) de ## -+## --------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ -+fi -+if test `eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ if test "${ac_cv_header_sys_soundcard_h}" = "yes" || \ -+ test "${ac_cv_header_soundcard_h}" = "yes" || \ -+ test "${ac_cv_header_machine_soundcard_h}" = "yes"; then -+ HAVE_OSS=1 -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_OSS 1 -+_ACEOF -+ -+ else -+ HAVE_OSS=0 -+ if test "x$oss" = xyes ; then -+ { { $as_echo "$as_me:$LINENO: error: *** OSS not found ***" >&5 -+$as_echo "$as_me: error: *** OSS not found ***" >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ fi -+else -+ HAVE_OSS=0 -+fi -+ - ### PulseAudio (optional) #### - - # Check whether --enable-pulse was given. -@@ -26465,6 +26800,7 @@ HAVE_DSO=0 - BUILTIN_DSO=0 - BUILTIN_PULSE=0 - BUILTIN_ALSA=0 -+BUILTIN_OSS=0 - BUILTIN_NULL=0 - - case "x$with_builtin" in -@@ -26477,6 +26813,7 @@ $as_echo "$as_me: error: *** PulseAudio - - BUILTIN_PULSE=1 - HAVE_ALSA=0 -+ HAVE_OSS=0 - HAVE_NULL=0 - ;; - -@@ -26488,10 +26825,24 @@ $as_echo "$as_me: error: *** ALSA select - fi - - BUILTIN_ALSA=1 -+ HAVE_OSS=0 - HAVE_PULSE=0 - HAVE_NULL=0 - ;; - -+ xoss) -+ if test "x$HAV_OSS" != x1 ; then -+ { { $as_echo "$as_me:$LINENO: error: *** OSS selected for builtin driver, but not enabled. ***" >&5 -+$as_echo "$as_me: error: *** OSS selected for builtin driver, but not enabled. ***" >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ -+ BUILTIN_OSS=1 -+ HAVE_ALSA=0 -+ HAVE_PULSE=0 -+ HAVE_NULL=0 -+ ;; -+ - xnull) - if test "x$HAVE_NULL" != x1 ; then - { { $as_echo "$as_me:$LINENO: error: *** Null output selected for builtin driver, but not enabled. ***" >&5 -@@ -26502,6 +26853,7 @@ $as_echo "$as_me: error: *** Null output - BUILTIN_NULL=1 - HAVE_PULSE=0 - HAVE_ALSA=0 -+ HAVE_OSS=0 - ;; - - xdso) -@@ -26520,7 +26872,7 @@ $as_echo "$as_me: error: *** Unknown dri - { (exit 1); exit 1; }; } - esac - --if test "x$HAVE_PULSE" != x1 -a "x$HAVE_ALSA" != x1 -a "x$HAVE_NULL" != x1 ; then -+if test "x$HAVE_PULSE" != x1 -a "x$HAVE_ALSA" != x1 -a "x$HAVE_OSS" != x1 -a "x$HAVE_NULL" != x1 ; then - { { $as_echo "$as_me:$LINENO: error: *** No backend enabled. ***" >&5 - $as_echo "$as_me: error: *** No backend enabled. ***" >&2;} - { (exit 1); exit 1; }; } -@@ -26534,6 +26886,8 @@ fi - - - -+ -+ - if test "x$HAVE_PULSE" = x1; then - HAVE_PULSE_TRUE= - HAVE_PULSE_FALSE='#' -@@ -26550,6 +26904,14 @@ else - HAVE_ALSA_FALSE= - fi - -+ if test "x$HAVE_OSS" = x1; then -+ HAVE_OSS_TRUE= -+ HAVE_OSS_FALSE='#' -+else -+ HAVE_OSS_TRUE='#' -+ HAVE_OSS_FALSE= -+fi -+ - if test "x$HAVE_NULL" = x1; then - HAVE_NULL_TRUE= - HAVE_NULL_FALSE='#' -@@ -26582,6 +26944,14 @@ else - BUILTIN_ALSA_FALSE= - fi - -+ if test "x$BUILTIN_OSS" = x1; then -+ BUILTIN_OSS_TRUE= -+ BUILTIN_OSS_FALSE='#' -+else -+ BUILTIN_OSS_TRUE='#' -+ BUILTIN_OSS_FALSE= -+fi -+ - if test "x$BUILTIN_NULL" = x1; then - BUILTIN_NULL_TRUE= - BUILTIN_NULL_FALSE='#' -@@ -26875,6 +27245,13 @@ $as_echo "$as_me: error: conditional \"H - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi -+if test -z "${HAVE_OSS_TRUE}" && test -z "${HAVE_OSS_FALSE}"; then -+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_OSS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"HAVE_OSS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi - if test -z "${HAVE_NULL_TRUE}" && test -z "${HAVE_NULL_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_NULL\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 -@@ -26903,6 +27280,13 @@ $as_echo "$as_me: error: conditional \"B - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi -+if test -z "${BUILTIN_OSS_TRUE}" && test -z "${BUILTIN_OSS_FALSE}"; then -+ { { $as_echo "$as_me:$LINENO: error: conditional \"BUILTIN_OSS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"BUILTIN_OSS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi - if test -z "${BUILTIN_NULL_TRUE}" && test -z "${BUILTIN_NULL_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"BUILTIN_NULL\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 -@@ -27262,9 +27646,9 @@ _ACEOF - - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - # Files that config.status was made for. --config_files="`echo $ac_config_files`" --config_headers="`echo $ac_config_headers`" --config_commands="`echo $ac_config_commands`" -+config_files="$ac_config_files" -+config_headers="$ac_config_headers" -+config_commands="$ac_config_commands" - - _ACEOF - -@@ -27717,9 +28101,9 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ - } - split(mac1, mac2, "(") #) - macro = mac2[1] -- prefix = substr(line, 1, index(line, defundef) - 1) - if (D_is_set[macro]) { - # Preserve the white space surrounding the "#". -+ prefix = substr(line, 1, index(line, defundef) - 1) - print prefix "define", macro P[macro] D[macro] - next - } else { -@@ -27727,7 +28111,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ - # in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. - if (defundef == "undef") { -- print "/*", prefix defundef, macro, "*/" -+ print "/*", line, "*/" - next - } - } -@@ -28244,193 +28628,6 @@ if test "$no_create" != yes; then - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } - fi -- --# --# CONFIG_SUBDIRS section. --# --if test "$no_recursion" != yes; then -- -- # Remove --cache-file, --srcdir, and --disable-option-checking arguments -- # so they do not pile up. -- ac_sub_configure_args= -- ac_prev= -- eval "set x $ac_configure_args" -- shift -- for ac_arg -- do -- if test -n "$ac_prev"; then -- ac_prev= -- continue -- fi -- case $ac_arg in -- -cache-file | --cache-file | --cache-fil | --cache-fi \ -- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) -- ac_prev=cache_file ;; -- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ -- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ -- | --c=*) -- ;; -- --config-cache | -C) -- ;; -- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) -- ac_prev=srcdir ;; -- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -- ;; -- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) -- ac_prev=prefix ;; -- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) -- ;; -- --disable-option-checking) -- ;; -- *) -- case $ac_arg in -- *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -- esac -- ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;; -- esac -- done -- -- # Always prepend --prefix to ensure using the same prefix -- # in subdir configurations. -- ac_arg="--prefix=$prefix" -- case $ac_arg in -- *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -- esac -- ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args" -- -- # Pass --silent -- if test "$silent" = yes; then -- ac_sub_configure_args="--silent $ac_sub_configure_args" -- fi -- -- # Always prepend --disable-option-checking to silence warnings, since -- # different subdirs can have different --enable and --with options. -- ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args" -- -- ac_popdir=`pwd` -- for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue -- -- # Do not complain, so a configure script can configure whichever -- # parts of a large source tree are present. -- test -d "$srcdir/$ac_dir" || continue -- -- ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)" -- $as_echo "$as_me:$LINENO: $ac_msg" >&5 -- $as_echo "$ac_msg" >&6 -- { as_dir="$ac_dir" -- case $as_dir in #( -- -*) as_dir=./$as_dir;; -- esac -- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { -- as_dirs= -- while :; do -- case $as_dir in #( -- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -- *) as_qdir=$as_dir;; -- esac -- as_dirs="'$as_qdir' $as_dirs" -- as_dir=`$as_dirname -- "$as_dir" || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)[^/].*/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)$/{ -- s//\1/ -- q -- } -- /^X\(\/\).*/{ -- s//\1/ -- q -- } -- s/.*/./; q'` -- test -d "$as_dir" && break -- done -- test -z "$as_dirs" || eval "mkdir $as_dirs" -- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 --$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} -- { (exit 1); exit 1; }; }; } -- ac_builddir=. -- --case "$ac_dir" in --.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; --*) -- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -- # A ".." for each directory in $ac_dir_suffix. -- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -- case $ac_top_builddir_sub in -- "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -- esac ;; --esac --ac_abs_top_builddir=$ac_pwd --ac_abs_builddir=$ac_pwd$ac_dir_suffix --# for backward compatibility: --ac_top_builddir=$ac_top_build_prefix -- --case $srcdir in -- .) # We are building in place. -- ac_srcdir=. -- ac_top_srcdir=$ac_top_builddir_sub -- ac_abs_top_srcdir=$ac_pwd ;; -- [\\/]* | ?:[\\/]* ) # Absolute name. -- ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir -- ac_abs_top_srcdir=$srcdir ;; -- *) # Relative name. -- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_build_prefix$srcdir -- ac_abs_top_srcdir=$ac_pwd/$srcdir ;; --esac --ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -- -- -- cd "$ac_dir" -- -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f "$ac_srcdir/configure.gnu"; then -- ac_sub_configure=$ac_srcdir/configure.gnu -- elif test -f "$ac_srcdir/configure"; then -- ac_sub_configure=$ac_srcdir/configure -- elif test -f "$ac_srcdir/configure.in"; then -- # This should be Cygnus configure. -- ac_sub_configure=$ac_aux_dir/configure -- else -- { $as_echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5 --$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} -- ac_sub_configure= -- fi -- -- # The recursion is here. -- if test -n "$ac_sub_configure"; then -- # Make the cache file name correct relative to the subdirectory. -- case $cache_file in -- [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; -- *) # Relative name. -- ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; -- esac -- -- { $as_echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 --$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} -- # The eval makes quoting arguments work. -- eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ -- --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || -- { { $as_echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 --$as_echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} -- { (exit 1); exit 1; }; } -- fi -- -- cd "$ac_popdir" -- done --fi - if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5 - $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;} -@@ -28461,6 +28658,15 @@ if test "x$BUILTIN_ALSA" = "x1" ; then - ENABLE_BUILTIN_ALSA=yes - fi - -+ENABLE_OSS=no -+if test "x$HAVE_OSS" = "x1" ; then -+ ENABLE_OSS=yes -+fi -+ENABLE_BUILTIN_OSS=no -+if test "x$BUILTIN_OSS" = "x1" ; then -+ ENABLE_BUILTIN_OSS=yes -+fi -+ - ENABLE_NULL=no - if test "x$HAVE_NULL" = "x1" ; then - ENABLE_NULL=yes -@@ -28490,6 +28696,8 @@ echo " - Builtin PulseAudio: ${ENABLE_BUILTIN_PULSE} - Enable ALSA: ${ENABLE_ALSA} - Builtin ALSA: ${ENABLE_BUILTIN_ALSA} -+ Enable OSS: ${ENABLE_OSS} -+ Builtin OSS: ${ENABLE_BUILTIN_OSS} - Enable Null Output: ${ENABLE_NULL} - Builtin Null Output: ${ENABLE_BUILTIN_NULL} - Enable GTK+: ${ENABLE_GTK} |