summaryrefslogtreecommitdiff
path: root/audio/libcanberra/files/patch-configure
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--audio/libcanberra/files/patch-configure873
-rw-r--r--audio/libcanberra/files/patch-configure.ac140
2 files changed, 14 insertions, 999 deletions
diff --git a/audio/libcanberra/files/patch-configure b/audio/libcanberra/files/patch-configure
index b6d61bca2e26..7d643125157c 100644
--- a/audio/libcanberra/files/patch-configure
+++ b/audio/libcanberra/files/patch-configure
@@ -1,60 +1,23 @@
---- configure.orig 2008-08-10 15:18:38.000000000 -0400
-+++ configure 2008-08-10 15:19:32.000000000 -0400
+--- configure.orig 2008-12-19 19:07:23.000000000 -0500
++++ configure 2008-12-19 19:08:01.000000000 -0500
@@ -791,7 +791,6 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-enable_option_checking=no
- ac_subst_vars='SHELL
- PATH_SEPARATOR
- PACKAGE_NAME
-@@ -909,7 +908,6 @@ ac_ct_F77
- LIBTOOL
- LTDLINCL
- LIBLTDL
--subdirs
- OS_IS_WIN32_TRUE
+ ac_subst_vars='LTLIBOBJS
+ LIBOBJS
+ GTK_DOC_USE_LIBTOOL_FALSE
+@@ -878,7 +877,6 @@ USE_VERSION_SCRIPT_FALSE
+ USE_VERSION_SCRIPT_TRUE
OS_IS_WIN32_FALSE
- acx_pthread_config
-@@ -935,15 +933,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
-@@ -952,6 +954,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
-@@ -978,6 +982,7 @@ enable_largefile
- enable_rpath
- with_libiconv_prefix
- enable_alsa
-+enable_oss
- enable_pulse
- enable_null
- enable_gtk
-@@ -1009,7 +1014,7 @@ GTK_CFLAGS
- GTK_LIBS
+ OS_IS_WIN32_TRUE
+-subdirs
+ LIBLTDL
+ LTDLINCL
+ LIBTOOL
+@@ -1054,7 +1052,7 @@ TDB_CFLAGS
+ TDB_LIBS
VORBIS_CFLAGS
VORBIS_LIBS'
-ac_subdirs_all='libltdl'
@@ -62,811 +25,3 @@
# Initialize some variables set by options.
ac_init_help=
-@@ -1650,6 +1655,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
-@@ -6080,7 +6086,7 @@ ia64-*-hpux*)
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 6083 "configure"' > conftest.$ac_ext
-+ echo '#line 6089 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -8509,11 +8515,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:8512: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8518: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8516: \$? = $ac_status" >&5
-+ echo "$as_me:8522: \$? = $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.
-@@ -8799,11 +8805,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:8802: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8808: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8806: \$? = $ac_status" >&5
-+ echo "$as_me:8812: \$? = $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.
-@@ -8903,11 +8909,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:8906: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8912: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:8910: \$? = $ac_status" >&5
-+ echo "$as_me:8916: \$? = $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
-@@ -11305,7 +11311,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11308 "configure"
-+#line 11314 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -11405,7 +11411,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11408 "configure"
-+#line 11414 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -13814,11 +13820,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:13817: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13823: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:13821: \$? = $ac_status" >&5
-+ echo "$as_me:13827: \$? = $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.
-@@ -13918,11 +13924,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:13921: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13927: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:13925: \$? = $ac_status" >&5
-+ echo "$as_me:13931: \$? = $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
-@@ -15503,11 +15509,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:15506: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15512: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:15510: \$? = $ac_status" >&5
-+ echo "$as_me:15516: \$? = $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.
-@@ -15607,11 +15613,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:15610: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15616: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:15614: \$? = $ac_status" >&5
-+ echo "$as_me:15620: \$? = $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
-@@ -17824,11 +17830,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:17827: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17833: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:17831: \$? = $ac_status" >&5
-+ echo "$as_me:17837: \$? = $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.
-@@ -18114,11 +18120,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:18117: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18123: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:18121: \$? = $ac_status" >&5
-+ echo "$as_me:18127: \$? = $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.
-@@ -18218,11 +18224,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:18221: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18227: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:18225: \$? = $ac_status" >&5
-+ echo "$as_me:18231: \$? = $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
-@@ -20908,10 +20914,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
-
-
-
--
--subdirs="$subdirs libltdl"
--
--
- #### Determine build environment ####
-
- os_is_win32=0
-@@ -21692,6 +21694,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
-@@ -25735,6 +25777,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) alsa=yes ;;
-+ no) alsa=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.
-@@ -26143,6 +26376,7 @@ HAVE_DSO=0
- BUILTIN_DSO=0
- BUILTIN_PULSE=0
- BUILTIN_ALSA=0
-+BUILTIN_OSS=0
- BUILTIN_NULL=0
-
- case "x$with_builtin" in
-@@ -26155,6 +26389,7 @@ $as_echo "$as_me: error: *** PulseAudio
-
- BUILTIN_PULSE=1
- HAVE_ALSA=0
-+ HAVE_OSS=0
- HAVE_NULL=0
- ;;
-
-@@ -26166,10 +26401,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
-@@ -26180,6 +26429,7 @@ $as_echo "$as_me: error: *** Null output
- BUILTIN_NULL=1
- HAVE_PULSE=0
- HAVE_ALSA=0
-+ HAVE_OSS=0
- ;;
-
- xdso)
-@@ -26198,7 +26448,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; }; }
-@@ -26212,6 +26462,8 @@ fi
-
-
-
-+
-+
- if test "x$HAVE_PULSE" = x1; then
- HAVE_PULSE_TRUE=
- HAVE_PULSE_FALSE='#'
-@@ -26228,6 +26480,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='#'
-@@ -26260,6 +26520,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='#'
-@@ -26539,6 +26807,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
-@@ -26567,6 +26842,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
-@@ -26926,9 +27208,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
-
-@@ -27379,9 +27661,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 {
-@@ -27389,7 +27671,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
- }
- }
-@@ -27906,193 +28188,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;}
-@@ -28123,6 +28218,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
-@@ -28152,6 +28256,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}
diff --git a/audio/libcanberra/files/patch-configure.ac b/audio/libcanberra/files/patch-configure.ac
deleted file mode 100644
index 324d80d3b668..000000000000
--- a/audio/libcanberra/files/patch-configure.ac
+++ /dev/null
@@ -1,140 +0,0 @@
---- configure.ac.orig 2008-08-09 15:27:28.000000000 -0400
-+++ configure.ac 2008-08-09 15:27:59.000000000 -0400
-@@ -219,6 +219,35 @@ fi
- AC_SUBST(ALSA_CFLAGS)
- AC_SUBST(ALSA_LIBS)
-
-+### OSS support (optional) ###
-+AC_ARG_ENABLE([oss],
-+ AC_HELP_STRING([--disable-oss], [Disable optional OSS support]),
-+ [
-+ case "${enableval}" in
-+ yes) alsa=yes ;;
-+ no) alsa=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-oss) ;;
-+ esac
-+ ],
-+ [oss=auto])
-+
-+if test "x${oss}" != xno ; then
-+ AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h)
-+ 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
-+ AC_DEFINE([HAVE_OSS], 1, [Have OSS?])
-+ else
-+ HAVE_OSS=0
-+ if test "x$oss" = xyes ; then
-+ AC_MSG_ERROR([*** OSS not found ***])
-+ fi
-+ fi
-+else
-+ HAVE_OSS=0
-+fi
-+
- ### PulseAudio (optional) ####
-
- AC_ARG_ENABLE([pulse],
-@@ -333,6 +362,7 @@ HAVE_DSO=0
- BUILTIN_DSO=0
- BUILTIN_PULSE=0
- BUILTIN_ALSA=0
-+BUILTIN_OSS=0
- BUILTIN_NULL=0
-
- case "x$with_builtin" in
-@@ -343,6 +373,7 @@ case "x$with_builtin" in
-
- BUILTIN_PULSE=1
- HAVE_ALSA=0
-+ HAVE_OSS=0
- HAVE_NULL=0
- ;;
-
-@@ -352,10 +383,22 @@ case "x$with_builtin" in
- fi
-
- BUILTIN_ALSA=1
-+ HAVE_OSS=0
- HAVE_PULSE=0
- HAVE_NULL=0
- ;;
-
-+ xoss)
-+ if test "x$HAV_OSS" != x1 ; then
-+ AC_MSG_ERROR([*** OSS selected for builtin driver, but not enabled. ***])
-+ fi
-+
-+ BUILTIN_OSS=1
-+ HAVE_ALSA=0
-+ HAVE_PULSE=0
-+ HAVE_NULL=0
-+ ;;
-+
- xnull)
- if test "x$HAVE_NULL" != x1 ; then
- AC_MSG_ERROR([*** Null output selected for builtin driver, but not enabled. ***])
-@@ -364,6 +407,7 @@ case "x$with_builtin" in
- BUILTIN_NULL=1
- HAVE_PULSE=0
- HAVE_ALSA=0
-+ HAVE_OSS=0
- ;;
-
- xdso)
-@@ -376,24 +420,28 @@ case "x$with_builtin" in
- AC_MSG_ERROR([*** Unknown driver $with_builtin selected for builtin ***])
- 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
- AC_MSG_ERROR([*** No backend enabled. ***])
- fi
-
- AC_SUBST(HAVE_DSO)
- AC_SUBST(HAVE_PULSE)
- AC_SUBST(HAVE_ALSA)
-+AC_SUBST(HAVE_OSS)
- AC_SUBST(HAVE_NULL)
- AC_SUBST(BUILTIN_DSO)
- AC_SUBST(BUILTIN_PULSE)
- AC_SUBST(BUILTIN_ALSA)
-+AC_SUBST(BUILTIN_OSS)
- AC_SUBST(BUILTIN_NULL)
- AM_CONDITIONAL([HAVE_PULSE], [test "x$HAVE_PULSE" = x1])
- AM_CONDITIONAL([HAVE_ALSA], [test "x$HAVE_ALSA" = x1])
-+AM_CONDITIONAL([HAVE_OSS], [test "x$HAVE_OSS" = x1])
- AM_CONDITIONAL([HAVE_NULL], [test "x$HAVE_NULL" = x1])
- AM_CONDITIONAL([BUILTIN_DSO], [test "x$BUILTIN_DSO" = x1])
- AM_CONDITIONAL([BUILTIN_PULSE], [test "x$BUILTIN_PULSE" = x1])
- AM_CONDITIONAL([BUILTIN_ALSA], [test "x$BUILTIN_ALSA" = x1])
-+AM_CONDITIONAL([BUILTIN_OSS], [test "x$BUILTIN_OSS" = x1])
- AM_CONDITIONAL([BUILTIN_NULL], [test "x$BUILTIN_NULL" = x1])
-
- GTK_DOC_CHECK(1.9)
-@@ -435,6 +483,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
-@@ -464,6 +521,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}
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-30 21:38:21 +0000