[SCM] audacity/master: Add support to disable dynamic loading of LAME.
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Thu Mar 10 14:42:37 UTC 2011
The following commit has been merged in the master branch:
commit 2d5b698c1dc9b476e76bfacc8f7aae428b37c5ca
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Mar 10 15:42:32 2011 +0100
Add support to disable dynamic loading of LAME.
diff --git a/debian/patches/configure.patch b/debian/patches/configure.patch
index eb38be4..301fa0f 100644
--- a/debian/patches/configure.patch
+++ b/debian/patches/configure.patch
@@ -474,7 +474,7 @@ Forwarded: not-needed
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
-
++
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
@@ -550,6 +550,7 @@ Forwarded: not-needed
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
-(eval "as_func_return () {
- (exit \$1)
-}
@@ -565,10 +566,6 @@ Forwarded: not-needed
-as_func_ret_failure () {
- return 1
-}
-
--exitcode=0
--if as_func_success; then
-- :
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
@@ -581,20 +578,16 @@ Forwarded: not-needed
+ {
+ eval $1+=\$2
+ }'
- else
-- exitcode=1
-- echo as_func_success failed.
--fi
++else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
--if as_func_failure; then
-- exitcode=1
-- echo as_func_failure succeeded.
--fi
+-exitcode=0
+-if as_func_success; then
+- :
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
@@ -605,16 +598,23 @@ Forwarded: not-needed
+ {
+ as_val=$(( $* ))
+ }'
-+else
+ else
+- exitcode=1
+- echo as_func_success failed.
+-fi
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+-if as_func_failure; then
+- exitcode=1
+- echo as_func_failure succeeded.
+-fi
+
-if as_func_ret_success; then
- :
-+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
@@ -843,15 +843,16 @@ Forwarded: not-needed
with_libsndfile
with_expat
with_libsamplerate
-@@ -771,6 +733,7 @@
+@@ -771,6 +733,8 @@
with_libtwolame
with_ffmpeg
with_midi
+with_portaudio
++with_lame
enable_audiounits
enable_ladspa
enable_quicktime
-@@ -809,15 +772,18 @@
+@@ -809,15 +773,18 @@
AVCODEC_LIBS
AVFORMAT_CFLAGS
AVFORMAT_LIBS
@@ -872,7 +873,7 @@ Forwarded: not-needed
lib-src/portmixer'
# Initialize some variables set by options.
-@@ -880,8 +846,9 @@
+@@ -880,8 +847,9 @@
fi
case $ac_option in
@@ -884,7 +885,7 @@ Forwarded: not-needed
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -926,8 +893,7 @@
+@@ -926,8 +894,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -894,7 +895,7 @@ Forwarded: not-needed
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -953,8 +919,7 @@
+@@ -953,8 +920,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -904,7 +905,7 @@ Forwarded: not-needed
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1158,8 +1123,7 @@
+@@ -1158,8 +1124,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -914,7 +915,7 @@ Forwarded: not-needed
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1175,8 +1139,7 @@
+@@ -1175,8 +1140,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -924,7 +925,7 @@ Forwarded: not-needed
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1206,17 +1169,17 @@
+@@ -1206,17 +1170,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -948,7 +949,7 @@ Forwarded: not-needed
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1233,15 +1196,13 @@
+@@ -1233,15 +1197,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -966,7 +967,7 @@ Forwarded: not-needed
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1264,8 +1225,7 @@
+@@ -1264,8 +1226,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -976,7 +977,7 @@ Forwarded: not-needed
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1279,8 +1239,8 @@
+@@ -1279,8 +1240,8 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
@@ -987,7 +988,7 @@ Forwarded: not-needed
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
-@@ -1295,11 +1255,9 @@
+@@ -1295,11 +1256,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -1001,7 +1002,7 @@ Forwarded: not-needed
# Find the source files, if location was not specified.
-@@ -1338,13 +1296,11 @@
+@@ -1338,13 +1297,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -1017,7 +1018,7 @@ Forwarded: not-needed
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1384,7 +1340,7 @@
+@@ -1384,7 +1341,7 @@
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
@@ -1026,7 +1027,7 @@ Forwarded: not-needed
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
-@@ -1449,6 +1405,9 @@
+@@ -1449,6 +1406,9 @@
--enable-static link wx statically [default=no]
--enable-unicode enable unicode support [default=yes]
--enable-debug enable debug support [default=no]
@@ -1036,15 +1037,16 @@ Forwarded: not-needed
--enable-nyquist enable Nyquist plug-in support [default=yes]
--enable-audiounits enable audio unit plug-in support (Mac OS X only)
[default=auto]
-@@ -1478,6 +1437,7 @@
+@@ -1478,6 +1438,8 @@
--with-libtwolame use libtwolame for MP2 export support
--with-ffmpeg use ffmpeg for import and export support
--with-midi use portSMF for Midi support
+ --with-portaudio use portaudio19
++ --with-lame use lame for import and export support
--with-portmixer compile with PortMixer [default=yes]
Some influential environment variables:
-@@ -1486,7 +1446,7 @@
+@@ -1486,7 +1448,7 @@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
@@ -1053,7 +1055,7 @@ Forwarded: not-needed
you have headers in a nonstandard directory <include dir>
CXX C++ compiler command
CXXFLAGS C++ compiler flags
-@@ -1528,10 +1488,17 @@
+@@ -1528,96 +1490,547 @@
C compiler flags for AVFORMAT, overriding pkg-config
AVFORMAT_LIBS
linker flags for AVFORMAT, overriding pkg-config
@@ -1071,10 +1073,13 @@ Forwarded: not-needed
GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
GTK_LIBS linker flags for GTK, overriding pkg-config
JACK_CFLAGS C compiler flags for JACK, overriding pkg-config
-@@ -1540,84 +1507,528 @@
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
+ JACK_LIBS linker flags for JACK, overriding pkg-config
+-Use these variables to override the choices made by `configure' or to help
+-it to find libraries and programs with nonstandard names/locations.
++Use these variables to override the choices made by `configure' or to help
++it to find libraries and programs with nonstandard names/locations.
++
+Report bugs to the package provider.
+_ACEOF
+ac_status=$?
@@ -1404,7 +1409,7 @@ Forwarded: not-needed
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
-+
+
+} # ac_fn_cxx_try_run
+
+# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
@@ -1423,21 +1428,44 @@ Forwarded: not-needed
+/* end confdefs.h. */
+$4
+#include <$2>
-+_ACEOF
+ _ACEOF
+-ac_status=$?
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+
+
+-if test "$ac_init_help" = "recursive"; then
+- # If there are subdirs, report their specific --help.
+- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+- test -d "$ac_dir" ||
+- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+- continue
+- ac_builddir=.
+} # ac_fn_cxx_check_header_compile
-+
+
+-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
+# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
@@ -1463,24 +1491,31 @@ Forwarded: not-needed
+/* end confdefs.h. */
+$4
+#include <$2>
- _ACEOF
--ac_status=$?
++_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
- fi
++fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
--if test "$ac_init_help" = "recursive"; then
-- # If there are subdirs, report their specific --help.
-- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-- test -d "$ac_dir" ||
-- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-- continue
-- ac_builddir=.
+-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
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
@@ -1497,16 +1532,19 @@ Forwarded: not-needed
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
--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 ;;
+- cd "$ac_dir" || { ac_status=$?; continue; }
+- # Check for guested configure.
+- if test -f "$ac_srcdir/configure.gnu"; then
+- echo &&
+- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+- elif test -f "$ac_srcdir/configure"; then
+- echo &&
+- $SHELL "$ac_srcdir/configure" --help=recursive
+- else
+- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+- fi || ac_status=$?
+- cd "$ac_pwd" || { ac_status=$?; break; }
+- done
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
+ yes:no: )
@@ -1527,11 +1565,7 @@ Forwarded: not-needed
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
- 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
++esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
@@ -1542,40 +1576,20 @@ Forwarded: not-needed
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
-+fi
+ fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--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
+-test -n "$ac_init_help" && exit $ac_status
+-if $ac_init_version; then
+- cat <<\_ACEOF
+-configure
+-generated by GNU Autoconf 2.63
+} # ac_fn_cxx_check_header_mongrel
-- cd "$ac_dir" || { ac_status=$?; continue; }
-- # Check for guested configure.
-- if test -f "$ac_srcdir/configure.gnu"; then
-- echo &&
-- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-- elif test -f "$ac_srcdir/configure"; then
-- echo &&
-- $SHELL "$ac_srcdir/configure" --help=recursive
-- else
-- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-- fi || ac_status=$?
-- cd "$ac_pwd" || { ac_status=$?; break; }
-- done
--fi
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+-This configure script is free software; the Free Software Foundation
+-gives unlimited permission to copy, distribute and modify it.
+# ac_fn_cxx_check_func LINENO FUNC VAR
+# ------------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -1592,21 +1606,12 @@ Forwarded: not-needed
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $2 innocuous_$2
-
--test -n "$ac_init_help" && exit $ac_status
--if $ac_init_version; then
-- cat <<\_ACEOF
--configure
--generated by GNU Autoconf 2.63
++
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $2 (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
--This configure script is free software; the Free Software Foundation
--gives unlimited permission to copy, distribute and modify it.
++
+#ifdef __STDC__
+# include <limits.h>
+#else
@@ -1642,10 +1647,10 @@ Forwarded: not-needed
+ eval "$3=yes"
+else
+ eval "$3=no"
- fi
++fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-+fi
+ fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
@@ -1662,7 +1667,7 @@ Forwarded: not-needed
$ $0 $@
-@@ -1653,8 +2064,8 @@
+@@ -1653,8 +2066,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1673,7 +1678,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
} >&5
-@@ -1691,9 +2102,9 @@
+@@ -1691,9 +2104,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1685,7 +1690,7 @@ Forwarded: not-needed
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1709,13 +2120,13 @@
+@@ -1709,13 +2122,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -1702,7 +1707,7 @@ Forwarded: not-needed
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -1727,11 +2138,9 @@
+@@ -1727,11 +2140,9 @@
{
echo
@@ -1716,7 +1721,7 @@ Forwarded: not-needed
echo
# The following way of writing the cache mishandles newlines in values,
(
-@@ -1740,13 +2149,13 @@
+@@ -1740,13 +2151,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -1732,7 +1737,7 @@ Forwarded: not-needed
esac ;;
esac
done
-@@ -1765,11 +2174,9 @@
+@@ -1765,11 +2176,9 @@
)
echo
@@ -1746,7 +1751,7 @@ Forwarded: not-needed
echo
for ac_var in $ac_subst_vars
do
-@@ -1782,11 +2189,9 @@
+@@ -1782,11 +2191,9 @@
echo
if test -n "$ac_subst_files"; then
@@ -1760,7 +1765,7 @@ Forwarded: not-needed
echo
for ac_var in $ac_subst_files
do
-@@ -1800,11 +2205,9 @@
+@@ -1800,11 +2207,9 @@
fi
if test -s confdefs.h; then
@@ -1774,7 +1779,7 @@ Forwarded: not-needed
echo
cat confdefs.h
echo
-@@ -1818,46 +2221,53 @@
+@@ -1818,46 +2223,53 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -1834,7 +1839,7 @@ Forwarded: not-needed
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
-@@ -1868,19 +2278,23 @@
+@@ -1868,19 +2280,23 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -1865,7 +1870,7 @@ Forwarded: not-needed
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -1888,12 +2302,12 @@
+@@ -1888,12 +2304,12 @@
esac
fi
else
@@ -1880,7 +1885,7 @@ Forwarded: not-needed
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
-@@ -1904,11 +2318,11 @@
+@@ -1904,11 +2320,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -1894,7 +1899,7 @@ Forwarded: not-needed
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -1918,17 +2332,17 @@
+@@ -1918,17 +2334,17 @@
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -1916,7 +1921,7 @@ Forwarded: not-needed
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -1940,35 +2354,20 @@
+@@ -1940,35 +2356,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -1959,7 +1964,7 @@ Forwarded: not-needed
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -1991,9 +2390,9 @@
+@@ -1991,9 +2392,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -1971,7 +1976,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2004,24 +2403,24 @@
+@@ -2004,24 +2405,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2001,7 +2006,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2031,9 +2430,9 @@
+@@ -2031,9 +2432,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -2013,7 +2018,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -2044,24 +2443,24 @@
+@@ -2044,24 +2445,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2043,7 +2048,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2070,7 +2469,7 @@
+@@ -2070,7 +2471,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2052,7 +2057,7 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2084,9 +2483,9 @@
+@@ -2084,9 +2485,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -2064,7 +2069,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2097,24 +2496,24 @@
+@@ -2097,24 +2498,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2094,7 +2099,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2124,9 +2523,9 @@
+@@ -2124,9 +2525,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -2106,7 +2111,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2138,18 +2537,18 @@
+@@ -2138,18 +2539,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2128,7 +2133,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -2168,10 +2567,10 @@
+@@ -2168,10 +2569,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2141,7 +2146,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2183,9 +2582,9 @@
+@@ -2183,9 +2584,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -2153,7 +2158,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2196,24 +2595,24 @@
+@@ -2196,24 +2597,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2183,7 +2188,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2227,9 +2626,9 @@
+@@ -2227,9 +2628,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2195,7 +2200,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -2240,24 +2639,24 @@
+@@ -2240,24 +2641,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2225,7 +2230,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2270,7 +2669,7 @@
+@@ -2270,7 +2671,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2234,7 +2239,7 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2281,57 +2680,37 @@
+@@ -2281,57 +2682,37 @@
fi
@@ -2312,7 +2317,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -2347,8 +2726,8 @@
+@@ -2347,8 +2728,8 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -2323,7 +2328,7 @@ Forwarded: not-needed
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -2364,17 +2743,17 @@
+@@ -2364,17 +2745,17 @@
done
rm -f $ac_rmfiles
@@ -2346,7 +2351,7 @@ Forwarded: not-needed
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -2391,7 +2770,7 @@
+@@ -2391,103 +2772,60 @@
# certainly right.
break;;
*.* )
@@ -2355,42 +2360,39 @@ Forwarded: not-needed
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -2410,84 +2789,41 @@
- else
- ac_file=''
- fi
+ # We set ac_cv_exeext here because the later test for it is not
+ # safe: cross compilers may not add the suffix if given an `-o'
+ # argument, so we may need to know it at that point already.
+- # Even if this section looks crufty: it has the advantage of
+- # actually working.
+- break;;
+- * )
+- break;;
+- esac
+-done
+-test "$ac_cv_exeext" = no && ac_cv_exeext=
+-
+-else
+- ac_file=''
+-fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
- $as_echo "$as_me: failed program was:" >&5
-+if test -z "$ac_file"; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
-+as_fn_error 77 "C compiler cannot create executables
-+See \`config.log' for more details" "$LINENO" 5 ; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
+-fi
+-
+-ac_exeext=$ac_cv_exeext
-
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
@@ -2425,10 +2427,39 @@ Forwarded: not-needed
- { (exit 1); exit 1; }; }; }
- fi
- fi
--fi
++ # Even if this section looks crufty: it has the advantage of
++ # actually working.
++ break;;
++ * )
++ break;;
++ esac
++done
++test "$ac_cv_exeext" = no && ac_cv_exeext=
++
++else
++ ac_file=''
+ fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--
++if test -z "$ac_file"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++$as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error 77 "C compiler cannot create executables
++See \`config.log' for more details" "$LINENO" 5 ; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
++$as_echo "$ac_file" >&6; }
++ac_exeext=$ac_cv_exeext
+
rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run. If not, either
@@ -2460,23 +2491,32 @@ Forwarded: not-needed
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -2502,32 +2838,83 @@
+@@ -2502,32 +2840,83 @@
esac
done
else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5 ; }
-+fi
+ fi
+-
+-rm -f conftest$ac_cv_exeext
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-+$as_echo "$ac_cv_exeext" >&6; }
-+
-+rm -f conftest.$ac_ext
-+EXEEXT=$ac_cv_exeext
-+ac_exeext=$EXEEXT
+ $as_echo "$ac_cv_exeext" >&6; }
+
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
@@ -2524,29 +2564,16 @@ Forwarded: not-needed
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ fi
- fi
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
-
--rm -f conftest$ac_cv_exeext
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--$as_echo "$ac_cv_exeext" >&6; }
--
--rm -f conftest.$ac_ext
--EXEEXT=$ac_cv_exeext
--ac_exeext=$EXEEXT
--{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
++
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
@@ -2564,7 +2591,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -2539,17 +2926,17 @@
+@@ -2539,17 +2928,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -2587,7 +2614,7 @@ Forwarded: not-needed
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -2562,31 +2949,23 @@
+@@ -2562,31 +2951,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2626,7 +2653,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -2600,37 +2979,16 @@
+@@ -2600,37 +2981,16 @@
return 0;
}
_ACEOF
@@ -2667,7 +2694,7 @@ Forwarded: not-needed
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -2639,20 +2997,16 @@
+@@ -2639,20 +2999,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -2691,7 +2718,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -2663,35 +3017,11 @@
+@@ -2663,35 +3019,11 @@
return 0;
}
_ACEOF
@@ -2730,7 +2757,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -2702,36 +3032,12 @@
+@@ -2702,36 +3034,12 @@
return 0;
}
_ACEOF
@@ -2771,7 +2798,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -2742,42 +3048,17 @@
+@@ -2742,42 +3050,17 @@
return 0;
}
_ACEOF
@@ -2816,7 +2843,7 @@ Forwarded: not-needed
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -2794,18 +3075,14 @@
+@@ -2794,18 +3077,14 @@
CFLAGS=
fi
fi
@@ -2838,7 +2865,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -2862,32 +3139,9 @@
+@@ -2862,32 +3141,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -2872,7 +2899,7 @@ Forwarded: not-needed
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -2898,17 +3152,19 @@
+@@ -2898,17 +3154,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -2895,7 +2922,7 @@ Forwarded: not-needed
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2936,9 +3192,9 @@
+@@ -2936,9 +3194,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -2907,7 +2934,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -2949,24 +3205,24 @@
+@@ -2949,24 +3207,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2937,7 +2964,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2980,9 +3236,9 @@
+@@ -2980,9 +3238,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2949,7 +2976,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -2993,24 +3249,24 @@
+@@ -2993,24 +3251,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2979,7 +3006,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -3023,7 +3279,7 @@
+@@ -3023,7 +3281,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2988,7 +3015,7 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3034,53 +3290,36 @@
+@@ -3034,53 +3292,36 @@
fi
fi
# Provide some information about the compiler.
@@ -3061,7 +3088,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -3094,37 +3333,16 @@
+@@ -3094,37 +3335,16 @@
return 0;
}
_ACEOF
@@ -3102,7 +3129,7 @@ Forwarded: not-needed
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GXX=yes
-@@ -3133,20 +3351,16 @@
+@@ -3133,20 +3353,16 @@
fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
@@ -3126,7 +3153,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -3157,35 +3371,11 @@
+@@ -3157,35 +3373,11 @@
return 0;
}
_ACEOF
@@ -3165,7 +3192,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -3196,36 +3386,12 @@
+@@ -3196,36 +3388,12 @@
return 0;
}
_ACEOF
@@ -3206,7 +3233,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -3236,42 +3402,17 @@
+@@ -3236,42 +3404,17 @@
return 0;
}
_ACEOF
@@ -3251,7 +3278,7 @@ Forwarded: not-needed
$as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
-@@ -3299,10 +3440,10 @@
+@@ -3299,10 +3442,10 @@
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
@@ -3264,7 +3291,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
# Double quotes because CXXCPP needs to be expanded
-@@ -3317,11 +3458,7 @@
+@@ -3317,11 +3460,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -3277,7 +3304,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -3330,78 +3467,34 @@
+@@ -3330,78 +3469,34 @@
#endif
Syntax error
_ACEOF
@@ -3364,7 +3391,7 @@ Forwarded: not-needed
break
fi
-@@ -3413,7 +3506,7 @@
+@@ -3413,7 +3508,7 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -3373,7 +3400,7 @@ Forwarded: not-needed
$as_echo "$CXXCPP" >&6; }
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
-@@ -3424,11 +3517,7 @@
+@@ -3424,11 +3519,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -3386,7 +3413,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -3437,87 +3526,40 @@
+@@ -3437,87 +3528,40 @@
#endif
Syntax error
_ACEOF
@@ -3486,7 +3513,7 @@ Forwarded: not-needed
fi
ac_ext=cpp
-@@ -3547,9 +3589,7 @@
+@@ -3547,9 +3591,7 @@
fi
done
if test -z "$ac_aux_dir"; then
@@ -3497,7 +3524,7 @@ Forwarded: not-needed
fi
# These three variables are undocumented and unsupported,
-@@ -3575,10 +3615,10 @@
+@@ -3575,10 +3617,10 @@
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
@@ -3510,7 +3537,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -3586,11 +3626,11 @@
+@@ -3586,11 +3628,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3526,7 +3553,7 @@ Forwarded: not-needed
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -3627,7 +3667,7 @@
+@@ -3627,7 +3669,7 @@
;;
esac
@@ -3535,7 +3562,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -3643,7 +3683,7 @@
+@@ -3643,7 +3685,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -3544,7 +3571,7 @@ Forwarded: not-needed
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -3656,9 +3696,9 @@
+@@ -3656,9 +3698,9 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -3556,7 +3583,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$HAVE_PKG_CONFIG"; then
-@@ -3669,14 +3709,14 @@
+@@ -3669,14 +3711,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3574,7 +3601,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
test -z "$ac_cv_prog_HAVE_PKG_CONFIG" && ac_cv_prog_HAVE_PKG_CONFIG="no"
-@@ -3684,18 +3724,16 @@
+@@ -3684,18 +3726,16 @@
fi
HAVE_PKG_CONFIG=$ac_cv_prog_HAVE_PKG_CONFIG
if test -n "$HAVE_PKG_CONFIG"; then
@@ -3596,7 +3623,7 @@ Forwarded: not-needed
fi
-@@ -3730,9 +3768,7 @@
+@@ -3730,9 +3770,7 @@
if [ "$AUDACITY_NAME" = "audacity" ] ; then
@@ -3607,7 +3634,7 @@ Forwarded: not-needed
else
cat >>confdefs.h <<_ACEOF
-@@ -3755,16 +3791,14 @@
+@@ -3755,16 +3793,14 @@
### Configuration of Audacity module support ###
################################################
@@ -3627,7 +3654,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -3772,7 +3806,7 @@
+@@ -3772,7 +3808,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -3636,7 +3663,7 @@ Forwarded: not-needed
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -3781,7 +3815,7 @@
+@@ -3781,7 +3817,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3645,7 +3672,7 @@ Forwarded: not-needed
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -3801,7 +3835,7 @@
+@@ -3801,7 +3837,7 @@
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3654,7 +3681,7 @@ Forwarded: not-needed
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
-@@ -3816,19 +3850,17 @@
+@@ -3816,19 +3852,17 @@
$ac_path_SED_found && break 3
done
done
@@ -3677,7 +3704,7 @@ Forwarded: not-needed
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -3841,9 +3873,9 @@
+@@ -3841,9 +3875,9 @@
flag=`echo "-rdynamic" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
@@ -3689,7 +3716,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
-@@ -3852,14 +3884,10 @@
+@@ -3852,14 +3886,10 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -rdynamic"
@@ -3706,7 +3733,7 @@ Forwarded: not-needed
int
main ()
{
-@@ -3869,42 +3897,17 @@
+@@ -3869,42 +3899,17 @@
}
_ACEOF
@@ -3752,7 +3779,7 @@ Forwarded: not-needed
LDFLAGS="$save_LDFLAGS"
-@@ -3912,12 +3915,11 @@
+@@ -3912,12 +3917,11 @@
fi
@@ -3768,7 +3795,7 @@ Forwarded: not-needed
:
have_dynamic_link=yes
-@@ -3929,13 +3931,12 @@
+@@ -3929,13 +3933,12 @@
fi
@@ -3784,7 +3811,7 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: \"Audacity module support will probably not work\"" >&2;}
fi
-@@ -3943,7 +3944,7 @@
+@@ -3943,7 +3946,7 @@
#####################
# Check whether --enable-static was given.
@@ -3793,7 +3820,7 @@ Forwarded: not-needed
enableval=$enable_static; static_preference="--static=$enableval"
else
static_preference=""
-@@ -3951,7 +3952,7 @@
+@@ -3951,7 +3954,7 @@
# Check whether --enable-unicode was given.
@@ -3802,7 +3829,7 @@ Forwarded: not-needed
enableval=$enable_unicode; unicode_preference="--unicode=$enableval"
else
unicode_preference="--unicode=yes"
-@@ -3959,7 +3960,7 @@
+@@ -3959,7 +3962,7 @@
# Check whether --enable-debug was given.
@@ -3811,7 +3838,7 @@ Forwarded: not-needed
enableval=$enable_debug; debug_preference="$enableval"
else
debug_preference="no"
-@@ -3968,32 +3969,36 @@
+@@ -3968,32 +3971,36 @@
# Check whether --with-lib-preference was given.
@@ -3857,7 +3884,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -4053,48 +4058,25 @@
+@@ -4053,48 +4060,25 @@
return 0;
}
_ACEOF
@@ -3912,7 +3939,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4105,7 +4087,7 @@
+@@ -4105,7 +4089,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3921,7 +3948,7 @@ Forwarded: not-needed
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -4125,7 +4107,7 @@
+@@ -4125,7 +4109,7 @@
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3930,7 +3957,7 @@ Forwarded: not-needed
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -4140,26 +4122,24 @@
+@@ -4140,26 +4124,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -3962,7 +3989,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4173,7 +4153,7 @@
+@@ -4173,7 +4155,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3971,7 +3998,7 @@ Forwarded: not-needed
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -4193,7 +4173,7 @@
+@@ -4193,7 +4175,7 @@
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3980,7 +4007,7 @@ Forwarded: not-needed
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4208,12 +4188,10 @@
+@@ -4208,12 +4190,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -3995,7 +4022,7 @@ Forwarded: not-needed
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4221,21 +4199,17 @@
+@@ -4221,21 +4201,17 @@
fi
fi
@@ -4021,7 +4048,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -4250,48 +4224,23 @@
+@@ -4250,48 +4226,23 @@
return 0;
}
_ACEOF
@@ -4075,7 +4102,7 @@ Forwarded: not-needed
else
ac_cv_header_stdc=no
fi
-@@ -4301,18 +4250,14 @@
+@@ -4301,18 +4252,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -4097,7 +4124,7 @@ Forwarded: not-needed
else
ac_cv_header_stdc=no
fi
-@@ -4322,14 +4267,10 @@
+@@ -4322,14 +4269,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -4114,7 +4141,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -4356,118 +4297,33 @@
+@@ -4356,118 +4299,33 @@
return 0;
}
_ACEOF
@@ -4245,7 +4272,7 @@ Forwarded: not-needed
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -4477,102 +4333,9 @@
+@@ -4477,102 +4335,9 @@
done
@@ -4336,11 +4363,11 @@ Forwarded: not-needed
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
+-fi
+ac_fn_cxx_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = x""yes; then :
--fi
--
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
@@ -4350,7 +4377,7 @@ Forwarded: not-needed
else
cat >>confdefs.h <<_ACEOF
-@@ -4585,144 +4348,12 @@
+@@ -4585,144 +4350,12 @@
@@ -4501,7 +4528,7 @@ Forwarded: not-needed
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -4737,14 +4368,9 @@
+@@ -4737,14 +4370,9 @@
@@ -4518,7 +4545,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
ac_cv_cflags_strict_prototypes="no, unknown"
-@@ -4758,11 +4384,7 @@
+@@ -4758,11 +4386,7 @@
ac_save_CFLAGS="$CFLAGS"
for ac_arg in "-pedantic % -fstrict-prototypes -Wstrict-prototypes" "-pedantic % -Wstrict-prototypes" "-pedantic % -Wmissing-prototypes" "-pedantic % -Werror-implicit-function-declaration" "-pedantic % -Wimplicit-function-declaration" #
do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
@@ -4531,7 +4558,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -4773,43 +4395,16 @@
+@@ -4773,43 +4397,16 @@
return 0;
}
_ACEOF
@@ -4577,7 +4604,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#include <signal.h>
int
-@@ -4822,34 +4417,13 @@
+@@ -4822,34 +4419,13 @@
return 0;
}
_ACEOF
@@ -4614,7 +4641,7 @@ Forwarded: not-needed
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
rm config.tmp
;;
-@@ -4863,7 +4437,7 @@
+@@ -4863,7 +4439,7 @@
fi
@@ -4623,7 +4650,7 @@ Forwarded: not-needed
$as_echo "$ac_cv_cflags_strict_prototypes" >&6; }
case ".$ac_cv_cflags_strict_prototypes" in
.ok|.ok,*) ;;
-@@ -4871,25 +4445,25 @@
+@@ -4871,25 +4447,25 @@
;;
*)
if echo " $CFLAGS " | grep " $ac_cv_cflags_strict_prototypes " 2>&1 >/dev/null
@@ -4657,7 +4684,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
ac_cv_cflags_warn_all="no, unknown"
-@@ -4903,11 +4477,7 @@
+@@ -4903,11 +4479,7 @@
ac_save_CFLAGS="$CFLAGS"
for ac_arg in "-pedantic % -Wall" "-xstrconst % -v" "-std1 % -verbose -w0 -warnprotos" "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" "-ansi -ansiE % -fullwarn" "+ESlit % +w1" "-Xc % -pvctl,fullmsg" "-h conform % -h msglevel 2" #
do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
@@ -4670,7 +4697,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -4918,32 +4488,9 @@
+@@ -4918,32 +4490,9 @@
return 0;
}
_ACEOF
@@ -4704,7 +4731,7 @@ Forwarded: not-needed
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
CFLAGS="$ac_save_CFLAGS"
-@@ -4955,7 +4502,7 @@
+@@ -4955,7 +4504,7 @@
fi
@@ -4713,7 +4740,7 @@ Forwarded: not-needed
$as_echo "$ac_cv_cflags_warn_all" >&6; }
case ".$ac_cv_cflags_warn_all" in
.ok|.ok,*) ;;
-@@ -4963,16 +4510,16 @@
+@@ -4963,16 +4512,16 @@
;;
*)
if echo " $wall_flags " | grep " $ac_cv_cflags_warn_all " 2>&1 >/dev/null
@@ -4736,7 +4763,7 @@ Forwarded: not-needed
wall_flags="$wall_flags $ac_cv_cflags_warn_all"
fi
;;
-@@ -4986,9 +4533,9 @@
+@@ -4986,9 +4535,9 @@
flag=`echo "$wall_flags" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
@@ -4748,7 +4775,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
-@@ -5002,14 +4549,10 @@
+@@ -5002,14 +4551,10 @@
save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $wall_flags"
@@ -4766,7 +4793,7 @@ Forwarded: not-needed
int
main ()
{
-@@ -5019,36 +4562,15 @@
+@@ -5019,36 +4564,15 @@
}
_ACEOF
@@ -4804,7 +4831,7 @@ Forwarded: not-needed
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5062,12 +4584,11 @@
+@@ -5062,12 +4586,11 @@
fi
@@ -4820,7 +4847,7 @@ Forwarded: not-needed
:
cxx_does_wall="yes"
-@@ -5079,7 +4600,6 @@
+@@ -5079,7 +4602,6 @@
fi
@@ -4828,7 +4855,7 @@ Forwarded: not-needed
if test "x$cxx_does_wall" = "xyes" ; then
CXXFLAGS="${CXXFLAGS} $wall_flags"
fi
-@@ -5090,9 +4610,9 @@
+@@ -5090,9 +4612,9 @@
flag=`echo "$wall_flags" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
@@ -4840,7 +4867,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
-@@ -5106,14 +4626,10 @@
+@@ -5106,14 +4628,10 @@
save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $wall_flags"
@@ -4858,7 +4885,7 @@ Forwarded: not-needed
int
main ()
{
-@@ -5123,36 +4639,16 @@
+@@ -5123,36 +4641,16 @@
}
_ACEOF
@@ -4897,7 +4924,7 @@ Forwarded: not-needed
CXXFLAGS="$save_CXXFLAGS"
-@@ -5165,12 +4661,11 @@
+@@ -5165,12 +4663,11 @@
fi
@@ -4913,7 +4940,7 @@ Forwarded: not-needed
:
cpp_does_wall="yes"
-@@ -5182,7 +4677,6 @@
+@@ -5182,7 +4679,6 @@
fi
@@ -4921,7 +4948,7 @@ Forwarded: not-needed
if test "x$cpp_does_wall" = "xyes" ; then
CPPFLAGS="${CPPFLAGS} $wall_flags"
fi
-@@ -5192,19 +4686,15 @@
+@@ -5192,19 +4688,15 @@
CFLAG_VISIBILITY=
HAVE_VISIBILITY=0
if test -n "$GCC"; then
@@ -4944,7 +4971,7 @@ Forwarded: not-needed
/* end confdefs.h. */
extern __attribute__((__visibility__("hidden"))) int hiddenvar;
extern __attribute__((__visibility__("default"))) int exportedvar;
-@@ -5218,37 +4708,16 @@
+@@ -5218,37 +4710,16 @@
return 0;
}
_ACEOF
@@ -4985,7 +5012,7 @@ Forwarded: not-needed
$as_echo "$gl_cv_cc_visibility" >&6; }
if test $gl_cv_cc_visibility = yes; then
CFLAG_VISIBILITY="-fvisibility=hidden"
-@@ -5267,9 +4736,9 @@
+@@ -5267,9 +4738,9 @@
# Extract the first word of "wx-config", so it can be a program name with args.
set dummy wx-config; ac_word=$2
@@ -4997,7 +5024,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
case $WX_CONFIG in
-@@ -5283,14 +4752,14 @@
+@@ -5283,14 +4754,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5015,7 +5042,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
test -z "$ac_cv_path_WX_CONFIG" && ac_cv_path_WX_CONFIG="no"
-@@ -5299,18 +4768,16 @@
+@@ -5299,18 +4770,16 @@
fi
WX_CONFIG=$ac_cv_path_WX_CONFIG
if test -n "$WX_CONFIG"; then
@@ -5037,7 +5064,7 @@ Forwarded: not-needed
fi
if test "x$debug_preference" = "xyes"; then
-@@ -5322,7 +4789,7 @@
+@@ -5322,7 +4791,7 @@
wxconfigargs="$static_preference $unicode_preference $wxconfigargs $wx_preference"
wx_version=`${WX_CONFIG} $wxconfigargs --version`
@@ -5046,7 +5073,7 @@ Forwarded: not-needed
$as_echo "$as_me: Checking that the chosen version of wxWidgets is 2.8.x" >&6;}
case "${wx_version}" in
-@@ -5331,19 +4798,12 @@
+@@ -5331,19 +4800,12 @@
;;
*)
wx_list=`${WX_CONFIG} --list`
@@ -5068,7 +5095,7 @@ Forwarded: not-needed
esac
ac_configure_args="$ac_configure_args --with-wx-config=\"$WX_CONFIG\""
-@@ -5355,7 +4815,7 @@
+@@ -5355,7 +4817,7 @@
@@ -5077,7 +5104,7 @@ Forwarded: not-needed
LOCAL_LIBS="$LOCAL_LIBS FileDialog.a"
CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/lib-src/FileDialog"
-@@ -5366,9 +4826,9 @@
+@@ -5366,9 +4828,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -5089,7 +5116,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -5381,14 +4841,14 @@
+@@ -5381,14 +4843,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5107,7 +5134,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
;;
-@@ -5396,10 +4856,10 @@
+@@ -5396,10 +4858,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -5120,7 +5147,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -5409,9 +4869,9 @@
+@@ -5409,9 +4871,9 @@
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -5132,7 +5159,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -5424,14 +4884,14 @@
+@@ -5424,14 +4886,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5150,7 +5177,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
;;
-@@ -5439,10 +4899,10 @@
+@@ -5439,10 +4901,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -5163,7 +5190,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -5451,7 +4911,7 @@
+@@ -5451,7 +4913,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5172,7 +5199,7 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5464,13 +4924,13 @@
+@@ -5464,13 +4926,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -5189,7 +5216,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -5529,49 +4989,9 @@
+@@ -5529,49 +4991,9 @@
fi
ax_popdir=`pwd`
@@ -5241,7 +5268,7 @@ Forwarded: not-needed
ac_builddir=.
case ""${srcdir}/lib-src/lib-widget-extra"" in
-@@ -5617,7 +5037,7 @@
+@@ -5617,7 +5039,7 @@
# This should be Cygnus configure.
ax_sub_configure=$ac_aux_dir/configure
else
@@ -5250,7 +5277,7 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: no configuration information is in \"${srcdir}/lib-src/lib-widget-extra\"" >&2;}
ax_sub_configure=
fi
-@@ -5631,7 +5051,7 @@
+@@ -5631,7 +5053,7 @@
ax_sub_cache_file=$ac_top_build_prefix$cache_file ;;
esac
@@ -5259,7 +5286,7 @@ Forwarded: not-needed
$as_echo "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&6;}
# The eval makes quoting arguments work.
eval "\$SHELL \"\$ax_sub_configure\" $ax_sub_configure_args \
-@@ -5639,25 +5059,25 @@
+@@ -5639,25 +5061,25 @@
fi
cd "$ax_popdir"
@@ -5290,7 +5317,7 @@ Forwarded: not-needed
pkg_cv_WIDGETEXTRA_CFLAGS=`$PKG_CONFIG --cflags "libwidgetextra" 2>/dev/null`
else
pkg_failed=yes
-@@ -5669,11 +5089,11 @@
+@@ -5669,11 +5091,11 @@
pkg_cv_WIDGETEXTRA_LIBS="$WIDGETEXTRA_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -5305,7 +5332,7 @@ Forwarded: not-needed
pkg_cv_WIDGETEXTRA_LIBS=`$PKG_CONFIG --libs "libwidgetextra" 2>/dev/null`
else
pkg_failed=yes
-@@ -5699,7 +5119,7 @@
+@@ -5699,7 +5121,7 @@
# Put the nasty error message in config.log where it belongs
echo "$WIDGETEXTRA_PKG_ERRORS" >&5
@@ -5314,7 +5341,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
widgetextra_available="no"
elif test $pkg_failed = untried; then
-@@ -5707,31 +5127,29 @@
+@@ -5707,31 +5129,29 @@
else
WIDGETEXTRA_CFLAGS=$pkg_cv_WIDGETEXTRA_CFLAGS
WIDGETEXTRA_LIBS=$pkg_cv_WIDGETEXTRA_LIBS
@@ -5336,7 +5363,7 @@ Forwarded: not-needed
LIBSRC_BUILD="$LIBSRC_BUILD widgetextra"
-LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG PORTSMF"
-+LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG PORTSMF PORTAUDIO"
++LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG PORTSMF PORTAUDIO LAME"
-{ $as_echo "$as_me:$LINENO: Determining what libraries are available in this tree and on the system" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Determining what libraries are available in this tree and on the system" >&5
@@ -5351,7 +5378,7 @@ Forwarded: not-needed
withval=$with_libsndfile; LIBSNDFILE_ARGUMENT=$withval
else
LIBSNDFILE_ARGUMENT="unspecified"
-@@ -5741,18 +5159,18 @@
+@@ -5741,18 +5161,18 @@
pkg_failed=no
@@ -5374,7 +5401,7 @@ Forwarded: not-needed
pkg_cv_SNDFILE_CFLAGS=`$PKG_CONFIG --cflags "sndfile >= 1.0.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -5764,11 +5182,11 @@
+@@ -5764,11 +5184,11 @@
pkg_cv_SNDFILE_LIBS="$SNDFILE_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -5389,7 +5416,7 @@ Forwarded: not-needed
pkg_cv_SNDFILE_LIBS=`$PKG_CONFIG --libs "sndfile >= 1.0.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -5794,7 +5212,7 @@
+@@ -5794,7 +5214,7 @@
# Put the nasty error message in config.log where it belongs
echo "$SNDFILE_PKG_ERRORS" >&5
@@ -5398,7 +5425,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
sndfile_available_system="no"
elif test $pkg_failed = untried; then
-@@ -5802,7 +5220,7 @@
+@@ -5802,7 +5222,7 @@
else
SNDFILE_CFLAGS=$pkg_cv_SNDFILE_CFLAGS
SNDFILE_LIBS=$pkg_cv_SNDFILE_LIBS
@@ -5407,7 +5434,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
sndfile_available_system="yes"
fi
-@@ -5811,38 +5229,33 @@
+@@ -5811,38 +5231,33 @@
LIBSNDFILE_SYSTEM_AVAILABLE="yes"
LIBSNDFILE_SYSTEM_LIBS=$SNDFILE_LIBS
LIBSNDFILE_SYSTEM_CXXFLAGS=$SNDFILE_CFLAGS
@@ -5454,7 +5481,7 @@ Forwarded: not-needed
libsndfile_found="yes"
else
libsndfile_found="no"
-@@ -5854,14 +5267,14 @@
+@@ -5854,14 +5269,14 @@
LIBSNDFILE_LOCAL_LIBS="libsndfile.a"
LIBSNDFILE_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libsndfile/src'
LIBSNDFILE_LOCAL_CONFIG_SUBDIRS="lib-src/libsndfile"
@@ -5471,7 +5498,7 @@ Forwarded: not-needed
$as_echo "$as_me: libsndfile libraries are NOT available in this source tree" >&6;}
fi
-@@ -5870,7 +5283,7 @@
+@@ -5870,7 +5285,7 @@
# Check whether --with-expat was given.
@@ -5480,7 +5507,7 @@ Forwarded: not-needed
withval=$with_expat; LIBEXPAT_ARGUMENT=$withval
else
LIBEXPAT_ARGUMENT="unspecified"
-@@ -5878,18 +5291,14 @@
+@@ -5878,18 +5293,14 @@
@@ -5502,7 +5529,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -5907,43 +5316,18 @@
+@@ -5907,43 +5318,18 @@
return 0;
}
_ACEOF
@@ -5552,7 +5579,7 @@ Forwarded: not-needed
libexpat_found="yes"
else
libexpat_found="no"
-@@ -5952,134 +5336,8 @@
+@@ -5952,134 +5338,8 @@
expat_h_found="no"
@@ -5689,7 +5716,7 @@ Forwarded: not-needed
expat_h_found="yes"
else
expat_h_found="no"
-@@ -6091,38 +5349,33 @@
+@@ -6091,38 +5351,33 @@
LIBEXPAT_SYSTEM_AVAILABLE="yes"
LIBEXPAT_SYSTEM_LIBS="-lexpat"
LIBEXPAT_SYSTEM_CPPSYMBOLS="USE_SYSTEM_EXPAT"
@@ -5736,7 +5763,7 @@ Forwarded: not-needed
xmlparse_h_found="yes"
else
xmlparse_h_found="no"
-@@ -6135,11 +5388,11 @@
+@@ -6135,11 +5390,11 @@
LIBEXPAT_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/expat'
LIBEXPAT_LOCAL_CPPSYMBOLS="USE_LOCAL_EXPAT"
@@ -5750,7 +5777,7 @@ Forwarded: not-needed
$as_echo "$as_me: Expat libraries are NOT available in the local tree" >&6;}
fi
-@@ -6147,7 +5400,7 @@
+@@ -6147,7 +5402,7 @@
# Check whether --with-libsamplerate was given.
@@ -5759,7 +5786,7 @@ Forwarded: not-needed
withval=$with_libsamplerate; LIBSAMPLERATE_ARGUMENT=$withval
else
LIBSAMPLERATE_ARGUMENT="unspecified"
-@@ -6156,27 +5409,25 @@
+@@ -6156,27 +5411,25 @@
if false ; then
@@ -5792,7 +5819,7 @@ Forwarded: not-needed
pkg_cv_SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate >= 0.1.2" 2>/dev/null`
else
pkg_failed=yes
-@@ -6188,11 +5439,11 @@
+@@ -6188,11 +5441,11 @@
pkg_cv_SAMPLERATE_LIBS="$SAMPLERATE_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -5807,7 +5834,7 @@ Forwarded: not-needed
pkg_cv_SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate >= 0.1.2" 2>/dev/null`
else
pkg_failed=yes
-@@ -6218,7 +5469,7 @@
+@@ -6218,7 +5471,7 @@
# Put the nasty error message in config.log where it belongs
echo "$SAMPLERATE_PKG_ERRORS" >&5
@@ -5816,7 +5843,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
samplerate_available_system="no"
elif test $pkg_failed = untried; then
-@@ -6226,7 +5477,7 @@
+@@ -6226,7 +5479,7 @@
else
SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS
SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS
@@ -5825,7 +5852,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
samplerate_available_system="yes"
fi
-@@ -6236,38 +5487,33 @@
+@@ -6236,38 +5489,33 @@
LIBSAMPLERATE_SYSTEM_LIBS=$SAMPLERATE_LIBS
LIBSAMPLERATE_SYSTEM_CXXFLAGS=$SAMPLERATE_CFLAGS
LIBSAMPLERATE_SYSTEM_CPPSYMBOLS="USE_LIBSAMPLERATE"
@@ -5872,7 +5899,7 @@ Forwarded: not-needed
samplerate_h_found="yes"
else
samplerate_h_found="no"
-@@ -6283,11 +5529,11 @@
+@@ -6283,11 +5531,11 @@
if test ! -f lib-src/libsamplerate/Makefile ; then
LIBSAMPLERATE_LOCAL_CONFIG_SUBDIRS="lib-src/libsamplerate"
fi
@@ -5886,7 +5913,7 @@ Forwarded: not-needed
$as_echo "$as_me: libsamplerate libraries are NOT available in the local tree" >&6;}
fi
-@@ -6295,7 +5541,7 @@
+@@ -6295,7 +5543,7 @@
# Check whether --with-libresample was given.
@@ -5895,7 +5922,7 @@ Forwarded: not-needed
withval=$with_libresample; LIBRESAMPLE_ARGUMENT=$withval
else
LIBRESAMPLE_ARGUMENT="unspecified"
-@@ -6304,9 +5550,7 @@
+@@ -6304,9 +5552,7 @@
if false ; then
@@ -5906,7 +5933,7 @@ Forwarded: not-needed
fi
-@@ -6316,28 +5560,23 @@
+@@ -6316,28 +5562,23 @@
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libresample/include/libresample.h" | $as_tr_sh`
@@ -5941,7 +5968,7 @@ Forwarded: not-needed
resample_h_found="yes"
else
resample_h_found="no"
-@@ -6353,11 +5592,11 @@
+@@ -6353,11 +5594,11 @@
if test ! -f lib-src/libresample/Makefile ; then
LIBRESAMPLE_LOCAL_CONFIG_SUBDIRS="lib-src/libresample"
fi
@@ -5955,50 +5982,55 @@ Forwarded: not-needed
$as_echo "$as_me: libresample libraries are NOT available in the local tree" >&6;}
fi
-@@ -6365,15 +5604,13 @@
+@@ -6365,222 +5606,65 @@
if false ; then
-cat >>confdefs.h <<\_ACEOF
-#define USE_LIBVORBIS 1
-_ACEOF
-+$as_echo "#define USE_LIBVORBIS 1" >>confdefs.h
-
- fi
-
-
- # Check whether --with-libvorbis was given.
+-
+- fi
+-
+-
+-# Check whether --with-libvorbis was given.
-if test "${with_libvorbis+set}" = set; then
-+if test "${with_libvorbis+set}" = set; then :
- withval=$with_libvorbis; LIBVORBIS_ARGUMENT=$withval
- else
- LIBVORBIS_ARGUMENT="unspecified"
-@@ -6381,18 +5618,14 @@
-
-
-
+- withval=$with_libvorbis; LIBVORBIS_ARGUMENT=$withval
+-else
+- LIBVORBIS_ARGUMENT="unspecified"
+-fi
+-
+-
+-
- { $as_echo "$as_me:$LINENO: checking for vorbis_bitrate_addblock in -lvorbisfile" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vorbis_bitrate_addblock in -lvorbisfile" >&5
- $as_echo_n "checking for vorbis_bitrate_addblock in -lvorbisfile... " >&6; }
+-$as_echo_n "checking for vorbis_bitrate_addblock in -lvorbisfile... " >&6; }
-if test "${ac_cv_lib_vorbisfile_vorbis_bitrate_addblock+set}" = set; then
-+if test "${ac_cv_lib_vorbisfile_vorbis_bitrate_addblock+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lvorbisfile -lvorbis -logg $LIBS"
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lvorbisfile -lvorbis -logg $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -6410,177 +5643,26 @@
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+-
+-/* 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 vorbis_bitrate_addblock ();
+-int
+-main ()
+-{
+-return vorbis_bitrate_addblock ();
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -6020,34 +6052,28 @@ Forwarded: not-needed
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+if ac_fn_cxx_try_link "$LINENO"; then :
- ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=yes
- else
+- ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=no
-+ ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&5
- $as_echo "$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&6; }
+-$as_echo "$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&6; }
-if test "x$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" = x""yes; then
-+if test "x$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" = x""yes; then :
- lib_found="yes"
- else
- lib_found="no"
- fi
-
-
+- lib_found="yes"
+-else
+- lib_found="no"
+-fi
+-
+-
- if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for vorbis/vorbisfile.h" >&5
-$as_echo_n "checking for vorbis/vorbisfile.h... " >&6; }
@@ -6098,7 +6124,8 @@ Forwarded: not-needed
-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; }
--
++$as_echo "#define USE_LIBVORBIS 1" >>confdefs.h
+
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking vorbis/vorbisfile.h presence" >&5
-$as_echo_n "checking vorbis/vorbisfile.h presence... " >&6; }
@@ -6131,14 +6158,21 @@ Forwarded: not-needed
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ fi
+
- ac_header_preproc=no
--fi
--
++
++# Check whether --with-libvorbis was given.
++if test "${with_libvorbis+set}" = set; then :
++ withval=$with_libvorbis; LIBVORBIS_ARGUMENT=$withval
++else
++ LIBVORBIS_ARGUMENT="unspecified"
+ 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_cxx_preproc_warn_flag in
- yes:no: )
@@ -6161,27 +6195,66 @@ Forwarded: not-needed
-$as_echo "$as_me: WARNING: vorbis/vorbisfile.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: vorbis/vorbisfile.h: in the future, the compiler will take precedence" >&2;}
--
+
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for vorbis/vorbisfile.h" >&5
-$as_echo_n "checking for vorbis/vorbisfile.h... " >&6; }
-if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vorbis_bitrate_addblock in -lvorbisfile" >&5
++$as_echo_n "checking for vorbis_bitrate_addblock in -lvorbisfile... " >&6; }
++if test "${ac_cv_lib_vorbisfile_vorbis_bitrate_addblock+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- ac_cv_header_vorbis_vorbisfile_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_vorbis_vorbisfile_h" >&5
-$as_echo "$ac_cv_header_vorbis_vorbisfile_h" >&6; }
--
--fi
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lvorbisfile -lvorbis -logg $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
++/* 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 vorbis_bitrate_addblock ();
++int
++main ()
++{
++return vorbis_bitrate_addblock ();
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_link "$LINENO"; then :
++ ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=yes
++else
++ ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&5
++$as_echo "$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&6; }
++if test "x$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" = x""yes; then :
++ lib_found="yes"
++else
++ lib_found="no"
+ fi
-if test "x$ac_cv_header_vorbis_vorbisfile_h" = x""yes; then
++
++
+ ac_fn_cxx_check_header_mongrel "$LINENO" "vorbis/vorbisfile.h" "ac_cv_header_vorbis_vorbisfile_h" "$ac_includes_default"
+if test "x$ac_cv_header_vorbis_vorbisfile_h" = x""yes; then :
header_found="yes"
else
header_found="no"
-@@ -6592,38 +5674,33 @@
+@@ -6592,38 +5676,33 @@
LIBVORBIS_SYSTEM_AVAILABLE="yes"
LIBVORBIS_SYSTEM_LIBS="-lvorbisenc -lvorbisfile -lvorbis -logg"
LIBVORBIS_SYSTEM_CPPSYMBOLS="USE_LIBVORBIS"
@@ -6228,7 +6301,7 @@ Forwarded: not-needed
vorbisenc_h_available="yes"
else
vorbisenc_h_available="no"
-@@ -6631,28 +5708,23 @@
+@@ -6631,28 +5710,23 @@
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libogg/include/ogg/ogg.h" | $as_tr_sh`
@@ -6263,7 +6336,7 @@ Forwarded: not-needed
ogg_h_available="yes"
else
ogg_h_available="no"
-@@ -6670,10 +5742,10 @@
+@@ -6670,10 +5744,10 @@
LIBVORBIS_LOCAL_CPPSYMBOLS="USE_LIBVORBIS"
LIBVORBIS_LOCAL_CONFIG_SUBDIRS="lib-src/libogg lib-src/libvorbis"
@@ -6276,7 +6349,7 @@ Forwarded: not-needed
$as_echo "$as_me: Vorbis libraries are NOT available in this source tree" >&6;}
fi
-@@ -6681,15 +5753,13 @@
+@@ -6681,15 +5755,13 @@
if false ; then
@@ -6294,7 +6367,7 @@ Forwarded: not-needed
withval=$with_libmad; LIBMAD_ARGUMENT=$withval
else
LIBMAD_ARGUMENT="unspecified"
-@@ -6699,18 +5769,18 @@
+@@ -6699,18 +5771,18 @@
pkg_failed=no
@@ -6317,7 +6390,7 @@ Forwarded: not-needed
pkg_cv_LIBMAD_CFLAGS=`$PKG_CONFIG --cflags "mad >= 0.14.2b" 2>/dev/null`
else
pkg_failed=yes
-@@ -6722,11 +5792,11 @@
+@@ -6722,11 +5794,11 @@
pkg_cv_LIBMAD_LIBS="$LIBMAD_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -6332,7 +6405,7 @@ Forwarded: not-needed
pkg_cv_LIBMAD_LIBS=`$PKG_CONFIG --libs "mad >= 0.14.2b" 2>/dev/null`
else
pkg_failed=yes
-@@ -6752,7 +5822,7 @@
+@@ -6752,7 +5824,7 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBMAD_PKG_ERRORS" >&5
@@ -6341,7 +6414,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
libmad_available_system="no"
elif test $pkg_failed = untried; then
-@@ -6760,24 +5830,20 @@
+@@ -6760,24 +5832,20 @@
else
LIBMAD_CFLAGS=$pkg_cv_LIBMAD_CFLAGS
LIBMAD_LIBS=$pkg_cv_LIBMAD_LIBS
@@ -6370,7 +6443,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -6795,43 +5861,18 @@
+@@ -6795,43 +5863,18 @@
return 0;
}
_ACEOF
@@ -6420,7 +6493,7 @@ Forwarded: not-needed
libmad_found="yes"
else
libmad_found="no"
-@@ -6839,7 +5880,7 @@
+@@ -6839,7 +5882,7 @@
if test "x$libmad_available_system" = "xyes" && test "x$libmad_found" = "xno" ; then
@@ -6429,7 +6502,7 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: system installation of libmad found, but it is too old. Upgrade to at least 0.14.2b to use with Audacity" >&2;}
fi
-@@ -6848,37 +5889,32 @@
+@@ -6848,37 +5891,32 @@
LIBMAD_SYSTEM_LIBS="$LIBMAD_LIBS"
LIBMAD_SYSTEM_CXXFLAGS="$LIBMAD_CFLAGS"
LIBMAD_SYSTEM_CPPSYMBOLS="USE_LIBMAD"
@@ -6475,7 +6548,7 @@ Forwarded: not-needed
frame_h_found="yes"
else
frame_h_found="no"
-@@ -6891,11 +5927,11 @@
+@@ -6891,11 +5929,11 @@
LIBMAD_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libmad'
LIBMAD_LOCAL_CPPSYMBOLS="USE_LIBMAD"
LIBMAD_LOCAL_CONFIG_SUBDIRS="lib-src/libmad"
@@ -6489,7 +6562,7 @@ Forwarded: not-needed
$as_echo "$as_me: libmad libraries are NOT available in the local tree" >&6;}
fi
-@@ -6903,15 +5939,13 @@
+@@ -6903,15 +5941,13 @@
if false ; then
@@ -6507,7 +6580,7 @@ Forwarded: not-needed
withval=$with_libflac; LIBFLAC_ARGUMENT=$withval
else
LIBFLAC_ARGUMENT="unspecified"
-@@ -6919,18 +5953,14 @@
+@@ -6919,18 +5955,14 @@
@@ -6529,7 +6602,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -6948,177 +5978,26 @@
+@@ -6948,177 +5980,26 @@
return 0;
}
_ACEOF
@@ -6554,28 +6627,34 @@ Forwarded: not-needed
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_FLAC_FLAC__stream_decoder_new=yes
--else
++if ac_fn_cxx_try_link "$LINENO"; then :
+ ac_cv_lib_FLAC_FLAC__stream_decoder_new=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_FLAC_FLAC__stream_decoder_new=no
--fi
++ ac_cv_lib_FLAC_FLAC__stream_decoder_new=no
+ fi
-
-rm -rf conftest.dSYM
-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
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&5
--$as_echo "$ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&5
+ $as_echo "$ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&6; }
-if test "x$ac_cv_lib_FLAC_FLAC__stream_decoder_new" = x""yes; then
-- lib_found="yes"
--else
-- lib_found="no"
--fi
--
--
++if test "x$ac_cv_lib_FLAC_FLAC__stream_decoder_new" = x""yes; then :
+ lib_found="yes"
+ else
+ lib_found="no"
+ fi
+
+
- if test "${ac_cv_header_FLAC_format_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for FLAC/format.h" >&5
-$as_echo_n "checking for FLAC/format.h... " >&6; }
@@ -6656,15 +6735,12 @@ Forwarded: not-needed
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-+if ac_fn_cxx_try_link "$LINENO"; then :
-+ ac_cv_lib_FLAC_FLAC__stream_decoder_new=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-+ ac_cv_lib_FLAC_FLAC__stream_decoder_new=no
- fi
+-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
@@ -6699,30 +6775,20 @@ Forwarded: not-needed
-$as_echo_n "checking for FLAC/format.h... " >&6; }
-if test "${ac_cv_header_FLAC_format_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&5
-+$as_echo "$ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&6; }
-+if test "x$ac_cv_lib_FLAC_FLAC__stream_decoder_new" = x""yes; then :
-+ lib_found="yes"
- else
+-else
- ac_cv_header_FLAC_format_h=$ac_header_preproc
-+ lib_found="no"
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_FLAC_format_h" >&5
-$as_echo "$ac_cv_header_FLAC_format_h" >&6; }
-
+-
-fi
-if test "x$ac_cv_header_FLAC_format_h" = x""yes; then
-+
+ ac_fn_cxx_check_header_mongrel "$LINENO" "FLAC/format.h" "ac_cv_header_FLAC_format_h" "$ac_includes_default"
+if test "x$ac_cv_header_FLAC_format_h" = x""yes; then :
header_found="yes"
else
header_found="no"
-@@ -7132,38 +6011,33 @@
+@@ -7132,38 +6013,33 @@
LIBFLAC_SYSTEM_CPPSYMBOLS="USE_LIBFLAC"
# this file shouldn't be built at if no libflac is available
LIBFLAC_SYSTEM_OPTOBJS="ondemand/ODDecodeFlacTask.o"
@@ -6769,7 +6835,7 @@ Forwarded: not-needed
flac_h_available="yes"
else
flac_h_available="no"
-@@ -7171,28 +6045,23 @@
+@@ -7171,28 +6047,23 @@
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" | $as_tr_sh`
@@ -6804,7 +6870,7 @@ Forwarded: not-needed
flacpp_h_available="yes"
else
flacpp_h_available="no"
-@@ -7212,10 +6081,10 @@
+@@ -7212,10 +6083,10 @@
LIBFLAC_LOCAL_OPTOBJS="ondemand/ODDecodeFlacTask.o"
LIBFLAC_LOCAL_CONFIG_SUBDIRS="lib-src/libflac"
@@ -6817,7 +6883,7 @@ Forwarded: not-needed
$as_echo "$as_me: FLAC libraries are NOT available in this source tree" >&6;}
fi
-@@ -7223,7 +6092,7 @@
+@@ -7223,7 +6094,7 @@
# Check whether --with-libid3tag was given.
@@ -6826,7 +6892,7 @@ Forwarded: not-needed
withval=$with_libid3tag; LIBID3TAG_ARGUMENT=$withval
else
LIBID3TAG_ARGUMENT="unspecified"
-@@ -7232,25 +6101,19 @@
+@@ -7232,25 +6103,19 @@
if false ; then
@@ -6856,7 +6922,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -7268,177 +6131,26 @@
+@@ -7268,177 +6133,26 @@
return 0;
}
_ACEOF
@@ -7042,7 +7108,7 @@ Forwarded: not-needed
id3tag_h_found="yes"
else
id3tag_h_found="no"
-@@ -7450,38 +6162,33 @@
+@@ -7450,38 +6164,33 @@
LIBID3TAG_SYSTEM_AVAILABLE="yes"
LIBID3TAG_SYSTEM_LIBS=-lid3tag
LIBID3TAG_SYSTEM_CPPSYMBOLS="USE_LIBID3TAG"
@@ -7089,7 +7155,7 @@ Forwarded: not-needed
frame_h_found="yes"
else
frame_h_found="no"
-@@ -7495,18 +6202,18 @@
+@@ -7495,18 +6204,18 @@
LIBID3TAG_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libid3tag'
LIBID3TAG_LOCAL_CPPSYMBOLS="USE_LIBID3TAG"
LIBID3TAG_LOCAL_CONFIG_SUBDIRS="lib-src/libid3tag"
@@ -7111,7 +7177,7 @@ Forwarded: not-needed
withval=$with_sbsms; LIBSBSMS_ARGUMENT=$withval
else
LIBSBSMS_ARGUMENT="unspecified"
-@@ -7515,27 +6222,25 @@
+@@ -7515,27 +6224,25 @@
if false ; then
@@ -7144,7 +7210,7 @@ Forwarded: not-needed
pkg_cv_SBSMS_CFLAGS=`$PKG_CONFIG --cflags "sbsms >= 1.6.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -7547,11 +6252,11 @@
+@@ -7547,11 +6254,11 @@
pkg_cv_SBSMS_LIBS="$SBSMS_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -7159,7 +7225,7 @@ Forwarded: not-needed
pkg_cv_SBSMS_LIBS=`$PKG_CONFIG --libs "sbsms >= 1.6.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -7577,7 +6282,7 @@
+@@ -7577,7 +6284,7 @@
# Put the nasty error message in config.log where it belongs
echo "$SBSMS_PKG_ERRORS" >&5
@@ -7168,7 +7234,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
sbsms_available_system="no"
elif test $pkg_failed = untried; then
-@@ -7585,7 +6290,7 @@
+@@ -7585,7 +6292,7 @@
else
SBSMS_CFLAGS=$pkg_cv_SBSMS_CFLAGS
SBSMS_LIBS=$pkg_cv_SBSMS_LIBS
@@ -7177,7 +7243,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
sbsms_available_system="yes"
fi
-@@ -7596,38 +6301,33 @@
+@@ -7596,38 +6303,33 @@
LIBSBSMS_SYSTEM_LIBS=$SBSMS_LIBS
LIBSBSMS_SYSTEM_CXXFLAGS=$SBSMS_CFLAGS
LIBSBSMS_SYSTEM_CPPSYMBOLS="USE_SBSMS"
@@ -7224,7 +7290,7 @@ Forwarded: not-needed
sbsms_h_found="yes"
else
sbsms_h_found="no"
-@@ -7643,11 +6343,11 @@
+@@ -7643,11 +6345,11 @@
LIBSBSMS_LOCAL_CONFIG_SUBDIRS="lib-src/sbsms"
ac_configure_args="$ac_configure_args --disable-programs"
@@ -7238,7 +7304,7 @@ Forwarded: not-needed
$as_echo "$as_me: libsbsms libraries are NOT available in the local tree" >&6;}
fi
-@@ -7655,7 +6355,7 @@
+@@ -7655,7 +6357,7 @@
# Check whether --with-soundtouch was given.
@@ -7247,7 +7313,7 @@ Forwarded: not-needed
withval=$with_soundtouch; LIBSOUNDTOUCH_ARGUMENT=$withval
else
LIBSOUNDTOUCH_ARGUMENT="unspecified"
-@@ -7664,27 +6364,25 @@
+@@ -7664,28 +6366,94 @@
if false ; then
@@ -7263,6 +7329,74 @@ Forwarded: not-needed
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for SOUNDTOUCH" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOUNDTOUCH" >&5
++$as_echo_n "checking for SOUNDTOUCH... " >&6; }
++
++if test -n "$SOUNDTOUCH_CFLAGS"; then
++ pkg_cv_SOUNDTOUCH_CFLAGS="$SOUNDTOUCH_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.4 >= 1.3.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "soundtouch-1.4 >= 1.3.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_SOUNDTOUCH_CFLAGS=`$PKG_CONFIG --cflags "soundtouch-1.4 >= 1.3.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$SOUNDTOUCH_LIBS"; then
++ pkg_cv_SOUNDTOUCH_LIBS="$SOUNDTOUCH_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.4 >= 1.3.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "soundtouch-1.4 >= 1.3.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_SOUNDTOUCH_LIBS=`$PKG_CONFIG --libs "soundtouch-1.4 >= 1.3.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ SOUNDTOUCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "soundtouch-1.4 >= 1.3.0" 2>&1`
++ else
++ SOUNDTOUCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "soundtouch-1.4 >= 1.3.0" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$SOUNDTOUCH_PKG_ERRORS" >&5
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ soundtouch_available_system="no"
++elif test $pkg_failed = untried; then
++ soundtouch_available_system="no"
++else
++ SOUNDTOUCH_CFLAGS=$pkg_cv_SOUNDTOUCH_CFLAGS
++ SOUNDTOUCH_LIBS=$pkg_cv_SOUNDTOUCH_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ soundtouch_available_system="yes"
++fi
++ if test "x$soundtouch_available_system" = "xno" ; then
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOUNDTOUCH" >&5
$as_echo_n "checking for SOUNDTOUCH... " >&6; }
if test -n "$SOUNDTOUCH_CFLAGS"; then
@@ -7270,32 +7404,47 @@ Forwarded: not-needed
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.4 >= 1.3.0\"") >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.4 >= 1.3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "soundtouch-1.4 >= 1.3.0") 2>&5
+- ($PKG_CONFIG --exists --print-errors "soundtouch-1.4 >= 1.3.0") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.0 >= 1.3.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "soundtouch-1.0 >= 1.3.0") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+- pkg_cv_SOUNDTOUCH_CFLAGS=`$PKG_CONFIG --cflags "soundtouch-1.4 >= 1.3.0" 2>/dev/null`
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_SOUNDTOUCH_CFLAGS=`$PKG_CONFIG --cflags "soundtouch-1.4 >= 1.3.0" 2>/dev/null`
++ pkg_cv_SOUNDTOUCH_CFLAGS=`$PKG_CONFIG --cflags "soundtouch-1.0 >= 1.3.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -7696,11 +6394,11 @@
+ fi
+@@ -7696,12 +6464,12 @@
pkg_cv_SOUNDTOUCH_LIBS="$SOUNDTOUCH_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.4 >= 1.3.0\"") >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.4 >= 1.3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "soundtouch-1.4 >= 1.3.0") 2>&5
+- ($PKG_CONFIG --exists --print-errors "soundtouch-1.4 >= 1.3.0") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.0 >= 1.3.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "soundtouch-1.0 >= 1.3.0") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+- pkg_cv_SOUNDTOUCH_LIBS=`$PKG_CONFIG --libs "soundtouch-1.4 >= 1.3.0" 2>/dev/null`
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_SOUNDTOUCH_LIBS=`$PKG_CONFIG --libs "soundtouch-1.4 >= 1.3.0" 2>/dev/null`
++ pkg_cv_SOUNDTOUCH_LIBS=`$PKG_CONFIG --libs "soundtouch-1.0 >= 1.3.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -7726,7 +6424,7 @@
+ fi
+@@ -7719,14 +6487,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SOUNDTOUCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "soundtouch-1.4 >= 1.3.0" 2>&1`
++ SOUNDTOUCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "soundtouch-1.0 >= 1.3.0" 2>&1`
+ else
+- SOUNDTOUCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "soundtouch-1.4 >= 1.3.0" 2>&1`
++ SOUNDTOUCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "soundtouch-1.0 >= 1.3.0" 2>&1`
+ fi
# Put the nasty error message in config.log where it belongs
echo "$SOUNDTOUCH_PKG_ERRORS" >&5
@@ -7304,7 +7453,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
soundtouch_available_system="no"
elif test $pkg_failed = untried; then
-@@ -7734,25 +6432,25 @@
+@@ -7734,26 +6502,27 @@
else
SOUNDTOUCH_CFLAGS=$pkg_cv_SOUNDTOUCH_CFLAGS
SOUNDTOUCH_LIBS=$pkg_cv_SOUNDTOUCH_LIBS
@@ -7313,7 +7462,9 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
soundtouch_available_system="yes"
fi
- if test "x$soundtouch_available_system" = "xno" ; then
+- if test "x$soundtouch_available_system" = "xno" ; then
++ fi
++ if test "x$soundtouch_available_system" = "xno" ; then
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for SOUNDTOUCH" >&5
@@ -7325,110 +7476,56 @@ Forwarded: not-needed
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.0 >= 1.3.0\"") >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.0 >= 1.3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "soundtouch-1.0 >= 1.3.0") 2>&5
+- ($PKG_CONFIG --exists --print-errors "soundtouch-1.0 >= 1.3.0") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soundtouch >= 1.3.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "soundtouch >= 1.3.0") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+- pkg_cv_SOUNDTOUCH_CFLAGS=`$PKG_CONFIG --cflags "soundtouch-1.0 >= 1.3.0" 2>/dev/null`
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_SOUNDTOUCH_CFLAGS=`$PKG_CONFIG --cflags "soundtouch-1.0 >= 1.3.0" 2>/dev/null`
++ pkg_cv_SOUNDTOUCH_CFLAGS=`$PKG_CONFIG --cflags "soundtouch >= 1.3.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -7764,11 +6462,11 @@
+ fi
+@@ -7764,12 +6533,12 @@
pkg_cv_SOUNDTOUCH_LIBS="$SOUNDTOUCH_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.0 >= 1.3.0\"") >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.0 >= 1.3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "soundtouch-1.0 >= 1.3.0") 2>&5
+- ($PKG_CONFIG --exists --print-errors "soundtouch-1.0 >= 1.3.0") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soundtouch >= 1.3.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "soundtouch >= 1.3.0") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+- pkg_cv_SOUNDTOUCH_LIBS=`$PKG_CONFIG --libs "soundtouch-1.0 >= 1.3.0" 2>/dev/null`
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_SOUNDTOUCH_LIBS=`$PKG_CONFIG --libs "soundtouch-1.0 >= 1.3.0" 2>/dev/null`
++ pkg_cv_SOUNDTOUCH_LIBS=`$PKG_CONFIG --libs "soundtouch >= 1.3.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -7794,7 +6492,76 @@
+ fi
+@@ -7787,14 +6556,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SOUNDTOUCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "soundtouch-1.0 >= 1.3.0" 2>&1`
++ SOUNDTOUCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "soundtouch >= 1.3.0" 2>&1`
+ else
+- SOUNDTOUCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "soundtouch-1.0 >= 1.3.0" 2>&1`
++ SOUNDTOUCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "soundtouch >= 1.3.0" 2>&1`
+ fi
# Put the nasty error message in config.log where it belongs
echo "$SOUNDTOUCH_PKG_ERRORS" >&5
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ soundtouch_available_system="no"
-+elif test $pkg_failed = untried; then
-+ soundtouch_available_system="no"
-+else
-+ SOUNDTOUCH_CFLAGS=$pkg_cv_SOUNDTOUCH_CFLAGS
-+ SOUNDTOUCH_LIBS=$pkg_cv_SOUNDTOUCH_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ soundtouch_available_system="yes"
-+fi
-+ fi
-+ if test "x$soundtouch_available_system" = "xno" ; then
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOUNDTOUCH" >&5
-+$as_echo_n "checking for SOUNDTOUCH... " >&6; }
-+
-+if test -n "$SOUNDTOUCH_CFLAGS"; then
-+ pkg_cv_SOUNDTOUCH_CFLAGS="$SOUNDTOUCH_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soundtouch >= 1.3.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "soundtouch >= 1.3.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_SOUNDTOUCH_CFLAGS=`$PKG_CONFIG --cflags "soundtouch >= 1.3.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$SOUNDTOUCH_LIBS"; then
-+ pkg_cv_SOUNDTOUCH_LIBS="$SOUNDTOUCH_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soundtouch >= 1.3.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "soundtouch >= 1.3.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_SOUNDTOUCH_LIBS=`$PKG_CONFIG --libs "soundtouch >= 1.3.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ SOUNDTOUCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "soundtouch >= 1.3.0" 2>&1`
-+ else
-+ SOUNDTOUCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "soundtouch >= 1.3.0" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$SOUNDTOUCH_PKG_ERRORS" >&5
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
soundtouch_available_system="no"
elif test $pkg_failed = untried; then
-@@ -7802,7 +6569,7 @@
+@@ -7802,7 +6571,7 @@
else
SOUNDTOUCH_CFLAGS=$pkg_cv_SOUNDTOUCH_CFLAGS
SOUNDTOUCH_LIBS=$pkg_cv_SOUNDTOUCH_LIBS
@@ -7437,7 +7534,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
soundtouch_available_system="yes"
fi
-@@ -7813,38 +6580,33 @@
+@@ -7813,38 +6582,33 @@
LIBSOUNDTOUCH_SYSTEM_LIBS=$SOUNDTOUCH_LIBS
LIBSOUNDTOUCH_SYSTEM_CXXFLAGS=$SOUNDTOUCH_CFLAGS
LIBSOUNDTOUCH_SYSTEM_CPPSYMBOLS="USE_SOUNDTOUCH"
@@ -7484,7 +7581,7 @@ Forwarded: not-needed
soundtouch_h_found="yes"
else
soundtouch_h_found="no"
-@@ -7857,18 +6619,18 @@
+@@ -7857,18 +6621,18 @@
LIBSOUNDTOUCH_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/soundtouch/include'
LIBSOUNDTOUCH_LOCAL_CPPSYMBOLS="USE_SOUNDTOUCH"
LIBSOUNDTOUCH_LOCAL_CONFIG_SUBDIRS="lib-src/soundtouch"
@@ -7506,7 +7603,7 @@ Forwarded: not-needed
enableval=$enable_nyquist; LIBNYQUIST_ARGUMENT=$enableval
else
LIBNYQUIST_ARGUMENT="unspecified"
-@@ -7877,9 +6639,7 @@
+@@ -7877,9 +6641,7 @@
if false ; then
@@ -7517,7 +7614,7 @@ Forwarded: not-needed
fi
-@@ -7887,28 +6647,23 @@
+@@ -7887,28 +6649,23 @@
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libnyquist/nyx.h" | $as_tr_sh`
@@ -7552,7 +7649,7 @@ Forwarded: not-needed
nyx_h_found="yes"
else
nyx_h_found="no"
-@@ -7925,18 +6680,18 @@
+@@ -7925,18 +6682,18 @@
LIBNYQUIST_LOCAL_CONFIG_SUBDIRS="lib-src/libnyquist"
@@ -7574,7 +7671,7 @@ Forwarded: not-needed
withval=$with_libvamp; LIBVAMP_ARGUMENT=$withval
else
LIBVAMP_ARGUMENT="unspecified"
-@@ -7945,27 +6700,25 @@
+@@ -7945,27 +6702,25 @@
if false ; then
@@ -7607,7 +7704,7 @@ Forwarded: not-needed
pkg_cv_VAMP_CFLAGS=`$PKG_CONFIG --cflags "vamp-hostsdk >= 2.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -7977,11 +6730,11 @@
+@@ -7977,11 +6732,11 @@
pkg_cv_VAMP_LIBS="$VAMP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -7622,7 +7719,7 @@ Forwarded: not-needed
pkg_cv_VAMP_LIBS=`$PKG_CONFIG --libs "vamp-hostsdk >= 2.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -8007,7 +6760,7 @@
+@@ -8007,7 +6762,7 @@
# Put the nasty error message in config.log where it belongs
echo "$VAMP_PKG_ERRORS" >&5
@@ -7631,7 +7728,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
vamp_available_system="no"
elif test $pkg_failed = untried; then
-@@ -8015,7 +6768,7 @@
+@@ -8015,7 +6770,7 @@
else
VAMP_CFLAGS=$pkg_cv_VAMP_CFLAGS
VAMP_LIBS=$pkg_cv_VAMP_LIBS
@@ -7640,7 +7737,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
vamp_available_system="yes"
fi
-@@ -8026,38 +6779,33 @@
+@@ -8026,38 +6781,33 @@
LIBVAMP_SYSTEM_CXXFLAGS=$VAMP_CFLAGS
LIBVAMP_SYSTEM_OPTOBJS="effects/vamp/VampEffect.o effects/vamp/LoadVamp.o"
LIBVAMP_SYSTEM_CPPSYMBOLS="USE_VAMP"
@@ -7687,7 +7784,7 @@ Forwarded: not-needed
vamp_h_found="yes"
else
vamp_h_found="no"
-@@ -8074,18 +6822,18 @@
+@@ -8074,18 +6824,18 @@
LIBVAMP_LOCAL_CONFIG_SUBDIRS="lib-src/libvamp"
ac_configure_args="$ac_configure_args --disable-programs"
@@ -7709,7 +7806,7 @@ Forwarded: not-needed
withval=$with_libtwolame; LIBTWOLAME_ARGUMENT=$withval
else
LIBTWOLAME_ARGUMENT="unspecified"
-@@ -8094,27 +6842,25 @@
+@@ -8094,27 +6844,25 @@
if false ; then
@@ -7742,7 +7839,7 @@ Forwarded: not-needed
pkg_cv_LIBTWOLAME_CFLAGS=`$PKG_CONFIG --cflags "twolame >= 0.3.9" 2>/dev/null`
else
pkg_failed=yes
-@@ -8126,11 +6872,11 @@
+@@ -8126,11 +6874,11 @@
pkg_cv_LIBTWOLAME_LIBS="$LIBTWOLAME_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -7757,7 +7854,7 @@ Forwarded: not-needed
pkg_cv_LIBTWOLAME_LIBS=`$PKG_CONFIG --libs "twolame >= 0.3.9" 2>/dev/null`
else
pkg_failed=yes
-@@ -8156,7 +6902,7 @@
+@@ -8156,7 +6904,7 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBTWOLAME_PKG_ERRORS" >&5
@@ -7766,7 +7863,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
twolame_available_system="no"
elif test $pkg_failed = untried; then
-@@ -8164,7 +6910,7 @@
+@@ -8164,7 +6912,7 @@
else
LIBTWOLAME_CFLAGS=$pkg_cv_LIBTWOLAME_CFLAGS
LIBTWOLAME_LIBS=$pkg_cv_LIBTWOLAME_LIBS
@@ -7775,7 +7872,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
twolame_available_system="yes"
fi
-@@ -8174,38 +6920,33 @@
+@@ -8174,38 +6922,33 @@
LIBTWOLAME_SYSTEM_LIBS=$LIBTWOLAME_LIBS
LIBTWOLAME_SYSTEM_CXXFLAGS=$LIBTWOLAME_CFLAGS
LIBTWOLAME_SYSTEM_CPPSYMBOLS="USE_LIBTWOLAME"
@@ -7822,7 +7919,7 @@ Forwarded: not-needed
twolame_h_found="yes"
else
twolame_h_found="no"
-@@ -8221,18 +6962,18 @@
+@@ -8221,18 +6964,18 @@
LIBTWOLAME_LOCAL_CONFIG_SUBDIRS="lib-src/twolame"
ac_configure_args="$ac_configure_args --disable-programs"
@@ -7844,7 +7941,7 @@ Forwarded: not-needed
withval=$with_ffmpeg; FFMPEG_ARGUMENT=$withval
else
FFMPEG_ARGUMENT="unspecified"
-@@ -8241,27 +6982,25 @@
+@@ -8241,27 +6984,25 @@
if false ; then
@@ -7877,7 +7974,7 @@ Forwarded: not-needed
pkg_cv_AVCODEC_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 51.53" 2>/dev/null`
else
pkg_failed=yes
-@@ -8273,11 +7012,11 @@
+@@ -8273,11 +7014,11 @@
pkg_cv_AVCODEC_LIBS="$AVCODEC_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -7892,7 +7989,7 @@ Forwarded: not-needed
pkg_cv_AVCODEC_LIBS=`$PKG_CONFIG --libs "libavcodec >= 51.53" 2>/dev/null`
else
pkg_failed=yes
-@@ -8303,7 +7042,7 @@
+@@ -8303,7 +7044,7 @@
# Put the nasty error message in config.log where it belongs
echo "$AVCODEC_PKG_ERRORS" >&5
@@ -7901,7 +7998,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
avcodec_available_system="no"
elif test $pkg_failed = untried; then
-@@ -8311,24 +7050,24 @@
+@@ -8311,24 +7052,24 @@
else
AVCODEC_CFLAGS=$pkg_cv_AVCODEC_CFLAGS
AVCODEC_LIBS=$pkg_cv_AVCODEC_LIBS
@@ -7931,7 +8028,7 @@ Forwarded: not-needed
pkg_cv_AVFORMAT_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 52.12" 2>/dev/null`
else
pkg_failed=yes
-@@ -8340,11 +7079,11 @@
+@@ -8340,11 +7081,11 @@
pkg_cv_AVFORMAT_LIBS="$AVFORMAT_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -7946,7 +8043,7 @@ Forwarded: not-needed
pkg_cv_AVFORMAT_LIBS=`$PKG_CONFIG --libs "libavformat >= 52.12" 2>/dev/null`
else
pkg_failed=yes
-@@ -8370,7 +7109,7 @@
+@@ -8370,7 +7111,7 @@
# Put the nasty error message in config.log where it belongs
echo "$AVFORMAT_PKG_ERRORS" >&5
@@ -7955,7 +8052,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
avformat_available_system="no"
elif test $pkg_failed = untried; then
-@@ -8378,52 +7117,122 @@
+@@ -8378,52 +7119,120 @@
else
AVFORMAT_CFLAGS=$pkg_cv_AVFORMAT_CFLAGS
AVFORMAT_LIBS=$pkg_cv_AVFORMAT_LIBS
@@ -8047,9 +8144,7 @@ Forwarded: not-needed
+ FFMPEG_SYSTEM_CPPSYMBOLS="USE_FFMPEG"
+ if test "x$dynamic_loading" = "xno"; then
+ FFMPEG_SYSTEM_LIBS="$AVCODEC_LIBS $AVFORMAT_LIBS $AVUTIL_LIBS"
-+
-+$as_echo "#define DISABLE_DYNAMIC_LOADING_FFMPEG 1" >>confdefs.h
-+
++ FFMPEG_SYSTEM_CPPSYMBOLS="$FFMPEG_SYSTEM_CPPSYMBOLS DISABLE_DYNAMIC_LOADING_FFMPEG"
+ fi
+ FFMPEG_SYSTEM_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
+ export/ExportFFmpegDialogs.o"
@@ -8158,15 +8253,12 @@ Forwarded: not-needed
PORTSMF_ARGUMENT="unspecified"
fi
-- if false ; then
--
++
+ if false ; then
+
-cat >>confdefs.h <<\_ACEOF
-#define USE_MIDI 1
-_ACEOF
--
-+
-+ if false ; then
-+
+$as_echo "#define USE_MIDI 1" >>confdefs.h
+
+ fi
@@ -8239,7 +8331,7 @@ Forwarded: not-needed
+$as_echo "yes" >&6; }
+ portsmf_available_system="yes"
+fi
-+
+
+ if test "x$portsmf_available_system" = "xyes" ; then
+ PORTSMF_SYSTEM_AVAILABLE="yes"
+ PORTSMF_SYSTEM_LIBS="$PORTSMF_LIBS"
@@ -8307,7 +8399,7 @@ Forwarded: not-needed
ac_builddir=.
case ""${srcdir}/lib-src/portsmf"" in
-@@ -8635,7 +7481,7 @@
+@@ -8635,65 +7481,155 @@
# This should be Cygnus configure.
ax_sub_configure=$ac_aux_dir/configure
else
@@ -8316,134 +8408,69 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: no configuration information is in \"${srcdir}/lib-src/portsmf\"" >&2;}
ax_sub_configure=
fi
-@@ -8649,7 +7495,7 @@
- ax_sub_cache_file=$ac_top_build_prefix$cache_file ;;
- esac
-- { $as_echo "$as_me:$LINENO: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&5
- $as_echo "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&6;}
- # The eval makes quoting arguments work.
- eval "\$SHELL \"\$ax_sub_configure\" $ax_sub_configure_args \
-@@ -8657,7 +7503,7 @@
- fi
-
- cd "$ax_popdir"
-- { $as_echo "$as_me:$LINENO: Done configuring in \"${srcdir}/lib-src/portsmf\"" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: Done configuring in \"${srcdir}/lib-src/portsmf\"" >&5
- $as_echo "$as_me: Done configuring in \"${srcdir}/lib-src/portsmf\"" >&6;}
-
- fi
-@@ -8665,18 +7511,18 @@
- export PKG_CONFIG_PATH
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for PORTSMF" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PORTSMF" >&5
- $as_echo_n "checking for PORTSMF... " >&6; }
-
- if test -n "$PORTSMF_CFLAGS"; then
- pkg_cv_PORTSMF_CFLAGS="$PORTSMF_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"portSMF\"") >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portSMF\""; } >&5
- ($PKG_CONFIG --exists --print-errors "portSMF") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_PORTSMF_CFLAGS=`$PKG_CONFIG --cflags "portSMF" 2>/dev/null`
- else
- pkg_failed=yes
-@@ -8688,11 +7534,11 @@
- pkg_cv_PORTSMF_LIBS="$PORTSMF_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"portSMF\"") >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portSMF\""; } >&5
- ($PKG_CONFIG --exists --print-errors "portSMF") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_PORTSMF_LIBS=`$PKG_CONFIG --libs "portSMF" 2>/dev/null`
- else
- pkg_failed=yes
-@@ -8718,7 +7564,7 @@
- # Put the nasty error message in config.log where it belongs
- echo "$PORTSMF_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- portsmf_available="no"
- elif test $pkg_failed = untried; then
-@@ -8726,7 +7572,7 @@
- else
- PORTSMF_CFLAGS=$pkg_cv_PORTSMF_CFLAGS
- PORTSMF_LIBS=$pkg_cv_PORTSMF_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- portsmf_available="yes"
- fi
-@@ -8736,15 +7582,168 @@
- PORTSMF_LOCAL_LDFLAGS=$PORTSMF_LIBS
- PORTSMF_LOCAL_CXXFLAGS=$PORTSMF_CFLAGS
- PORTSMF_LOCAL_CPPSYMBOLS="USE_MIDI"
-- PORTSMF_LOCAL_OPTOBJS="NoteTrack.o import/ImportMIDI.o"
-- PORTSMF_LOCAL_BUILD="portSMF"
-+ PORTSMF_LOCAL_OPTOBJS="NoteTrack.o import/ImportMIDI.o"
-+ PORTSMF_LOCAL_BUILD="portSMF"
-+ else
-+ PORTSMF_LOCAL_AVAILABLE="no"
-+ fi
-+
-+
-+
-+# Check whether --with-portaudio was given.
-+if test "${with_portaudio+set}" = set; then :
-+ withval=$with_portaudio; PORTAUDIO_ARGUMENT=$withval
-+else
-+ PORTAUDIO_ARGUMENT="unspecified"
-+fi
+- # The recursion is here.
+- if test -n "$ax_sub_configure"; then
+- # Make the cache file name correct relative to the subdirectory.
+- case $cache_file in
+- [\\/]* | ?:[\\/]* ) ax_sub_cache_file=$cache_file ;;
+- *) # Relative name.
+- ax_sub_cache_file=$ac_top_build_prefix$cache_file ;;
+- esac
++ # The recursion is here.
++ if test -n "$ax_sub_configure"; then
++ # Make the cache file name correct relative to the subdirectory.
++ case $cache_file in
++ [\\/]* | ?:[\\/]* ) ax_sub_cache_file=$cache_file ;;
++ *) # Relative name.
++ ax_sub_cache_file=$ac_top_build_prefix$cache_file ;;
++ esac
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&5
++$as_echo "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&6;}
++ # The eval makes quoting arguments work.
++ eval "\$SHELL \"\$ax_sub_configure\" $ax_sub_configure_args \
++ --cache-file=\"\$ax_sub_cache_file\" --srcdir=\"\$ax_srcdir\""
++ fi
+
++ cd "$ax_popdir"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: Done configuring in \"${srcdir}/lib-src/portsmf\"" >&5
++$as_echo "$as_me: Done configuring in \"${srcdir}/lib-src/portsmf\"" >&6;}
+
++ fi
++ PKG_CONFIG_PATH="${srcdir}/lib-src/portsmf/:$PKG_CONFIG_PATH"
++ export PKG_CONFIG_PATH
+
+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PORTAUDIO" >&5
-+$as_echo_n "checking for PORTAUDIO... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PORTSMF" >&5
++$as_echo_n "checking for PORTSMF... " >&6; }
+
-+if test -n "$PORTAUDIO_CFLAGS"; then
-+ pkg_cv_PORTAUDIO_CFLAGS="$PORTAUDIO_CFLAGS"
++if test -n "$PORTSMF_CFLAGS"; then
++ pkg_cv_PORTSMF_CFLAGS="$PORTSMF_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portSMF\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "portSMF") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
-+ pkg_cv_PORTAUDIO_CFLAGS=`$PKG_CONFIG --cflags "portaudio-2.0 >= 19" 2>/dev/null`
++ pkg_cv_PORTSMF_CFLAGS=`$PKG_CONFIG --cflags "portSMF" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
-+if test -n "$PORTAUDIO_LIBS"; then
-+ pkg_cv_PORTAUDIO_LIBS="$PORTAUDIO_LIBS"
++if test -n "$PORTSMF_LIBS"; then
++ pkg_cv_PORTSMF_LIBS="$PORTSMF_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portSMF\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "portSMF") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
-+ pkg_cv_PORTAUDIO_LIBS=`$PKG_CONFIG --libs "portaudio-2.0 >= 19" 2>/dev/null`
++ pkg_cv_PORTSMF_LIBS=`$PKG_CONFIG --libs "portSMF" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
@@ -8461,26 +8488,151 @@ Forwarded: not-needed
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
-+ PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "portaudio-2.0 >= 19" 2>&1`
++ PORTSMF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "portSMF" 2>&1`
+ else
-+ PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "portaudio-2.0 >= 19" 2>&1`
++ PORTSMF_PKG_ERRORS=`$PKG_CONFIG --print-errors "portSMF" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
-+ echo "$PORTAUDIO_PKG_ERRORS" >&5
++ echo "$PORTSMF_PKG_ERRORS" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
-+ portaudio_available_system="no"
++ portsmf_available="no"
+elif test $pkg_failed = untried; then
-+ portaudio_available_system="no"
++ portsmf_available="no"
+else
-+ PORTAUDIO_CFLAGS=$pkg_cv_PORTAUDIO_CFLAGS
-+ PORTAUDIO_LIBS=$pkg_cv_PORTAUDIO_LIBS
++ PORTSMF_CFLAGS=$pkg_cv_PORTSMF_CFLAGS
++ PORTSMF_LIBS=$pkg_cv_PORTSMF_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
-+ portaudio_available_system="yes"
++ portsmf_available="yes"
+fi
+
++ if test "x$portsmf_available" = "xyes" ; then
++ PORTSMF_LOCAL_AVAILABLE="yes"
++ PORTSMF_LOCAL_LDFLAGS=$PORTSMF_LIBS
++ PORTSMF_LOCAL_CXXFLAGS=$PORTSMF_CFLAGS
++ PORTSMF_LOCAL_CPPSYMBOLS="USE_MIDI"
++ PORTSMF_LOCAL_OPTOBJS="NoteTrack.o import/ImportMIDI.o"
++ PORTSMF_LOCAL_BUILD="portSMF"
++ else
++ PORTSMF_LOCAL_AVAILABLE="no"
++ fi
++
++
++
++# Check whether --with-portaudio was given.
++if test "${with_portaudio+set}" = set; then :
++ withval=$with_portaudio; PORTAUDIO_ARGUMENT=$withval
++else
++ PORTAUDIO_ARGUMENT="unspecified"
++fi
+
+- { $as_echo "$as_me:$LINENO: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&5
+-$as_echo "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+- # The eval makes quoting arguments work.
+- eval "\$SHELL \"\$ax_sub_configure\" $ax_sub_configure_args \
+- --cache-file=\"\$ax_sub_cache_file\" --srcdir=\"\$ax_srcdir\""
+- fi
+
+- cd "$ax_popdir"
+- { $as_echo "$as_me:$LINENO: Done configuring in \"${srcdir}/lib-src/portsmf\"" >&5
+-$as_echo "$as_me: Done configuring in \"${srcdir}/lib-src/portsmf\"" >&6;}
+
+- fi
+- PKG_CONFIG_PATH="${srcdir}/lib-src/portsmf/:$PKG_CONFIG_PATH"
+- export PKG_CONFIG_PATH
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for PORTSMF" >&5
+-$as_echo_n "checking for PORTSMF... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PORTAUDIO" >&5
++$as_echo_n "checking for PORTAUDIO... " >&6; }
+
+-if test -n "$PORTSMF_CFLAGS"; then
+- pkg_cv_PORTSMF_CFLAGS="$PORTSMF_CFLAGS"
++if test -n "$PORTAUDIO_CFLAGS"; then
++ pkg_cv_PORTAUDIO_CFLAGS="$PORTAUDIO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"portSMF\"") >&5
+- ($PKG_CONFIG --exists --print-errors "portSMF") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_PORTSMF_CFLAGS=`$PKG_CONFIG --cflags "portSMF" 2>/dev/null`
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_PORTAUDIO_CFLAGS=`$PKG_CONFIG --cflags "portaudio-2.0 >= 19" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+ else
+ pkg_failed=untried
+ fi
+-if test -n "$PORTSMF_LIBS"; then
+- pkg_cv_PORTSMF_LIBS="$PORTSMF_LIBS"
++if test -n "$PORTAUDIO_LIBS"; then
++ pkg_cv_PORTAUDIO_LIBS="$PORTAUDIO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"portSMF\"") >&5
+- ($PKG_CONFIG --exists --print-errors "portSMF") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_PORTSMF_LIBS=`$PKG_CONFIG --libs "portSMF" 2>/dev/null`
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_PORTAUDIO_LIBS=`$PKG_CONFIG --libs "portaudio-2.0 >= 19" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -8711,40 +7647,183 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- PORTSMF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "portSMF" 2>&1`
++ PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "portaudio-2.0 >= 19" 2>&1`
+ else
+- PORTSMF_PKG_ERRORS=`$PKG_CONFIG --print-errors "portSMF" 2>&1`
++ PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "portaudio-2.0 >= 19" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+- echo "$PORTSMF_PKG_ERRORS" >&5
++ echo "$PORTAUDIO_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- portsmf_available="no"
++ portaudio_available_system="no"
+ elif test $pkg_failed = untried; then
+- portsmf_available="no"
++ portaudio_available_system="no"
+ else
+- PORTSMF_CFLAGS=$pkg_cv_PORTSMF_CFLAGS
+- PORTSMF_LIBS=$pkg_cv_PORTSMF_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ PORTAUDIO_CFLAGS=$pkg_cv_PORTAUDIO_CFLAGS
++ PORTAUDIO_LIBS=$pkg_cv_PORTAUDIO_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- portsmf_available="yes"
++ portaudio_available_system="yes"
+ fi
+
+- if test "x$portsmf_available" = "xyes" ; then
+- PORTSMF_LOCAL_AVAILABLE="yes"
+- PORTSMF_LOCAL_LDFLAGS=$PORTSMF_LIBS
+- PORTSMF_LOCAL_CXXFLAGS=$PORTSMF_CFLAGS
+- PORTSMF_LOCAL_CPPSYMBOLS="USE_MIDI"
+- PORTSMF_LOCAL_OPTOBJS="NoteTrack.o import/ImportMIDI.o"
+- PORTSMF_LOCAL_BUILD="portSMF"
+ if test "x$portaudio_available_system" = "xyes" ; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
@@ -8548,14 +8700,94 @@ Forwarded: not-needed
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: portaudio19 library is available in the local tree" >&5
+$as_echo "$as_me: portaudio19 library is available in the local tree" >&6;}
- else
-- PORTSMF_LOCAL_AVAILABLE="no"
++ else
+ PORTAUDIO_LOCAL_AVAILABLE="no"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: portaudio19 library is NOT available in the local tree" >&5
+$as_echo "$as_me: portaudio19 library is NOT available in the local tree" >&6;}
++ fi
++
++
++
++
++# Check whether --with-lame was given.
++if test "${with_lame+set}" = set; then :
++ withval=$with_lame; LAME_ARGUMENT=$withval
++else
++ LAME_ARGUMENT="unspecified"
++fi
++
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lame_set_VBR_q in -lmp3lame" >&5
++$as_echo_n "checking for lame_set_VBR_q in -lmp3lame... " >&6; }
++if test "${ac_cv_lib_mp3lame_lame_set_VBR_q+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lmp3lame $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++/* 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 lame_set_VBR_q ();
++int
++main ()
++{
++return lame_set_VBR_q ();
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_link "$LINENO"; then :
++ ac_cv_lib_mp3lame_lame_set_VBR_q=yes
++else
++ ac_cv_lib_mp3lame_lame_set_VBR_q=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mp3lame_lame_set_VBR_q" >&5
++$as_echo "$ac_cv_lib_mp3lame_lame_set_VBR_q" >&6; }
++if test "x$ac_cv_lib_mp3lame_lame_set_VBR_q" = x""yes; then :
++ lib_found="yes"
++else
++ lib_found="no"
++fi
++
++
++ ac_fn_cxx_check_header_mongrel "$LINENO" "lame/lame.h" "ac_cv_header_lame_lame_h" "$ac_includes_default"
++if test "x$ac_cv_header_lame_lame_h" = x""yes; then :
++ header_found="yes"
++else
++ header_found="no"
++fi
++
++
++
++ if test "x$lib_found" = "xyes" && test "x$header_found" = "xyes" ; then
++ LAME_SYSTEM_AVAILABLE="yes"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: LAME library is available as system library." >&5
++$as_echo "$as_me: LAME library is available as system library." >&6;}
++ if test "x$dynamic_loading" = "xno"; then
++ LAME_SYSTEM_LIBS="-lmp3lame"
++ LAME_SYSTEM_CPPSYMBOLS="DISABLE_DYNAMIC_LOADING_LAME"
++ fi
+ else
+- PORTSMF_LOCAL_AVAILABLE="no"
++ LAME_SYSTEM_AVAILABLE="no"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: LAME library is NOT available as system library." >&5
++$as_echo "$as_me: LAME library is NOT available as system library." >&6;}
fi
++ LAME_LOCAL_AVAILABLE="yes"
++
-{ $as_echo "$as_me:$LINENO: Figuring out what libraries to enable" >&5
+
@@ -8563,7 +8795,7 @@ Forwarded: not-needed
$as_echo "$as_me: Figuring out what libraries to enable" >&6;}
lib_preference=`echo $lib_preference | tr [:lower:], "[:upper:] "`
-@@ -8761,43 +7760,37 @@
+@@ -8761,43 +7840,37 @@
if test "$AVAILABLE" = "yes" ; then
eval ${lib}_USE_${sys_or_local}="yes"
lib_activated="yes"
@@ -8615,7 +8847,7 @@ Forwarded: not-needed
fi
fi
done
-@@ -8809,39 +7802,41 @@
+@@ -8809,39 +7882,41 @@
# liblrdf
if test "$LIBSNDFILE_USE_LOCAL" != "yes" && test "$LIBSNDFILE_USE_SYSTEM" != "yes" ; then
@@ -8670,7 +8902,7 @@ Forwarded: not-needed
$as_echo "$as_me: Using libsamplerate as requested" >&6;}
fi
fi
-@@ -8892,7 +7887,7 @@
+@@ -8892,7 +7967,7 @@
# Check whether --enable-audiounits was given.
@@ -8679,7 +8911,7 @@ Forwarded: not-needed
enableval=$enable_audiounits; use_audiounits=$enableval
else
use_audiounits="auto"
-@@ -8900,7 +7895,7 @@
+@@ -8900,7 +7975,7 @@
# Check whether --enable-ladspa was given.
@@ -8688,7 +8920,7 @@ Forwarded: not-needed
enableval=$enable_ladspa; use_ladspa=$enableval
else
use_ladspa="yes"
-@@ -8908,7 +7903,7 @@
+@@ -8908,7 +7983,7 @@
# Check whether --enable-quicktime was given.
@@ -8697,7 +8929,7 @@ Forwarded: not-needed
enableval=$enable_quicktime; use_quicktime=$enableval
else
use_quicktime="auto"
-@@ -8918,7 +7913,7 @@
+@@ -8918,7 +7993,7 @@
# Check whether --with-portmixer was given.
@@ -8706,7 +8938,7 @@ Forwarded: not-needed
withval=$with_portmixer; use_portmixer=$withval
else
use_portmixer="yes"
-@@ -8927,35 +7922,27 @@
+@@ -8927,35 +8002,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -8749,7 +8981,7 @@ Forwarded: not-needed
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -8971,28 +7958,24 @@
+@@ -8971,28 +8038,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -8783,7 +9015,7 @@ Forwarded: not-needed
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -9031,14 +8014,10 @@
+@@ -9031,14 +8094,10 @@
CONFIGHEADER="configwin.h"
@@ -8800,7 +9032,7 @@ Forwarded: not-needed
AFTERBUILD=""
-@@ -9050,17 +8029,13 @@
+@@ -9050,17 +8109,13 @@
EXTRAINSTALLTARGETS="$EXTRAINSTALLTARGETS install-extra-data"
EXTRAUNINSTALLTARGETS="$EXTRAUNINSTALLTARGETS uninstall-extra-data"
@@ -8821,7 +9053,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9085,79 +8060,50 @@
+@@ -9085,79 +8140,50 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -8914,7 +9146,7 @@ Forwarded: not-needed
pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -9169,11 +8115,11 @@
+@@ -9169,11 +8195,11 @@
pkg_cv_GTK_LIBS="$GTK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -8929,7 +9161,7 @@ Forwarded: not-needed
pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -9199,7 +8145,7 @@
+@@ -9199,7 +8225,7 @@
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
@@ -8938,7 +9170,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
have_gtk=no
elif test $pkg_failed = untried; then
-@@ -9207,16 +8153,14 @@
+@@ -9207,16 +8233,14 @@
else
GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
GTK_LIBS=$pkg_cv_GTK_LIBS
@@ -8957,7 +9189,7 @@ Forwarded: not-needed
CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
-@@ -9225,13 +8169,6 @@
+@@ -9225,13 +8249,6 @@
esac
@@ -8971,7 +9203,7 @@ Forwarded: not-needed
case "${host_os}" in
darwin* | rhapsody*)
LIBS="-framework AudioUnit -framework AudioToolbox $LIBS"
-@@ -9240,18 +8177,14 @@
+@@ -9240,18 +8257,14 @@
cygwin*)
;;
*)
@@ -8993,7 +9225,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9269,43 +8202,18 @@
+@@ -9269,43 +8282,18 @@
return 0;
}
_ACEOF
@@ -9043,7 +9275,7 @@ Forwarded: not-needed
have_alsa=yes
else
have_alsa=no
-@@ -9316,18 +8224,18 @@
+@@ -9316,18 +8304,18 @@
fi
pkg_failed=no
@@ -9066,7 +9298,7 @@ Forwarded: not-needed
pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack" 2>/dev/null`
else
pkg_failed=yes
-@@ -9339,11 +8247,11 @@
+@@ -9339,11 +8327,11 @@
pkg_cv_JACK_LIBS="$JACK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -9081,7 +9313,7 @@ Forwarded: not-needed
pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack" 2>/dev/null`
else
pkg_failed=yes
-@@ -9369,7 +8277,7 @@
+@@ -9369,7 +8357,7 @@
# Put the nasty error message in config.log where it belongs
echo "$JACK_PKG_ERRORS" >&5
@@ -9090,7 +9322,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
have_jack=no
elif test $pkg_failed = untried; then
-@@ -9377,25 +8285,21 @@
+@@ -9377,25 +8365,21 @@
else
JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
JACK_LIBS=$pkg_cv_JACK_LIBS
@@ -9120,7 +9352,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9413,43 +8317,18 @@
+@@ -9413,43 +8397,18 @@
return 0;
}
_ACEOF
@@ -9170,7 +9402,7 @@ Forwarded: not-needed
have_asihpi=yes
else
have_asihpi=no
-@@ -9458,18 +8337,14 @@
+@@ -9458,18 +8417,14 @@
if [ $have_asihpi = "yes" ] ; then
LIBS="$LIBS -lhpi"
fi
@@ -9192,7 +9424,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9485,144 +8360,29 @@
+@@ -9485,144 +8440,29 @@
return clock_gettime ();
;
return 0;
@@ -9357,7 +9589,7 @@ Forwarded: not-needed
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -9636,9 +8396,7 @@
+@@ -9636,9 +8476,7 @@
if [ "$use_portmixer" = "yes" ] ; then
@@ -9368,7 +9600,7 @@ Forwarded: not-needed
CXXFLAGS="-I\$(top_srcdir)/lib-src/portmixer/include $CXXFLAGS"
-@@ -9646,19 +8404,14 @@
+@@ -9646,19 +8484,14 @@
subdirs="$subdirs lib-src/portmixer"
@@ -9391,7 +9623,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#define _ISOC9X_SOURCE 1
-@@ -9674,54 +8427,27 @@
+@@ -9674,54 +8507,27 @@
return 0;
}
_ACEOF
@@ -9453,7 +9685,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#define _ISOC9X_SOURCE 1
-@@ -9737,41 +8463,18 @@
+@@ -9737,41 +8543,18 @@
return 0;
}
_ACEOF
@@ -9499,7 +9731,7 @@ Forwarded: not-needed
fi
-@@ -9782,9 +8485,7 @@
+@@ -9782,9 +8565,7 @@
OPTOBJS="$OPTOBJS effects/ladspa/LadspaEffect.o"
@@ -9510,7 +9742,7 @@ Forwarded: not-needed
case "$host_os" in
-@@ -9801,9 +8502,7 @@
+@@ -9801,9 +8582,7 @@
OPTOBJS="$OPTOBJS effects/audiounits/AudioUnitEffect.o"
@@ -9521,7 +9753,7 @@ Forwarded: not-needed
fi
-@@ -9812,9 +8511,7 @@
+@@ -9812,9 +8591,7 @@
OPTOBJS="$OPTOBJS import/ImportQTWrapper.o"
@@ -9532,7 +9764,7 @@ Forwarded: not-needed
fi
-@@ -9869,13 +8566,13 @@
+@@ -9869,13 +8646,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -9548,7 +9780,7 @@ Forwarded: not-needed
esac ;;
esac
done
-@@ -9883,8 +8580,8 @@
+@@ -9883,8 +8660,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -9559,7 +9791,7 @@ Forwarded: not-needed
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -9907,11 +8604,11 @@
+@@ -9907,11 +8684,11 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -9573,7 +9805,7 @@ Forwarded: not-needed
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -9925,14 +8622,15 @@
+@@ -9925,14 +8702,15 @@
ac_libobjs=
ac_ltlibobjs=
@@ -9591,7 +9823,7 @@ Forwarded: not-needed
done
LIBOBJS=$ac_libobjs
-@@ -9944,9 +8642,10 @@
+@@ -9944,9 +8722,10 @@
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -9604,7 +9836,7 @@ Forwarded: not-needed
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -9956,17 +8655,18 @@
+@@ -9956,17 +8735,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -9630,7 +9862,7 @@ Forwarded: not-needed
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -9974,23 +8674,15 @@
+@@ -9974,23 +8754,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -9659,7 +9891,7 @@ Forwarded: not-needed
as_nl='
'
export as_nl
-@@ -9998,7 +8690,13 @@
+@@ -9998,7 +8770,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -9674,7 +9906,7 @@ Forwarded: not-needed
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -10009,7 +8707,7 @@
+@@ -10009,7 +8787,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -9683,7 +9915,7 @@ Forwarded: not-needed
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -10032,13 +8730,6 @@
+@@ -10032,13 +8810,6 @@
}
fi
@@ -9697,7 +9929,7 @@ Forwarded: not-needed
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -10048,15 +8739,15 @@
+@@ -10048,15 +8819,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -9716,7 +9948,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
;;
-@@ -10068,12 +8759,16 @@
+@@ -10068,12 +8839,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -9737,7 +9969,7 @@ Forwarded: not-needed
done
PS1='$ '
PS2='> '
-@@ -10085,7 +8780,89 @@
+@@ -10085,7 +8860,89 @@
LANGUAGE=C
export LANGUAGE
@@ -9828,7 +10060,7 @@ Forwarded: not-needed
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -10099,8 +8876,12 @@
+@@ -10099,8 +8956,12 @@
as_basename=false
fi
@@ -9842,7 +10074,7 @@ Forwarded: not-needed
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -10120,76 +8901,25 @@
+@@ -10120,76 +8981,25 @@
}
s/.*/./; q'`
@@ -9930,7 +10162,7 @@ Forwarded: not-needed
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -10218,8 +8948,56 @@
+@@ -10218,8 +9028,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -9988,7 +10220,7 @@ Forwarded: not-needed
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -10238,10 +9016,10 @@
+@@ -10238,10 +9096,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -10001,7 +10233,7 @@ Forwarded: not-needed
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -10256,13 +9034,19 @@
+@@ -10256,13 +9114,19 @@
exec 6>&1
@@ -10023,7 +10255,7 @@ Forwarded: not-needed
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -10293,13 +9077,15 @@
+@@ -10293,13 +9157,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -10042,7 +10274,7 @@ Forwarded: not-needed
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -10315,16 +9101,17 @@
+@@ -10315,16 +9181,17 @@
Configuration headers:
$config_headers
@@ -10064,7 +10296,7 @@ Forwarded: not-needed
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -10340,11 +9127,16 @@
+@@ -10340,11 +9207,16 @@
while test $# != 0
do
case $1 in
@@ -10082,7 +10314,7 @@ Forwarded: not-needed
*)
ac_option=$1
ac_optarg=$2
-@@ -10358,27 +9150,29 @@
+@@ -10358,27 +9230,29 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -10117,7 +10349,7 @@ Forwarded: not-needed
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -10386,11 +9180,10 @@
+@@ -10386,11 +9260,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -10132,7 +10364,7 @@ Forwarded: not-needed
ac_need_defaults=false ;;
esac
-@@ -10445,9 +9238,7 @@
+@@ -10445,9 +9318,7 @@
"lib-src/expat/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/expat/Makefile" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
@@ -10143,7 +10375,7 @@ Forwarded: not-needed
esac
done
-@@ -10473,7 +9264,7 @@
+@@ -10473,7 +9344,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -10152,7 +10384,7 @@ Forwarded: not-needed
}
# Create a (secure) tmp directory for tmp files.
-@@ -10484,11 +9275,7 @@
+@@ -10484,11 +9355,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -10165,7 +10397,7 @@ Forwarded: not-needed
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -10496,7 +9283,13 @@
+@@ -10496,7 +9363,13 @@
if test -n "$CONFIG_FILES"; then
@@ -10180,7 +10412,7 @@ Forwarded: not-needed
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
ac_cs_awk_cr='\\r'
-@@ -10513,24 +9306,18 @@
+@@ -10513,24 +9386,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -10209,7 +10441,7 @@ Forwarded: not-needed
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -10552,7 +9339,7 @@
+@@ -10552,7 +9419,7 @@
t delim
:nl
h
@@ -10218,7 +10450,7 @@ Forwarded: not-needed
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -10566,7 +9353,7 @@
+@@ -10566,7 +9433,7 @@
t nl
:delim
h
@@ -10227,7 +10459,7 @@ Forwarded: not-needed
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -10619,22 +9406,28 @@
+@@ -10619,22 +9486,28 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -10266,7 +10498,7 @@ Forwarded: not-needed
s/^[^=]*=[ ]*$//
}'
fi
-@@ -10662,9 +9455,7 @@
+@@ -10662,9 +9535,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -10277,7 +10509,7 @@ Forwarded: not-needed
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -10749,9 +9540,7 @@
+@@ -10749,9 +9620,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -10288,7 +10520,7 @@ Forwarded: not-needed
fi # test -n "$CONFIG_HEADERS"
-@@ -10764,9 +9553,7 @@
+@@ -10764,9 +9633,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -10299,7 +10531,7 @@ Forwarded: not-needed
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -10794,12 +9581,10 @@
+@@ -10794,12 +9661,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -10314,7 +10546,7 @@ Forwarded: not-needed
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -10810,7 +9595,7 @@
+@@ -10810,7 +9675,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -10323,7 +10555,7 @@ Forwarded: not-needed
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -10823,9 +9608,7 @@
+@@ -10823,9 +9688,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -10334,7 +10566,7 @@ Forwarded: not-needed
esac
;;
esac
-@@ -10853,47 +9636,7 @@
+@@ -10853,47 +9716,7 @@
q
}
s/.*/./; q'`
@@ -10383,7 +10615,7 @@ Forwarded: not-needed
ac_builddir=.
case "$ac_dir" in
-@@ -10945,7 +9688,6 @@
+@@ -10945,7 +9768,6 @@
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -10391,7 +10623,7 @@ Forwarded: not-needed
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -10955,12 +9697,11 @@
+@@ -10955,12 +9777,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -10406,7 +10638,7 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -10970,7 +9711,7 @@
+@@ -10970,7 +9791,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -10415,7 +10647,7 @@ Forwarded: not-needed
esac
_ACEOF
-@@ -10998,26 +9739,22 @@
+@@ -10998,26 +9819,22 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -10447,7 +10679,7 @@ Forwarded: not-needed
;;
:H)
#
-@@ -11028,25 +9765,19 @@
+@@ -11028,25 +9845,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -10477,7 +10709,7 @@ Forwarded: not-needed
fi
;;
-@@ -11056,15 +9787,12 @@
+@@ -11056,15 +9867,12 @@
done # for ac_tag
@@ -10495,7 +10727,7 @@ Forwarded: not-needed
# configure is writing to config.log, and then calls config.status.
-@@ -11085,7 +9813,7 @@
+@@ -11085,7 +9893,7 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -10504,7 +10736,7 @@ Forwarded: not-needed
fi
#
-@@ -11129,7 +9857,7 @@
+@@ -11129,7 +9937,7 @@
case $ac_arg in
*\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -10513,7 +10745,7 @@ Forwarded: not-needed
esac
done
-@@ -11158,49 +9886,9 @@
+@@ -11158,49 +9966,9 @@
test -d "$srcdir/$ac_dir" || continue
ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
@@ -10565,7 +10797,7 @@ Forwarded: not-needed
ac_builddir=.
case "$ac_dir" in
-@@ -11247,7 +9935,7 @@
+@@ -11247,7 +10015,7 @@
# This should be Cygnus configure.
ac_sub_configure=$ac_aux_dir/configure
else
@@ -10574,7 +10806,7 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
ac_sub_configure=
fi
-@@ -11261,29 +9949,23 @@
+@@ -11261,29 +10029,23 @@
ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
esac
diff --git a/debian/patches/disable-dynamic-loading-lame.patch b/debian/patches/disable-dynamic-loading-lame.patch
new file mode 100644
index 0000000..5c4c2bc
--- /dev/null
+++ b/debian/patches/disable-dynamic-loading-lame.patch
@@ -0,0 +1,379 @@
+Description: Add support to disable dynamic loading of LAME.
+Author: Benjamin Drung <bdrung at debian.org>
+
+--- /dev/null
++++ b/m4/audacity_checklib_lame.m4
+@@ -0,0 +1,41 @@
++dnl Todo: Add Audacity / LAME license
++dnl
++dnl Please increment the serial number below whenever you alter this macro
++dnl for the benefit of automatic macro update systems
++# audacity_checklib_lame.m4 serial 1
++
++dnl Check for a copy of lame, whoose headers we will use for the importer
++AC_DEFUN([AUDACITY_CHECKLIB_LAME], [
++ AC_ARG_WITH(lame,
++ [AS_HELP_STRING([--with-lame],
++ [use lame for import and export support])],
++ LAME_ARGUMENT=$withval,
++ LAME_ARGUMENT="unspecified")
++
++ dnl See if LAME is installed in the system
++
++ AC_CHECK_LIB(mp3lame,
++ lame_set_VBR_q,
++ lib_found="yes",
++ lib_found="no")
++
++ AC_CHECK_HEADER(lame/lame.h,
++ header_found="yes",
++ header_found="no")
++
++ if test "x$lib_found" = "xyes" && test "x$header_found" = "xyes" ; then
++ LAME_SYSTEM_AVAILABLE="yes"
++ AC_MSG_NOTICE([LAME library is available as system library.])
++ if test "x$dynamic_loading" = "xno"; then
++ LAME_SYSTEM_LIBS="-lmp3lame"
++ LAME_SYSTEM_CPPSYMBOLS="DISABLE_DYNAMIC_LOADING_LAME"
++ fi
++ else
++ LAME_SYSTEM_AVAILABLE="no"
++ AC_MSG_NOTICE([LAME library is NOT available as system library.])
++ fi
++
++ dnl see if LAME is available in the source dir
++
++ LAME_LOCAL_AVAILABLE="yes"
++])
+--- a/configure.in
++++ b/configure.in
+@@ -311,7 +311,7 @@
+ dnl-------------------------------------------------------------
+ dnl LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG LIBLRDF SLV2 REDLAND PORTSMF TAGLIB"
+ dnl disable plugin categorisation and LV2 libs for 1.3.7 release
+-LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG PORTSMF PORTAUDIO"
++LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG PORTSMF PORTAUDIO LAME"
+
+ AC_MSG_NOTICE([Determining what libraries are available in this tree and on the system])
+
+@@ -335,6 +335,7 @@
+ AUDACITY_CHECKLIB_PORTSMF
+ dnl AUDACITY_CHECKLIB_TAGLIB
+ AUDACITY_CHECKLIB_PORTAUDIO
++AUDACITY_CHECKLIB_LAME
+
+ dnl Decide what libraries to build with, and whether to use system or local libraries
+ dnl Set variables based on choices.
+--- a/src/configtemplate.h
++++ b/src/configtemplate.h
+@@ -87,6 +87,9 @@
+ /* Use system FFmpeg library and disable dynamic loading of it. */
+ #undef DISABLE_DYNAMIC_LOADING_FFMPEG
+
++/* Use system LAME library and disable dynamic loading of it. */
++#undef DISABLE_DYNAMIC_LOADING_LAME
++
+ /* Define if LADSPA plug-ins are enabled */
+ #undef USE_LADSPA
+
+--- a/src/export/ExportMP3.cpp
++++ b/src/export/ExportMP3.cpp
+@@ -89,7 +89,11 @@
+
+ #include "Export.h"
+
++#if defined(DISABLE_DYNAMIC_LOADING_LAME)
++#include <lame/lame.h>
++#else
+ #include "lame.h"
++#endif
+
+ #ifdef USE_LIBID3TAG
+ #include <id3tag.h>
+@@ -532,6 +536,8 @@
+ {
+ public:
+
++#ifndef DISABLE_DYNAMIC_LOADING_LAME
++
+ FindDialog(wxWindow *parent, wxString path, wxString name, wxString type)
+ : wxDialog(parent, wxID_ANY, wxString(_("Locate Lame")))
+ {
+@@ -624,28 +630,36 @@
+ return mLibPath.GetFullPath();
+ }
+
++#endif // DISABLE_DYNAMIC_LOADING_LAME
++
+ private:
+
++#ifndef DISABLE_DYNAMIC_LOADING_LAME
+ wxFileName mLibPath;
+
+ wxString mPath;
+ wxString mName;
+ wxString mType;
++#endif // DISABLE_DYNAMIC_LOADING_LAME
+
+ wxTextCtrl *mPathText;
+
+ DECLARE_EVENT_TABLE()
+ };
+
++#ifndef DISABLE_DYNAMIC_LOADING_LAME
+ BEGIN_EVENT_TABLE(FindDialog, wxDialog)
+ EVT_BUTTON(ID_BROWSE, FindDialog::OnBrowse)
+ EVT_BUTTON(ID_DLOAD, FindDialog::OnDownload)
+ END_EVENT_TABLE()
++#endif // DISABLE_DYNAMIC_LOADING_LAME
+
+ //----------------------------------------------------------------------------
+ // MP3Exporter
+ //----------------------------------------------------------------------------
+
++#ifndef DISABLE_DYNAMIC_LOADING_LAME
++
+ typedef lame_global_flags *lame_init_t(void);
+ typedef int lame_init_params_t(lame_global_flags*);
+ typedef const char* get_lame_version_t(void);
+@@ -689,6 +703,8 @@
+ typedef size_t lame_get_lametag_frame_t(const lame_global_flags *, unsigned char* buffer, size_t size);
+ typedef void lame_mp3_tags_fid_t(lame_global_flags *, FILE *);
+
++#endif // DISABLE_DYNAMIC_LOADING_LAME
++
+ #if defined(__WXMSW__)
+ // An alternative solution to give Windows an additional chance of writing the tag before
+ // falling bato to lame_mp3_tag_fid(). The latter can have DLL sharing issues when mixing
+@@ -741,9 +757,11 @@
+ MP3Exporter();
+ virtual ~MP3Exporter();
+
++#ifndef DISABLE_DYNAMIC_LOADING_LAME
+ bool FindLibrary(wxWindow *parent);
+ bool LoadLibrary(wxWindow *parent, AskUser askuser);
+ bool ValidLibraryLoaded();
++#endif // DISABLE_DYNAMIC_LOADING_LAME
+
+ /* These global settings keep state over the life of the object */
+ void SetMode(int mode);
+@@ -785,9 +803,11 @@
+
+ private:
+
++#ifndef DISABLE_DYNAMIC_LOADING_LAME
+ wxString mLibPath;
+ wxDynamicLibrary lame_lib;
+ bool mLibraryLoaded;
++#endif // DISABLE_DYNAMIC_LOADING_LAME
+
+ #if defined(__WXMSW__)
+ wxString mBladeVersion;
+@@ -800,6 +820,7 @@
+ int mRoutine;
+ int mChannel;
+
++#ifndef DISABLE_DYNAMIC_LOADING_LAME
+ /* function pointers to the symbols we get from the library */
+ lame_init_t* lame_init;
+ lame_init_params_t* lame_init_params;
+@@ -829,6 +850,7 @@
+ beWriteInfoTag_t *beWriteInfoTag;
+ beVersion_t *beVersion;
+ #endif
++#endif // DISABLE_DYNAMIC_LOADING_LAME
+
+ lame_global_flags *mGF;
+
+@@ -845,13 +867,17 @@
+
+ MP3Exporter::MP3Exporter()
+ {
++#ifndef DISABLE_DYNAMIC_LOADING_LAME
+ mLibraryLoaded = false;
++#endif // DISABLE_DYNAMIC_LOADING_LAME
+ mEncoding = false;
+ mGF = NULL;
+
++#ifndef DISABLE_DYNAMIC_LOADING_LAME
+ if (gPrefs) {
+ mLibPath = gPrefs->Read(wxT("/MP3/MP3LibPath"), wxT(""));
+ }
++#endif // DISABLE_DYNAMIC_LOADING_LAME
+
+ mBitrate = 128;
+ mQuality = QUALITY_2;
+@@ -865,6 +891,8 @@
+ FreeLibrary();
+ }
+
++#ifndef DISABLE_DYNAMIC_LOADING_LAME
++
+ bool MP3Exporter::FindLibrary(wxWindow *parent)
+ {
+ wxString path;
+@@ -958,6 +986,8 @@
+ return mLibraryLoaded;
+ }
+
++#endif // DISABLE_DYNAMIC_LOADING_LAME
++
+ void MP3Exporter::SetMode(int mode)
+ {
+ mMode = mode;
+@@ -981,6 +1011,7 @@
+
+ bool MP3Exporter::InitLibrary(wxString libpath)
+ {
++#ifndef DISABLE_DYNAMIC_LOADING_LAME
+ if (!lame_lib.Load(libpath, wxDL_LAZY)) {
+ return false;
+ }
+@@ -1079,6 +1110,7 @@
+ lame_lib.Unload();
+ return false;
+ }
++#endif // DISABLE_DYNAMIC_LOADING_LAME
+
+ mGF = lame_init();
+ if (mGF == NULL) {
+@@ -1095,25 +1127,31 @@
+ mGF = NULL;
+ }
+
++#ifndef DISABLE_DYNAMIC_LOADING_LAME
+ lame_lib.Unload();
++#endif // DISABLE_DYNAMIC_LOADING_LAME
+
+ return;
+ }
+
+ wxString MP3Exporter::GetLibraryVersion()
+ {
++#ifndef DISABLE_DYNAMIC_LOADING_LAME
+ if (!mLibraryLoaded) {
+ return wxT("");
+ }
++#endif // DISABLE_DYNAMIC_LOADING_LAME
+
+ return wxString::Format(wxT("LAME %hs"), get_lame_version());
+ }
+
+ int MP3Exporter::InitializeStream(int channels, int sampleRate)
+ {
++#ifndef DISABLE_DYNAMIC_LOADING_LAME
+ if (!mLibraryLoaded) {
+ return -1;
+ }
++#endif // DISABLE_DYNAMIC_LOADING_LAME
+
+ if (channels > 2) {
+ return -1;
+@@ -1124,7 +1162,10 @@
+ lame_set_in_samplerate(mGF, sampleRate);
+ lame_set_out_samplerate(mGF, sampleRate);
+ lame_set_disable_reservoir(mGF, true);
++#ifndef DISABLE_DYNAMIC_LOADING_LAME
++// TODO: Make this configurable (detect the existance of this function)
+ lame_set_padding_type(mGF, PAD_NO);
++#endif // DISABLE_DYNAMIC_LOADING_LAME
+
+ // Add the VbrTag for all types. For ABR/VBR, a Xing tag will be created.
+ // For CBR, it will be a Lame Info tag.
+@@ -1269,9 +1310,13 @@
+
+ int result = lame_encode_flush(mGF, outbuffer, mOutBufferSize);
+
++#if defined(DISABLE_DYNAMIC_LOADING_LAME)
++ mInfoTagLen = lame_get_lametag_frame(mGF, mInfoTagBuf, sizeof(mInfoTagBuf));
++#else
+ if (lame_get_lametag_frame) {
+ mInfoTagLen = lame_get_lametag_frame(mGF, mInfoTagBuf, sizeof(mInfoTagBuf));
+ }
++#endif
+
+ return result;
+ }
+@@ -1516,10 +1561,20 @@
+ int subformat)
+ {
+ int rate = lrint(project->GetRate());
++#ifndef DISABLE_DYNAMIC_LOADING_LAME
+ wxWindow *parent = project;
++#endif // DISABLE_DYNAMIC_LOADING_LAME
+ TrackList *tracks = project->GetTracks();
+ MP3Exporter exporter;
+
++#ifdef DISABLE_DYNAMIC_LOADING_LAME
++ if (!exporter.InitLibrary(wxT(""))) {
++ wxMessageBox(_("Could not initialize MP3 encoding library!"));
++ gPrefs->Write(wxT("/MP3/MP3LibPath"), wxString(wxT("")));
++
++ return false;
++ }
++#else
+ if (!exporter.LoadLibrary(parent, MP3Exporter::Maybe)) {
+ wxMessageBox(_("Could not open MP3 encoding library!"));
+ gPrefs->Write(wxT("/MP3/MP3LibPath"), wxString(wxT("")));
+@@ -1533,7 +1588,8 @@
+
+ return false;
+ }
+-
++#endif // DISABLE_DYNAMIC_LOADING_LAME
++
+ // Retrieve preferences
+ int highrate = 48000;
+ int lowrate = 8000;
+@@ -1969,13 +2025,17 @@
+ MP3Exporter exporter;
+ wxString versionString = _("MP3 export library not found");
+
++#ifndef DISABLE_DYNAMIC_LOADING_LAME
+ if (prompt) {
+ exporter.FindLibrary(parent);
+ }
+
+ if (exporter.LoadLibrary(parent, prompt ? MP3Exporter::Yes : MP3Exporter::No)) {
++#endif // DISABLE_DYNAMIC_LOADING_LAME
+ versionString = exporter.GetLibraryVersion();
++#ifndef DISABLE_DYNAMIC_LOADING_LAME
+ }
++#endif // DISABLE_DYNAMIC_LOADING_LAME
+
+ return versionString;
+ }
+--- a/src/prefs/LibraryPrefs.cpp
++++ b/src/prefs/LibraryPrefs.cpp
+@@ -89,13 +89,17 @@
+ S.AddVariableText(_("MP3 Library:"),
+ true,
+ wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL);
+- S.Id(ID_MP3_FIND_BUTTON).AddButton(_("&Locate..."),
++ wxButton *locate_button = S.Id(ID_MP3_FIND_BUTTON).AddButton(_("&Locate..."),
+ wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL);
+ S.AddVariableText(_("LAME MP3 Library:"),
+ true,
+ wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL);
+- S.Id(ID_MP3_DOWN_BUTTON).AddButton(_("&Download"),
++ wxButton *download_button = S.Id(ID_MP3_DOWN_BUTTON).AddButton(_("&Download"),
+ wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL);
++#ifdef DISABLE_DYNAMIC_LOADING_LAME
++ locate_button->Enable(FALSE);
++ download_button->Enable(FALSE);
++#endif // DISABLE_DYNAMIC_LOADING_LAME
+ }
+ S.EndTwoColumn();
+ }
+--- a/src/prefs/PrefsDialog.cpp
++++ b/src/prefs/PrefsDialog.cpp
+@@ -99,7 +99,9 @@
+ w = new TracksPrefs(mCategories); mCategories->AddPage(w, w->GetName(), false, 0);
+ w = new ImportExportPrefs(mCategories);mCategories->AddPage(w, w->GetName(), false, 0);
+ w = new ProjectsPrefs(mCategories); mCategories->AddPage(w, w->GetName(), false, 0);
++#if !defined(DISABLE_DYNAMIC_LOADING_FFMPEG) || !defined(DISABLE_DYNAMIC_LOADING_LAME)
+ w = new LibraryPrefs(mCategories); mCategories->AddPage(w, w->GetName(), false, 0);
++#endif
+ w = new SpectrumPrefs(mCategories); mCategories->AddPage(w, w->GetName(), false, 0);
+ w = new DirectoriesPrefs(mCategories); mCategories->AddPage(w, w->GetName(), false, 0);
+ w = new WarningsPrefs(mCategories); mCategories->AddPage(w, w->GetName(), false, 0);
diff --git a/debian/patches/disable-dynamic-loading.patch b/debian/patches/disable-dynamic-loading.patch
index 31335f0..19cd4cf 100644
--- a/debian/patches/disable-dynamic-loading.patch
+++ b/debian/patches/disable-dynamic-loading.patch
@@ -54,7 +54,7 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
+ FFMPEG_SYSTEM_CPPSYMBOLS="USE_FFMPEG"
+ if test "x$dynamic_loading" = "xno"; then
+ FFMPEG_SYSTEM_LIBS="$AVCODEC_LIBS $AVFORMAT_LIBS $AVUTIL_LIBS"
-+ AC_DEFINE(DISABLE_DYNAMIC_LOADING_FFMPEG, 1, [Use system FFmpeg library and disable dynamic loading of it.])
++ FFMPEG_SYSTEM_CPPSYMBOLS="$FFMPEG_SYSTEM_CPPSYMBOLS DISABLE_DYNAMIC_LOADING_FFMPEG"
+ fi
+ dnl build the extra object files needed to use FFmpeg. Paths inside
+ dnl the audacity src/ dir, as this is subsitiuted into src/Makefile.in
diff --git a/debian/patches/series b/debian/patches/series
index 67715cb..ddbf728 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,5 +11,6 @@ fix-wma-export-crash.patch
fix-autoconf-warning.patch
autogen-script.patch
disable-dynamic-loading.patch
+disable-dynamic-loading-lame.patch
autoreconf.patch
configure.patch
diff --git a/debian/rules b/debian/rules
index 1b14b5e..afc9d6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ configure_flags := \
--disable-dynamic-loading \
--with-expat=system \
--with-ffmpeg=system \
+ --with-lame=local \
--with-libflac=system \
--with-libid3tag=system \
--with-libmad=system \
--
Audacity debian packaging
More information about the pkg-multimedia-commits
mailing list