[SCM] audacity/master: Check also for libavutil.
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Wed Dec 29 23:20:48 UTC 2010
The following commit has been merged in the master branch:
commit 6a5daaa16c89f11f6a829d8dbdaa9d4f2d658829
Author: Benjamin Drung <bdrung at gmail.com>
Date: Wed Dec 29 23:32:56 2010 +0100
Check also for libavutil.
diff --git a/debian/control b/debian/control
index 57292c3..f5f6cb9 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends: autotools-dev,
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libavcodec-dev (>= 3:0.svn20090204),
libavformat-dev (>= 3:0.svn20090204),
+ libavutil-dev (>= 3:0.svn20090204),
libexpat1-dev,
libflac++-dev,
libgtk2.0-dev,
diff --git a/debian/patches/configure.patch b/debian/patches/configure.patch
index d808867..a332d91 100644
--- a/debian/patches/configure.patch
+++ b/debian/patches/configure.patch
@@ -2,8 +2,8 @@ Description: Run autogen.sh for disable-dynamic-loading.patch
Author: Benjamin Drung <bdrung at ubuntu.com>
Forwarded: not-needed
---- audacity-1.3.12.orig/configure
-+++ audacity-1.3.12/configure
+--- a/configure
++++ b/configure
@@ -1,18 +1,22 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -33,7 +33,7 @@ Forwarded: not-needed
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -20,23 +24,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -20,23 +24,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -62,7 +62,7 @@ Forwarded: not-needed
as_nl='
'
export as_nl
-@@ -44,7 +40,13 @@ export as_nl
+@@ -44,7 +40,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
@@ -77,7 +77,7 @@ Forwarded: not-needed
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -55,7 +57,7 @@ else
+@@ -55,7 +57,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -86,7 +86,7 @@ Forwarded: not-needed
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -78,13 +80,6 @@ if test "${PATH_SEPARATOR+set}" != set;
+@@ -78,13 +80,6 @@
}
fi
@@ -100,7 +100,7 @@ Forwarded: not-needed
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -94,15 +89,15 @@ fi
+@@ -94,15 +89,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -119,7 +119,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
;;
-@@ -114,12 +109,16 @@ if test "x$as_myself" = x; then
+@@ -114,12 +109,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -140,7 +140,7 @@ Forwarded: not-needed
done
PS1='$ '
PS2='> '
-@@ -131,330 +130,299 @@ export LC_ALL
+@@ -131,330 +130,299 @@
LANGUAGE=C
export LANGUAGE
@@ -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,7 +550,6 @@ 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)
-}
@@ -566,6 +565,10 @@ 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
+# ----------------------
@@ -578,16 +581,20 @@ Forwarded: not-needed
+ {
+ eval $1+=\$2
+ }'
-+else
+ else
+- exitcode=1
+- echo as_func_success failed.
+-fi
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
--exitcode=0
--if as_func_success; then
-- :
+-if as_func_failure; then
+- exitcode=1
+- echo as_func_failure succeeded.
+-fi
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
@@ -598,23 +605,16 @@ Forwarded: not-needed
+ {
+ as_val=$(( $* ))
+ }'
- else
-- exitcode=1
-- echo as_func_success failed.
--fi
++else
+ 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
@@ -716,7 +716,7 @@ Forwarded: not-needed
sed -n '
p
/[$]LINENO/=
-@@ -471,8 +439,7 @@ test \$exitcode = 0") || {
+@@ -471,8 +439,7 @@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
@@ -726,7 +726,7 @@ Forwarded: not-needed
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
-@@ -482,29 +449,18 @@ test \$exitcode = 0") || {
+@@ -482,29 +449,18 @@
exit
}
@@ -761,7 +761,7 @@ Forwarded: not-needed
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -534,7 +490,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$
+@@ -534,7 +490,7 @@
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
@@ -770,7 +770,7 @@ Forwarded: not-needed
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -553,10 +509,10 @@ else
+@@ -553,10 +509,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -783,7 +783,7 @@ Forwarded: not-needed
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -570,11 +526,11 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+@@ -570,11 +526,11 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -798,7 +798,7 @@ Forwarded: not-needed
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-@@ -589,7 +545,6 @@ cross_compiling=no
+@@ -589,7 +545,6 @@
subdirs=
MFLAGS=
MAKEFLAGS=
@@ -806,7 +806,7 @@ Forwarded: not-needed
# Identity of this package.
PACKAGE_NAME=
-@@ -597,6 +552,7 @@ PACKAGE_TARNAME=
+@@ -597,6 +552,7 @@
PACKAGE_VERSION=
PACKAGE_STRING=
PACKAGE_BUGREPORT=
@@ -814,7 +814,16 @@ Forwarded: not-needed
ac_unique_file="src/Audacity.h"
ac_default_prefix=/usr/local
-@@ -742,6 +698,7 @@ bindir
+@@ -655,6 +611,8 @@
+ build
+ PORTSMF_LIBS
+ PORTSMF_CFLAGS
++AVUTIL_LIBS
++AVUTIL_CFLAGS
+ AVFORMAT_LIBS
+ AVFORMAT_CFLAGS
+ AVCODEC_LIBS
+@@ -742,6 +700,7 @@
program_transform_name
prefix
exec_prefix
@@ -822,7 +831,7 @@ Forwarded: not-needed
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -756,6 +713,7 @@ enable_static
+@@ -756,6 +715,7 @@
enable_unicode
enable_debug
with_lib_preference
@@ -830,7 +839,15 @@ Forwarded: not-needed
with_libsndfile
with_expat
with_libsamplerate
-@@ -815,7 +773,7 @@ GTK_CFLAGS
+@@ -809,13 +769,15 @@
+ AVCODEC_LIBS
+ AVFORMAT_CFLAGS
+ AVFORMAT_LIBS
++AVUTIL_CFLAGS
++AVUTIL_LIBS
+ PORTSMF_CFLAGS
+ PORTSMF_LIBS
+ GTK_CFLAGS
GTK_LIBS
JACK_CFLAGS
JACK_LIBS'
@@ -839,7 +856,7 @@ Forwarded: not-needed
$CONFIG_SUBDIRS
lib-src/portaudio-v19
lib-src/portmixer'
-@@ -880,8 +838,9 @@ do
+@@ -880,8 +842,9 @@
fi
case $ac_option in
@@ -851,7 +868,7 @@ Forwarded: not-needed
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -926,8 +885,7 @@ do
+@@ -926,8 +889,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 &&
@@ -861,7 +878,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 +911,7 @@ do
+@@ -953,8 +915,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 &&
@@ -871,7 +888,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 +1115,7 @@ do
+@@ -1158,8 +1119,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 &&
@@ -881,7 +898,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 +1131,7 @@ do
+@@ -1175,8 +1135,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 &&
@@ -891,7 +908,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 +1161,17 @@ do
+@@ -1206,17 +1165,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -915,7 +932,7 @@ Forwarded: not-needed
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1233,15 +1188,13 @@ done
+@@ -1233,15 +1192,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -933,7 +950,7 @@ Forwarded: not-needed
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1264,8 +1217,7 @@ do
+@@ -1264,8 +1221,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -943,7 +960,7 @@ Forwarded: not-needed
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1279,8 +1231,8 @@ target=$target_alias
+@@ -1279,8 +1235,8 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
@@ -954,7 +971,7 @@ Forwarded: not-needed
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
-@@ -1295,11 +1247,9 @@ test "$silent" = yes && exec 6>/dev/null
+@@ -1295,11 +1251,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -968,7 +985,7 @@ Forwarded: not-needed
# Find the source files, if location was not specified.
-@@ -1338,13 +1288,11 @@ else
+@@ -1338,13 +1292,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -984,7 +1001,7 @@ Forwarded: not-needed
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1384,7 +1332,7 @@ Configuration:
+@@ -1384,7 +1336,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
@@ -993,7 +1010,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 +1397,9 @@ Optional Features:
+@@ -1449,6 +1401,9 @@
--enable-static link wx statically [default=no]
--enable-unicode enable unicode support [default=yes]
--enable-debug enable debug support [default=no]
@@ -1003,7 +1020,7 @@ 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]
-@@ -1486,7 +1437,7 @@ Some influential environment variables:
+@@ -1486,7 +1441,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>
@@ -1012,7 +1029,17 @@ Forwarded: not-needed
you have headers in a nonstandard directory <include dir>
CXX C++ compiler command
CXXFLAGS C++ compiler flags
-@@ -1540,6 +1491,7 @@ Some influential environment variables:
+@@ -1528,6 +1483,9 @@
+ C compiler flags for AVFORMAT, overriding pkg-config
+ AVFORMAT_LIBS
+ linker flags for AVFORMAT, overriding pkg-config
++ AVUTIL_CFLAGS
++ C compiler flags for AVUTIL, overriding pkg-config
++ AVUTIL_LIBS linker flags for AVUTIL, overriding pkg-config
+ PORTSMF_CFLAGS
+ C compiler flags for PORTSMF, overriding pkg-config
+ PORTSMF_LIBS
+@@ -1540,6 +1498,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1020,7 +1047,7 @@ Forwarded: not-needed
_ACEOF
ac_status=$?
fi
-@@ -1603,21 +1555,464 @@ test -n "$ac_init_help" && exit $ac_stat
+@@ -1603,21 +1562,464 @@
if $ac_init_version; then
cat <<\_ACEOF
configure
@@ -1033,8 +1060,9 @@ Forwarded: not-needed
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
- exit
- fi
+- exit
++ exit
++fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
@@ -1469,7 +1497,7 @@ 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
@@ -1489,7 +1517,7 @@ Forwarded: not-needed
$ $0 $@
-@@ -1653,8 +2048,8 @@ for as_dir in $PATH
+@@ -1653,8 +2055,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1500,7 +1528,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
} >&5
-@@ -1691,9 +2086,9 @@ do
+@@ -1691,9 +2093,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1512,7 +1540,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 +2104,13 @@ do
+@@ -1709,13 +2111,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -1529,7 +1557,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 +2122,9 @@ trap 'exit_status=$?
+@@ -1727,11 +2129,9 @@
{
echo
@@ -1543,7 +1571,7 @@ Forwarded: not-needed
echo
# The following way of writing the cache mishandles newlines in values,
(
-@@ -1740,13 +2133,13 @@ _ASBOX
+@@ -1740,13 +2140,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -1559,7 +1587,7 @@ Forwarded: not-needed
esac ;;
esac
done
-@@ -1765,11 +2158,9 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -1765,11 +2165,9 @@
)
echo
@@ -1573,7 +1601,7 @@ Forwarded: not-needed
echo
for ac_var in $ac_subst_vars
do
-@@ -1782,11 +2173,9 @@ _ASBOX
+@@ -1782,11 +2180,9 @@
echo
if test -n "$ac_subst_files"; then
@@ -1587,7 +1615,7 @@ Forwarded: not-needed
echo
for ac_var in $ac_subst_files
do
-@@ -1800,11 +2189,9 @@ _ASBOX
+@@ -1800,11 +2196,9 @@
fi
if test -s confdefs.h; then
@@ -1601,7 +1629,7 @@ Forwarded: not-needed
echo
cat confdefs.h
echo
-@@ -1818,46 +2205,53 @@ _ASBOX
+@@ -1818,46 +2212,53 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -1661,7 +1689,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 +2262,23 @@ fi
+@@ -1868,19 +2269,23 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -1692,7 +1720,7 @@ Forwarded: not-needed
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -1888,12 +2286,12 @@ $as_echo "$as_me: loading cache $cache_f
+@@ -1888,12 +2293,12 @@
esac
fi
else
@@ -1707,7 +1735,7 @@ Forwarded: not-needed
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
-@@ -1904,11 +2302,11 @@ for ac_var in $ac_precious_vars; do
+@@ -1904,11 +2309,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -1721,7 +1749,7 @@ Forwarded: not-needed
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -1918,17 +2316,17 @@ $as_echo "$as_me: error: \`$ac_var' was
+@@ -1918,17 +2323,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
@@ -1743,7 +1771,7 @@ Forwarded: not-needed
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -1940,35 +2338,20 @@ $as_echo "$as_me: current value: \`$ac
+@@ -1940,35 +2345,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -1786,7 +1814,7 @@ Forwarded: not-needed
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -1991,9 +2374,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -1991,9 +2381,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
@@ -1798,7 +1826,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2004,24 +2387,24 @@ for as_dir in $PATH
+@@ -2004,24 +2394,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1828,7 +1856,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2031,9 +2414,9 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -2031,9 +2421,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
@@ -1840,7 +1868,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -2044,24 +2427,24 @@ for as_dir in $PATH
+@@ -2044,24 +2434,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1870,7 +1898,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2070,7 +2453,7 @@ fi
+@@ -2070,7 +2460,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -1879,7 +1907,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 +2467,9 @@ if test -z "$CC"; then
+@@ -2084,9 +2474,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
@@ -1891,7 +1919,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2097,24 +2480,24 @@ for as_dir in $PATH
+@@ -2097,24 +2487,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1921,7 +1949,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2124,9 +2507,9 @@ fi
+@@ -2124,9 +2514,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
@@ -1933,7 +1961,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2138,18 +2521,18 @@ for as_dir in $PATH
+@@ -2138,18 +2528,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1955,7 +1983,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -2168,10 +2551,10 @@ fi
+@@ -2168,10 +2558,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -1968,7 +1996,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2183,9 +2566,9 @@ if test -z "$CC"; then
+@@ -2183,9 +2573,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
@@ -1980,7 +2008,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2196,24 +2579,24 @@ for as_dir in $PATH
+@@ -2196,24 +2586,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2010,7 +2038,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2227,9 +2610,9 @@ if test -z "$CC"; then
+@@ -2227,9 +2617,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
@@ -2022,7 +2050,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -2240,24 +2623,24 @@ for as_dir in $PATH
+@@ -2240,24 +2630,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2052,7 +2080,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2270,7 +2653,7 @@ done
+@@ -2270,7 +2660,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2061,7 +2089,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 +2664,37 @@ fi
+@@ -2281,57 +2671,37 @@
fi
@@ -2139,7 +2167,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -2347,8 +2710,8 @@ ac_clean_files="$ac_clean_files a.out a.
+@@ -2347,8 +2717,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.
@@ -2150,7 +2178,7 @@ Forwarded: not-needed
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -2364,17 +2727,17 @@ do
+@@ -2364,17 +2734,17 @@
done
rm -f $ac_rmfiles
@@ -2173,7 +2201,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 +2754,7 @@ do
+@@ -2391,7 +2761,7 @@
# certainly right.
break;;
*.* )
@@ -2182,7 +2210,7 @@ Forwarded: not-needed
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -2410,84 +2773,41 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
+@@ -2410,84 +2780,41 @@
else
ac_file=''
fi
@@ -2287,7 +2315,7 @@ 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 +2822,83 @@ for ac_file in conftest.exe conftest con
+@@ -2502,32 +2829,83 @@
esac
done
else
@@ -2387,7 +2415,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -2539,17 +2910,17 @@ main ()
+@@ -2539,17 +2917,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -2410,7 +2438,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 +2933,23 @@ else
+@@ -2562,31 +2940,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2449,7 +2477,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -2600,37 +2963,16 @@ main ()
+@@ -2600,37 +2970,16 @@
return 0;
}
_ACEOF
@@ -2490,7 +2518,7 @@ Forwarded: not-needed
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -2639,20 +2981,16 @@ else
+@@ -2639,20 +2988,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -2514,7 +2542,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -2663,35 +3001,11 @@ main ()
+@@ -2663,35 +3008,11 @@
return 0;
}
_ACEOF
@@ -2553,7 +2581,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -2702,36 +3016,12 @@ main ()
+@@ -2702,36 +3023,12 @@
return 0;
}
_ACEOF
@@ -2594,7 +2622,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -2742,42 +3032,17 @@ main ()
+@@ -2742,42 +3039,17 @@
return 0;
}
_ACEOF
@@ -2639,7 +2667,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 +3059,14 @@ else
+@@ -2794,18 +3066,14 @@
CFLAGS=
fi
fi
@@ -2661,7 +2689,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -2862,32 +3123,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
+@@ -2862,32 +3130,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -2695,7 +2723,7 @@ Forwarded: not-needed
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -2898,17 +3136,19 @@ fi
+@@ -2898,17 +3143,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -2718,7 +2746,7 @@ Forwarded: not-needed
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2936,9 +3176,9 @@ if test -z "$CXX"; then
+@@ -2936,9 +3183,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
@@ -2730,7 +2758,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -2949,24 +3189,24 @@ for as_dir in $PATH
+@@ -2949,24 +3196,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2760,7 +2788,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2980,9 +3220,9 @@ if test -z "$CXX"; then
+@@ -2980,9 +3227,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
@@ -2772,7 +2800,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -2993,24 +3233,24 @@ for as_dir in $PATH
+@@ -2993,24 +3240,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2802,7 +2830,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -3023,7 +3263,7 @@ done
+@@ -3023,7 +3270,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2811,7 +2839,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 +3274,36 @@ fi
+@@ -3034,53 +3281,36 @@
fi
fi
# Provide some information about the compiler.
@@ -2884,7 +2912,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -3094,37 +3317,16 @@ main ()
+@@ -3094,37 +3324,16 @@
return 0;
}
_ACEOF
@@ -2925,7 +2953,7 @@ Forwarded: not-needed
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GXX=yes
-@@ -3133,59 +3335,16 @@ else
+@@ -3133,20 +3342,16 @@
fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
@@ -2945,16 +2973,14 @@ Forwarded: not-needed
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -3157,35 +3362,11 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -2973,7 +2999,8 @@ Forwarded: not-needed
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ac_cv_prog_cxx_g=yes
++if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_cv_prog_cxx_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -2984,11 +3011,13 @@ Forwarded: not-needed
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++else
++ CXXFLAGS=""
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
-@@ -3196,36 +3355,11 @@ main ()
+@@ -3196,36 +3377,12 @@
return 0;
}
_ACEOF
@@ -3014,23 +3043,22 @@ Forwarded: not-needed
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++if ac_fn_cxx_try_compile "$LINENO"; then :
+
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-- CXXFLAGS="-g"
++else
++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ CXXFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+ ac_cv_prog_cxx_g=yes
-+else
-+ CXXFLAGS=""
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
-@@ -3236,42 +3370,33 @@ main ()
+@@ -3236,42 +3393,17 @@
return 0;
}
_ACEOF
@@ -3052,27 +3080,13 @@ Forwarded: not-needed
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ac_cv_prog_cxx_g=yes
+if ac_fn_cxx_try_compile "$LINENO"; then :
-+
- else
+ ac_cv_prog_cxx_g=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+ CXXFLAGS="-g"
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
-+int
-+main ()
-+{
-
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+ ac_cv_prog_cxx_g=yes
+-
+-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -3089,7 +3103,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 +3424,10 @@ ac_cpp='$CXXCPP $CPPFLAGS'
+@@ -3299,10 +3431,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
@@ -3102,7 +3116,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
# Double quotes because CXXCPP needs to be expanded
-@@ -3317,11 +3442,7 @@ do
+@@ -3317,11 +3449,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.
@@ -3115,7 +3129,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -3330,78 +3451,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -3330,78 +3458,34 @@
#endif
Syntax error
_ACEOF
@@ -3202,7 +3216,7 @@ Forwarded: not-needed
break
fi
-@@ -3413,7 +3490,7 @@ fi
+@@ -3413,7 +3497,7 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -3211,7 +3225,7 @@ Forwarded: not-needed
$as_echo "$CXXCPP" >&6; }
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
-@@ -3424,11 +3501,7 @@ do
+@@ -3424,11 +3508,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.
@@ -3224,7 +3238,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -3437,87 +3510,40 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -3437,87 +3517,40 @@
#endif
Syntax error
_ACEOF
@@ -3324,7 +3338,7 @@ Forwarded: not-needed
fi
ac_ext=cpp
-@@ -3547,9 +3573,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
+@@ -3547,9 +3580,7 @@
fi
done
if test -z "$ac_aux_dir"; then
@@ -3335,7 +3349,7 @@ Forwarded: not-needed
fi
# These three variables are undocumented and unsupported,
-@@ -3575,10 +3599,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
+@@ -3575,10 +3606,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.
@@ -3348,7 +3362,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -3586,11 +3610,11 @@ for as_dir in $PATH
+@@ -3586,11 +3617,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3364,7 +3378,7 @@ Forwarded: not-needed
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -3627,7 +3651,7 @@ case $as_dir/ in
+@@ -3627,7 +3658,7 @@
;;
esac
@@ -3373,7 +3387,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -3643,7 +3667,7 @@ fi
+@@ -3643,7 +3674,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -3382,7 +3396,7 @@ Forwarded: not-needed
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -3656,9 +3680,9 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
+@@ -3656,9 +3687,9 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -3394,7 +3408,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$HAVE_PKG_CONFIG"; then
-@@ -3669,14 +3693,14 @@ for as_dir in $PATH
+@@ -3669,14 +3700,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3412,7 +3426,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 +3708,16 @@ fi
+@@ -3684,18 +3715,16 @@
fi
HAVE_PKG_CONFIG=$ac_cv_prog_HAVE_PKG_CONFIG
if test -n "$HAVE_PKG_CONFIG"; then
@@ -3434,7 +3448,7 @@ Forwarded: not-needed
fi
-@@ -3730,9 +3752,7 @@ AUDACITY_NAME=`echo audacity | sed $prog
+@@ -3730,9 +3759,7 @@
if [ "$AUDACITY_NAME" = "audacity" ] ; then
@@ -3445,7 +3459,7 @@ Forwarded: not-needed
else
cat >>confdefs.h <<_ACEOF
-@@ -3755,16 +3775,14 @@ _ACEOF
+@@ -3755,16 +3782,14 @@
### Configuration of Audacity module support ###
################################################
@@ -3465,7 +3479,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -3772,7 +3790,7 @@ else
+@@ -3772,7 +3797,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -3474,7 +3488,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 +3799,7 @@ for as_dir in $PATH
+@@ -3781,7 +3806,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3483,7 +3497,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 +3819,7 @@ case `"$ac_path_SED" --version 2>&1` in
+@@ -3801,7 +3826,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
@@ -3492,7 +3506,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 +3834,17 @@ esac
+@@ -3816,19 +3841,17 @@
$ac_path_SED_found && break 3
done
done
@@ -3515,7 +3529,7 @@ Forwarded: not-needed
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -3841,9 +3857,9 @@ $as_echo "$ac_cv_path_SED" >&6; }
+@@ -3841,9 +3864,9 @@
flag=`echo "-rdynamic" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
@@ -3527,7 +3541,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
-@@ -3852,14 +3868,10 @@ else
+@@ -3852,14 +3875,10 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -rdynamic"
@@ -3544,7 +3558,7 @@ Forwarded: not-needed
int
main ()
{
-@@ -3869,42 +3881,17 @@ main ()
+@@ -3869,42 +3888,17 @@
}
_ACEOF
@@ -3590,7 +3604,7 @@ Forwarded: not-needed
LDFLAGS="$save_LDFLAGS"
-@@ -3912,12 +3899,11 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -3912,12 +3906,11 @@
fi
@@ -3606,7 +3620,7 @@ Forwarded: not-needed
:
have_dynamic_link=yes
-@@ -3929,13 +3915,12 @@ else
+@@ -3929,13 +3922,12 @@
fi
@@ -3622,7 +3636,7 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: \"Audacity module support will probably not work\"" >&2;}
fi
-@@ -3943,7 +3928,7 @@ fi
+@@ -3943,7 +3935,7 @@
#####################
# Check whether --enable-static was given.
@@ -3631,7 +3645,7 @@ Forwarded: not-needed
enableval=$enable_static; static_preference="--static=$enableval"
else
static_preference=""
-@@ -3951,7 +3936,7 @@ fi
+@@ -3951,7 +3943,7 @@
# Check whether --enable-unicode was given.
@@ -3640,7 +3654,7 @@ Forwarded: not-needed
enableval=$enable_unicode; unicode_preference="--unicode=$enableval"
else
unicode_preference="--unicode=yes"
-@@ -3959,7 +3944,7 @@ fi
+@@ -3959,7 +3951,7 @@
# Check whether --enable-debug was given.
@@ -3649,7 +3663,7 @@ Forwarded: not-needed
enableval=$enable_debug; debug_preference="$enableval"
else
debug_preference="no"
-@@ -3968,32 +3953,36 @@ fi
+@@ -3968,32 +3960,36 @@
# Check whether --with-lib-preference was given.
@@ -3695,7 +3709,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -4053,48 +4042,25 @@ main ()
+@@ -4053,48 +4049,25 @@
return 0;
}
_ACEOF
@@ -3750,7 +3764,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4105,7 +4071,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -4105,7 +4078,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3759,7 +3773,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 +4091,7 @@ case `"$ac_path_GREP" --version 2>&1` in
+@@ -4125,7 +4098,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
@@ -3768,7 +3782,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 +4106,24 @@ esac
+@@ -4140,26 +4113,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -3800,7 +3814,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4173,7 +4137,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -4173,7 +4144,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3809,7 +3823,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 +4157,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
+@@ -4193,7 +4164,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
@@ -3818,7 +3832,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 +4172,10 @@ esac
+@@ -4208,12 +4179,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -3833,7 +3847,7 @@ Forwarded: not-needed
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4221,21 +4183,17 @@ fi
+@@ -4221,21 +4190,17 @@
fi
fi
@@ -3859,7 +3873,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -4250,48 +4208,23 @@ main ()
+@@ -4250,48 +4215,23 @@
return 0;
}
_ACEOF
@@ -3913,7 +3927,7 @@ Forwarded: not-needed
else
ac_cv_header_stdc=no
fi
-@@ -4301,18 +4234,14 @@ fi
+@@ -4301,18 +4241,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -3935,7 +3949,7 @@ Forwarded: not-needed
else
ac_cv_header_stdc=no
fi
-@@ -4322,407 +4251,93 @@ fi
+@@ -4322,14 +4258,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -3951,30 +3965,11 @@ Forwarded: not-needed
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ctype.h>
--#include <stdlib.h>
--#if ((' ' & 0x0FF) == 0x020)
--# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
--#else
--# define ISLOWER(c) \
-- (('a' <= (c) && (c) <= 'i') \
-- || ('j' <= (c) && (c) <= 'r') \
-- || ('s' <= (c) && (c) <= 'z'))
--# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
--#endif
--
--#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
--int
--main ()
--{
-- int i;
-- for (i = 0; i < 256; i++)
-- if (XOR (islower (i), ISLOWER (i))
-- || toupper (i) != TOUPPER (i))
-- return 2;
-- return 0;
--}
--_ACEOF
+ #include <stdlib.h>
+@@ -4356,373 +4288,63 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -4002,28 +3997,35 @@ Forwarded: not-needed
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++if ac_fn_cxx_try_run "$LINENO"; then :
+
-( exit $ac_status )
-ac_cv_header_stdc=no
--fi
++else
++ ac_cv_header_stdc=no
+ fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+
-
--fi
--fi
+ fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--$as_echo "$ac_cv_header_stdc" >&6; }
--if test $ac_cv_header_stdc = yes; then
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+ $as_echo "$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
--
--fi
--
--# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+ fi
+
+ # On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
@@ -4033,8 +4035,8 @@ Forwarded: not-needed
-
-
-
--for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-- inttypes.h stdint.h unistd.h
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -4087,7 +4089,12 @@ Forwarded: not-needed
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
@@ -4143,33 +4150,15 @@ Forwarded: not-needed
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-+#include <stdlib.h>
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) \
-+ (('a' <= (c) && (c) <= 'i') \
-+ || ('j' <= (c) && (c) <= 'r') \
-+ || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
-+
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
- int
- main ()
- {
+-int
+-main ()
+-{
-if (sizeof ((size_t)))
- return 0;
- ;
-+ int i;
-+ for (i = 0; i < 256; i++)
-+ if (XOR (islower (i), ISLOWER (i))
-+ || toupper (i) != TOUPPER (i))
-+ return 2;
- return 0;
- }
- _ACEOF
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -4195,52 +4184,29 @@ Forwarded: not-needed
-
- ac_cv_type_size_t=yes
-fi
-+if ac_fn_cxx_try_run "$LINENO"; then :
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-+ ac_cv_header_stdc=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-$as_echo "$ac_cv_type_size_t" >&6; }
-if test "x$ac_cv_type_size_t" = x""yes; then
- :
-else
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-+$as_echo "$ac_cv_header_stdc" >&6; }
-+if test $ac_cv_header_stdc = yes; then
-
+-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
--_ACEOF
-+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
- fi
-
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+ inttypes.h stdint.h unistd.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
+ _ACEOF
-+fi
+ fi
+done
@@ -4248,6 +4214,8 @@ Forwarded: not-needed
+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 :
+-
+-
-for ac_header in $ac_header_list
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -4397,7 +4365,7 @@ Forwarded: not-needed
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -4737,14 +4352,9 @@ done
+@@ -4737,14 +4359,9 @@
@@ -4414,7 +4382,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
ac_cv_cflags_strict_prototypes="no, unknown"
-@@ -4758,11 +4368,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -4758,11 +4375,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,%,,'`
@@ -4427,7 +4395,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -4773,43 +4379,16 @@ return 0;
+@@ -4773,43 +4386,16 @@
return 0;
}
_ACEOF
@@ -4473,7 +4441,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#include <signal.h>
int
-@@ -4822,34 +4401,13 @@ main ()
+@@ -4822,34 +4408,13 @@
return 0;
}
_ACEOF
@@ -4510,7 +4478,7 @@ Forwarded: not-needed
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
rm config.tmp
;;
-@@ -4863,7 +4421,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+@@ -4863,7 +4428,7 @@
fi
@@ -4519,7 +4487,7 @@ Forwarded: not-needed
$as_echo "$ac_cv_cflags_strict_prototypes" >&6; }
case ".$ac_cv_cflags_strict_prototypes" in
.ok|.ok,*) ;;
-@@ -4871,25 +4429,25 @@ case ".$ac_cv_cflags_strict_prototypes"
+@@ -4871,25 +4436,25 @@
;;
*)
if echo " $CFLAGS " | grep " $ac_cv_cflags_strict_prototypes " 2>&1 >/dev/null
@@ -4553,7 +4521,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
ac_cv_cflags_warn_all="no, unknown"
-@@ -4903,11 +4461,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -4903,11 +4468,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,%,,'`
@@ -4566,7 +4534,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -4918,32 +4472,9 @@ return 0;
+@@ -4918,32 +4479,9 @@
return 0;
}
_ACEOF
@@ -4600,7 +4568,7 @@ Forwarded: not-needed
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
CFLAGS="$ac_save_CFLAGS"
-@@ -4955,7 +4486,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+@@ -4955,7 +4493,7 @@
fi
@@ -4609,7 +4577,7 @@ Forwarded: not-needed
$as_echo "$ac_cv_cflags_warn_all" >&6; }
case ".$ac_cv_cflags_warn_all" in
.ok|.ok,*) ;;
-@@ -4963,16 +4494,16 @@ case ".$ac_cv_cflags_warn_all" in
+@@ -4963,16 +4501,16 @@
;;
*)
if echo " $wall_flags " | grep " $ac_cv_cflags_warn_all " 2>&1 >/dev/null
@@ -4632,7 +4600,7 @@ Forwarded: not-needed
wall_flags="$wall_flags $ac_cv_cflags_warn_all"
fi
;;
-@@ -4986,9 +4517,9 @@ CFLAGS="${CFLAGS} $wall_flags"
+@@ -4986,9 +4524,9 @@
flag=`echo "$wall_flags" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
@@ -4644,7 +4612,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
-@@ -5002,14 +4533,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+@@ -5002,14 +4540,10 @@
save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $wall_flags"
@@ -4662,7 +4630,7 @@ Forwarded: not-needed
int
main ()
{
-@@ -5019,36 +4546,15 @@ foo = 1;
+@@ -5019,36 +4553,15 @@
}
_ACEOF
@@ -4700,7 +4668,7 @@ Forwarded: not-needed
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5062,12 +4568,11 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+@@ -5062,12 +4575,11 @@
fi
@@ -4716,7 +4684,7 @@ Forwarded: not-needed
:
cxx_does_wall="yes"
-@@ -5079,7 +4584,6 @@ else
+@@ -5079,7 +4591,6 @@
fi
@@ -4724,7 +4692,7 @@ Forwarded: not-needed
if test "x$cxx_does_wall" = "xyes" ; then
CXXFLAGS="${CXXFLAGS} $wall_flags"
fi
-@@ -5090,9 +4594,9 @@ fi
+@@ -5090,9 +4601,9 @@
flag=`echo "$wall_flags" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
@@ -4736,7 +4704,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
-@@ -5106,14 +4610,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+@@ -5106,14 +4617,10 @@
save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $wall_flags"
@@ -4754,7 +4722,7 @@ Forwarded: not-needed
int
main ()
{
-@@ -5123,36 +4623,16 @@ foo = 1;
+@@ -5123,36 +4630,16 @@
}
_ACEOF
@@ -4793,7 +4761,7 @@ Forwarded: not-needed
CXXFLAGS="$save_CXXFLAGS"
-@@ -5165,12 +4645,11 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+@@ -5165,12 +4652,11 @@
fi
@@ -4809,7 +4777,7 @@ Forwarded: not-needed
:
cpp_does_wall="yes"
-@@ -5182,7 +4661,6 @@ else
+@@ -5182,7 +4668,6 @@
fi
@@ -4817,7 +4785,7 @@ Forwarded: not-needed
if test "x$cpp_does_wall" = "xyes" ; then
CPPFLAGS="${CPPFLAGS} $wall_flags"
fi
-@@ -5192,19 +4670,15 @@ fi
+@@ -5192,19 +4677,15 @@
CFLAG_VISIBILITY=
HAVE_VISIBILITY=0
if test -n "$GCC"; then
@@ -4840,7 +4808,7 @@ Forwarded: not-needed
/* end confdefs.h. */
extern __attribute__((__visibility__("hidden"))) int hiddenvar;
extern __attribute__((__visibility__("default"))) int exportedvar;
-@@ -5218,37 +4692,16 @@ main ()
+@@ -5218,37 +4699,16 @@
return 0;
}
_ACEOF
@@ -4881,7 +4849,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 +4720,9 @@ _ACEOF
+@@ -5267,9 +4727,9 @@
# Extract the first word of "wx-config", so it can be a program name with args.
set dummy wx-config; ac_word=$2
@@ -4893,7 +4861,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
case $WX_CONFIG in
-@@ -5283,14 +4736,14 @@ for as_dir in $as_dummy
+@@ -5283,14 +4743,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4911,7 +4879,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
test -z "$ac_cv_path_WX_CONFIG" && ac_cv_path_WX_CONFIG="no"
-@@ -5299,18 +4752,16 @@ esac
+@@ -5299,18 +4759,16 @@
fi
WX_CONFIG=$ac_cv_path_WX_CONFIG
if test -n "$WX_CONFIG"; then
@@ -4933,7 +4901,7 @@ Forwarded: not-needed
fi
if test "x$debug_preference" = "xyes"; then
-@@ -5322,7 +4773,7 @@ fi
+@@ -5322,7 +4780,7 @@
wxconfigargs="$static_preference $unicode_preference $wxconfigargs $wx_preference"
wx_version=`${WX_CONFIG} $wxconfigargs --version`
@@ -4942,7 +4910,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 +4782,12 @@ case "${wx_version}" in
+@@ -5331,19 +4789,12 @@
;;
*)
wx_list=`${WX_CONFIG} --list`
@@ -4964,7 +4932,7 @@ Forwarded: not-needed
esac
ac_configure_args="$ac_configure_args --with-wx-config=\"$WX_CONFIG\""
-@@ -5355,7 +4799,7 @@ CXXFLAGS="$CXXFLAGS `$WX_CONFIG $wxconfi
+@@ -5355,7 +4806,7 @@
@@ -4973,7 +4941,7 @@ Forwarded: not-needed
LOCAL_LIBS="$LOCAL_LIBS FileDialog.a"
CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/lib-src/FileDialog"
-@@ -5366,9 +4810,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
+@@ -5366,9 +4817,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
@@ -4985,7 +4953,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -5381,14 +4825,14 @@ for as_dir in $PATH
+@@ -5381,14 +4832,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5003,7 +4971,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
;;
-@@ -5396,10 +4840,10 @@ esac
+@@ -5396,10 +4847,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -5016,7 +4984,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -5409,9 +4853,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
+@@ -5409,9 +4860,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
@@ -5028,7 +4996,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -5424,14 +4868,14 @@ for as_dir in $PATH
+@@ -5424,14 +4875,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5046,7 +5014,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
;;
-@@ -5439,10 +4883,10 @@ esac
+@@ -5439,10 +4890,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -5059,7 +5027,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -5451,7 +4895,7 @@ fi
+@@ -5451,7 +4902,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5068,7 +5036,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 +4908,13 @@ fi
+@@ -5464,13 +4915,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -5085,28 +5053,13 @@ Forwarded: not-needed
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -5513,65 +4957,25 @@ fi
- esac
- ax_sub_configure_args="$ax_sub_configure_args '$ax_arg'" ;;
- esac
-- done
--
-- # Always prepend --prefix to ensure using the same prefix
-- # in subdir configurations.
-- ax_arg="--prefix=$prefix"
-- case $ax_arg in
-- *\'*) ax_arg=`echo "$ax_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-- esac
-- ax_sub_configure_args="'$ax_arg' $ax_sub_configure_args"
--
-- # Pass --silent
-- if test "$silent" = yes; then
-- ax_sub_configure_args="--silent $ax_sub_configure_args"
-- fi
--
-- ax_popdir=`pwd`
+@@ -5529,49 +4980,9 @@
+ fi
+
+ ax_popdir=`pwd`
- { $as_echo "$as_me:$LINENO: Configuring sources in \"${srcdir}/lib-src/lib-widget-extra\"" >&5
--$as_echo "$as_me: Configuring sources in \"${srcdir}/lib-src/lib-widget-extra\"" >&6;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring sources in \"${srcdir}/lib-src/lib-widget-extra\"" >&5
+ $as_echo "$as_me: Configuring sources in \"${srcdir}/lib-src/lib-widget-extra\"" >&6;}
- { as_dir=""${srcdir}/lib-src/lib-widget-extra""
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
@@ -5148,29 +5101,11 @@ Forwarded: not-needed
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
-+ done
-+
-+ # Always prepend --prefix to ensure using the same prefix
-+ # in subdir configurations.
-+ ax_arg="--prefix=$prefix"
-+ case $ax_arg in
-+ *\'*) ax_arg=`echo "$ax_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ esac
-+ ax_sub_configure_args="'$ax_arg' $ax_sub_configure_args"
-+
-+ # Pass --silent
-+ if test "$silent" = yes; then
-+ ax_sub_configure_args="--silent $ax_sub_configure_args"
-+ fi
-+
-+ ax_popdir=`pwd`
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring sources in \"${srcdir}/lib-src/lib-widget-extra\"" >&5
-+$as_echo "$as_me: Configuring sources in \"${srcdir}/lib-src/lib-widget-extra\"" >&6;}
+ as_dir=""${srcdir}/lib-src/lib-widget-extra""; as_fn_mkdir_p
ac_builddir=.
case ""${srcdir}/lib-src/lib-widget-extra"" in
-@@ -5617,7 +5021,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+@@ -5617,7 +5028,7 @@
# This should be Cygnus configure.
ax_sub_configure=$ac_aux_dir/configure
else
@@ -5179,7 +5114,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 +5035,7 @@ $as_echo "$as_me: WARNING: no configurat
+@@ -5631,7 +5042,7 @@
ax_sub_cache_file=$ac_top_build_prefix$cache_file ;;
esac
@@ -5188,7 +5123,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 +5043,25 @@ $as_echo "$as_me: running $SHELL $ax_sub
+@@ -5639,25 +5050,25 @@
fi
cd "$ax_popdir"
@@ -5219,7 +5154,7 @@ Forwarded: not-needed
pkg_cv_WIDGETEXTRA_CFLAGS=`$PKG_CONFIG --cflags "libwidgetextra" 2>/dev/null`
else
pkg_failed=yes
-@@ -5669,11 +5073,11 @@ if test -n "$WIDGETEXTRA_LIBS"; then
+@@ -5669,11 +5080,11 @@
pkg_cv_WIDGETEXTRA_LIBS="$WIDGETEXTRA_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -5234,7 +5169,7 @@ Forwarded: not-needed
pkg_cv_WIDGETEXTRA_LIBS=`$PKG_CONFIG --libs "libwidgetextra" 2>/dev/null`
else
pkg_failed=yes
-@@ -5699,7 +5103,7 @@ fi
+@@ -5699,7 +5110,7 @@
# Put the nasty error message in config.log where it belongs
echo "$WIDGETEXTRA_PKG_ERRORS" >&5
@@ -5243,7 +5178,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
widgetextra_available="no"
elif test $pkg_failed = untried; then
-@@ -5707,15 +5111,13 @@ elif test $pkg_failed = untried; then
+@@ -5707,15 +5118,13 @@
else
WIDGETEXTRA_CFLAGS=$pkg_cv_WIDGETEXTRA_CFLAGS
WIDGETEXTRA_LIBS=$pkg_cv_WIDGETEXTRA_LIBS
@@ -5261,7 +5196,7 @@ Forwarded: not-needed
fi
BUILD_LDFLAGS="$BUILD_LDFLAGS $WIDGETEXTRA_LIBS"
-@@ -5724,14 +5126,14 @@ LIBSRC_BUILD="$LIBSRC_BUILD widgetextra"
+@@ -5724,14 +5133,14 @@
LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG PORTSMF"
@@ -5278,7 +5213,7 @@ Forwarded: not-needed
withval=$with_libsndfile; LIBSNDFILE_ARGUMENT=$withval
else
LIBSNDFILE_ARGUMENT="unspecified"
-@@ -5741,18 +5143,18 @@ fi
+@@ -5741,18 +5150,18 @@
pkg_failed=no
@@ -5301,7 +5236,7 @@ Forwarded: not-needed
pkg_cv_SNDFILE_CFLAGS=`$PKG_CONFIG --cflags "sndfile >= 1.0.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -5764,11 +5166,11 @@ if test -n "$SNDFILE_LIBS"; then
+@@ -5764,11 +5173,11 @@
pkg_cv_SNDFILE_LIBS="$SNDFILE_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -5316,7 +5251,7 @@ Forwarded: not-needed
pkg_cv_SNDFILE_LIBS=`$PKG_CONFIG --libs "sndfile >= 1.0.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -5794,7 +5196,7 @@ fi
+@@ -5794,7 +5203,7 @@
# Put the nasty error message in config.log where it belongs
echo "$SNDFILE_PKG_ERRORS" >&5
@@ -5325,7 +5260,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
sndfile_available_system="no"
elif test $pkg_failed = untried; then
-@@ -5802,7 +5204,7 @@ elif test $pkg_failed = untried; then
+@@ -5802,7 +5211,7 @@
else
SNDFILE_CFLAGS=$pkg_cv_SNDFILE_CFLAGS
SNDFILE_LIBS=$pkg_cv_SNDFILE_LIBS
@@ -5334,7 +5269,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
sndfile_available_system="yes"
fi
-@@ -5811,38 +5213,33 @@ fi
+@@ -5811,38 +5220,33 @@
LIBSNDFILE_SYSTEM_AVAILABLE="yes"
LIBSNDFILE_SYSTEM_LIBS=$SNDFILE_LIBS
LIBSNDFILE_SYSTEM_CXXFLAGS=$SNDFILE_CFLAGS
@@ -5381,7 +5316,7 @@ Forwarded: not-needed
libsndfile_found="yes"
else
libsndfile_found="no"
-@@ -5854,14 +5251,14 @@ fi
+@@ -5854,14 +5258,14 @@
LIBSNDFILE_LOCAL_LIBS="libsndfile.a"
LIBSNDFILE_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libsndfile/src'
LIBSNDFILE_LOCAL_CONFIG_SUBDIRS="lib-src/libsndfile"
@@ -5398,7 +5333,7 @@ Forwarded: not-needed
$as_echo "$as_me: libsndfile libraries are NOT available in this source tree" >&6;}
fi
-@@ -5870,7 +5267,7 @@ $as_echo "$as_me: libsndfile libraries a
+@@ -5870,7 +5274,7 @@
# Check whether --with-expat was given.
@@ -5407,7 +5342,7 @@ Forwarded: not-needed
withval=$with_expat; LIBEXPAT_ARGUMENT=$withval
else
LIBEXPAT_ARGUMENT="unspecified"
-@@ -5878,18 +5275,14 @@ fi
+@@ -5878,18 +5282,14 @@
@@ -5429,7 +5364,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -5907,43 +5300,18 @@ return XML_ParserCreate ();
+@@ -5907,43 +5307,18 @@
return 0;
}
_ACEOF
@@ -5479,7 +5414,7 @@ Forwarded: not-needed
libexpat_found="yes"
else
libexpat_found="no"
-@@ -5952,134 +5320,8 @@ fi
+@@ -5952,134 +5327,8 @@
expat_h_found="no"
@@ -5616,7 +5551,7 @@ Forwarded: not-needed
expat_h_found="yes"
else
expat_h_found="no"
-@@ -6091,38 +5333,33 @@ fi
+@@ -6091,38 +5340,33 @@
LIBEXPAT_SYSTEM_AVAILABLE="yes"
LIBEXPAT_SYSTEM_LIBS="-lexpat"
LIBEXPAT_SYSTEM_CPPSYMBOLS="USE_SYSTEM_EXPAT"
@@ -5663,7 +5598,7 @@ Forwarded: not-needed
xmlparse_h_found="yes"
else
xmlparse_h_found="no"
-@@ -6135,11 +5372,11 @@ fi
+@@ -6135,11 +5379,11 @@
LIBEXPAT_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/expat'
LIBEXPAT_LOCAL_CPPSYMBOLS="USE_LOCAL_EXPAT"
@@ -5677,7 +5612,7 @@ Forwarded: not-needed
$as_echo "$as_me: Expat libraries are NOT available in the local tree" >&6;}
fi
-@@ -6147,7 +5384,7 @@ $as_echo "$as_me: Expat libraries are NO
+@@ -6147,7 +5391,7 @@
# Check whether --with-libsamplerate was given.
@@ -5686,7 +5621,7 @@ Forwarded: not-needed
withval=$with_libsamplerate; LIBSAMPLERATE_ARGUMENT=$withval
else
LIBSAMPLERATE_ARGUMENT="unspecified"
-@@ -6156,27 +5393,25 @@ fi
+@@ -6156,27 +5400,25 @@
if false ; then
@@ -5719,7 +5654,7 @@ Forwarded: not-needed
pkg_cv_SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate >= 0.1.2" 2>/dev/null`
else
pkg_failed=yes
-@@ -6188,11 +5423,11 @@ if test -n "$SAMPLERATE_LIBS"; then
+@@ -6188,11 +5430,11 @@
pkg_cv_SAMPLERATE_LIBS="$SAMPLERATE_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -5734,7 +5669,7 @@ Forwarded: not-needed
pkg_cv_SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate >= 0.1.2" 2>/dev/null`
else
pkg_failed=yes
-@@ -6218,7 +5453,7 @@ fi
+@@ -6218,7 +5460,7 @@
# Put the nasty error message in config.log where it belongs
echo "$SAMPLERATE_PKG_ERRORS" >&5
@@ -5743,7 +5678,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
samplerate_available_system="no"
elif test $pkg_failed = untried; then
-@@ -6226,7 +5461,7 @@ elif test $pkg_failed = untried; then
+@@ -6226,7 +5468,7 @@
else
SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS
SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS
@@ -5752,7 +5687,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
samplerate_available_system="yes"
fi
-@@ -6236,38 +5471,33 @@ fi
+@@ -6236,38 +5478,33 @@
LIBSAMPLERATE_SYSTEM_LIBS=$SAMPLERATE_LIBS
LIBSAMPLERATE_SYSTEM_CXXFLAGS=$SAMPLERATE_CFLAGS
LIBSAMPLERATE_SYSTEM_CPPSYMBOLS="USE_LIBSAMPLERATE"
@@ -5799,7 +5734,7 @@ Forwarded: not-needed
samplerate_h_found="yes"
else
samplerate_h_found="no"
-@@ -6283,11 +5513,11 @@ fi
+@@ -6283,11 +5520,11 @@
if test ! -f lib-src/libsamplerate/Makefile ; then
LIBSAMPLERATE_LOCAL_CONFIG_SUBDIRS="lib-src/libsamplerate"
fi
@@ -5813,7 +5748,7 @@ Forwarded: not-needed
$as_echo "$as_me: libsamplerate libraries are NOT available in the local tree" >&6;}
fi
-@@ -6295,7 +5525,7 @@ $as_echo "$as_me: libsamplerate librarie
+@@ -6295,7 +5532,7 @@
# Check whether --with-libresample was given.
@@ -5822,7 +5757,7 @@ Forwarded: not-needed
withval=$with_libresample; LIBRESAMPLE_ARGUMENT=$withval
else
LIBRESAMPLE_ARGUMENT="unspecified"
-@@ -6304,9 +5534,7 @@ fi
+@@ -6304,9 +5541,7 @@
if false ; then
@@ -5833,7 +5768,7 @@ Forwarded: not-needed
fi
-@@ -6316,28 +5544,23 @@ _ACEOF
+@@ -6316,28 +5551,23 @@
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libresample/include/libresample.h" | $as_tr_sh`
@@ -5868,7 +5803,7 @@ Forwarded: not-needed
resample_h_found="yes"
else
resample_h_found="no"
-@@ -6353,11 +5576,11 @@ fi
+@@ -6353,11 +5583,11 @@
if test ! -f lib-src/libresample/Makefile ; then
LIBRESAMPLE_LOCAL_CONFIG_SUBDIRS="lib-src/libresample"
fi
@@ -5882,7 +5817,7 @@ Forwarded: not-needed
$as_echo "$as_me: libresample libraries are NOT available in the local tree" >&6;}
fi
-@@ -6365,15 +5588,13 @@ $as_echo "$as_me: libresample libraries
+@@ -6365,15 +5595,13 @@
if false ; then
@@ -5900,7 +5835,7 @@ Forwarded: not-needed
withval=$with_libvorbis; LIBVORBIS_ARGUMENT=$withval
else
LIBVORBIS_ARGUMENT="unspecified"
-@@ -6381,18 +5602,14 @@ fi
+@@ -6381,18 +5609,14 @@
@@ -5922,7 +5857,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -6410,177 +5627,26 @@ return vorbis_bitrate_addblock ();
+@@ -6410,177 +5634,26 @@
return 0;
}
_ACEOF
@@ -6108,7 +6043,7 @@ Forwarded: not-needed
header_found="yes"
else
header_found="no"
-@@ -6592,38 +5658,33 @@ fi
+@@ -6592,38 +5665,33 @@
LIBVORBIS_SYSTEM_AVAILABLE="yes"
LIBVORBIS_SYSTEM_LIBS="-lvorbisenc -lvorbisfile -lvorbis -logg"
LIBVORBIS_SYSTEM_CPPSYMBOLS="USE_LIBVORBIS"
@@ -6155,7 +6090,7 @@ Forwarded: not-needed
vorbisenc_h_available="yes"
else
vorbisenc_h_available="no"
-@@ -6631,28 +5692,23 @@ fi
+@@ -6631,28 +5699,23 @@
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libogg/include/ogg/ogg.h" | $as_tr_sh`
@@ -6190,7 +6125,7 @@ Forwarded: not-needed
ogg_h_available="yes"
else
ogg_h_available="no"
-@@ -6670,10 +5726,10 @@ fi
+@@ -6670,10 +5733,10 @@
LIBVORBIS_LOCAL_CPPSYMBOLS="USE_LIBVORBIS"
LIBVORBIS_LOCAL_CONFIG_SUBDIRS="lib-src/libogg lib-src/libvorbis"
@@ -6203,7 +6138,7 @@ Forwarded: not-needed
$as_echo "$as_me: Vorbis libraries are NOT available in this source tree" >&6;}
fi
-@@ -6681,15 +5737,13 @@ $as_echo "$as_me: Vorbis libraries are N
+@@ -6681,15 +5744,13 @@
if false ; then
@@ -6221,7 +6156,7 @@ Forwarded: not-needed
withval=$with_libmad; LIBMAD_ARGUMENT=$withval
else
LIBMAD_ARGUMENT="unspecified"
-@@ -6699,18 +5753,18 @@ fi
+@@ -6699,18 +5760,18 @@
pkg_failed=no
@@ -6244,7 +6179,7 @@ Forwarded: not-needed
pkg_cv_LIBMAD_CFLAGS=`$PKG_CONFIG --cflags "mad >= 0.14.2b" 2>/dev/null`
else
pkg_failed=yes
-@@ -6722,11 +5776,11 @@ if test -n "$LIBMAD_LIBS"; then
+@@ -6722,11 +5783,11 @@
pkg_cv_LIBMAD_LIBS="$LIBMAD_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -6259,7 +6194,7 @@ Forwarded: not-needed
pkg_cv_LIBMAD_LIBS=`$PKG_CONFIG --libs "mad >= 0.14.2b" 2>/dev/null`
else
pkg_failed=yes
-@@ -6752,7 +5806,7 @@ fi
+@@ -6752,7 +5813,7 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBMAD_PKG_ERRORS" >&5
@@ -6268,7 +6203,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
libmad_available_system="no"
elif test $pkg_failed = untried; then
-@@ -6760,24 +5814,20 @@ elif test $pkg_failed = untried; then
+@@ -6760,24 +5821,20 @@
else
LIBMAD_CFLAGS=$pkg_cv_LIBMAD_CFLAGS
LIBMAD_LIBS=$pkg_cv_LIBMAD_LIBS
@@ -6297,7 +6232,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -6795,43 +5845,18 @@ return mad_decoder_init ();
+@@ -6795,43 +5852,18 @@
return 0;
}
_ACEOF
@@ -6347,7 +6282,7 @@ Forwarded: not-needed
libmad_found="yes"
else
libmad_found="no"
-@@ -6839,7 +5864,7 @@ fi
+@@ -6839,7 +5871,7 @@
if test "x$libmad_available_system" = "xyes" && test "x$libmad_found" = "xno" ; then
@@ -6356,7 +6291,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 +5873,32 @@ $as_echo "$as_me: WARNING: system instal
+@@ -6848,37 +5880,32 @@
LIBMAD_SYSTEM_LIBS="$LIBMAD_LIBS"
LIBMAD_SYSTEM_CXXFLAGS="$LIBMAD_CFLAGS"
LIBMAD_SYSTEM_CPPSYMBOLS="USE_LIBMAD"
@@ -6402,7 +6337,7 @@ Forwarded: not-needed
frame_h_found="yes"
else
frame_h_found="no"
-@@ -6891,11 +5911,11 @@ fi
+@@ -6891,11 +5918,11 @@
LIBMAD_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libmad'
LIBMAD_LOCAL_CPPSYMBOLS="USE_LIBMAD"
LIBMAD_LOCAL_CONFIG_SUBDIRS="lib-src/libmad"
@@ -6416,7 +6351,7 @@ Forwarded: not-needed
$as_echo "$as_me: libmad libraries are NOT available in the local tree" >&6;}
fi
-@@ -6903,15 +5923,13 @@ $as_echo "$as_me: libmad libraries are N
+@@ -6903,15 +5930,13 @@
if false ; then
@@ -6434,7 +6369,7 @@ Forwarded: not-needed
withval=$with_libflac; LIBFLAC_ARGUMENT=$withval
else
LIBFLAC_ARGUMENT="unspecified"
-@@ -6919,18 +5937,14 @@ fi
+@@ -6919,18 +5944,14 @@
@@ -6456,15 +6391,10 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -6943,182 +5957,31 @@ char FLAC__stream_decoder_new ();
- int
- main ()
- {
--return FLAC__stream_decoder_new ();
-- ;
-- return 0;
--}
--_ACEOF
+@@ -6948,177 +5969,26 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -6486,28 +6416,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; }
@@ -6628,40 +6564,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
-+return FLAC__stream_decoder_new ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_link "$LINENO"; then :
-+ ac_cv_lib_FLAC_FLAC__stream_decoder_new=yes
- else
+-else
- ac_cv_header_FLAC_format_h=$ac_header_preproc
-+ ac_cv_lib_FLAC_FLAC__stream_decoder_new=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; }
-
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
+-fi
-if test "x$ac_cv_header_FLAC_format_h" = x""yes; then
-+{ $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
-+
-+
+ 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 +5995,33 @@ fi
+@@ -7132,38 +6002,33 @@
LIBFLAC_SYSTEM_CPPSYMBOLS="USE_LIBFLAC"
# this file shouldn't be built at if no libflac is available
LIBFLAC_SYSTEM_OPTOBJS="ondemand/ODDecodeFlacTask.o"
@@ -6708,7 +6624,7 @@ Forwarded: not-needed
flac_h_available="yes"
else
flac_h_available="no"
-@@ -7171,28 +6029,23 @@ fi
+@@ -7171,28 +6036,23 @@
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" | $as_tr_sh`
@@ -6743,7 +6659,7 @@ Forwarded: not-needed
flacpp_h_available="yes"
else
flacpp_h_available="no"
-@@ -7212,10 +6065,10 @@ fi
+@@ -7212,10 +6072,10 @@
LIBFLAC_LOCAL_OPTOBJS="ondemand/ODDecodeFlacTask.o"
LIBFLAC_LOCAL_CONFIG_SUBDIRS="lib-src/libflac"
@@ -6756,49 +6672,56 @@ Forwarded: not-needed
$as_echo "$as_me: FLAC libraries are NOT available in this source tree" >&6;}
fi
-@@ -7223,7 +6076,7 @@ $as_echo "$as_me: FLAC libraries are NOT
+@@ -7223,222 +6083,65 @@
# Check whether --with-libid3tag was given.
-if test "${with_libid3tag+set}" = set; then
+if test "${with_libid3tag+set}" = set; then :
withval=$with_libid3tag; LIBID3TAG_ARGUMENT=$withval
- else
- LIBID3TAG_ARGUMENT="unspecified"
-@@ -7232,25 +6085,19 @@ fi
-
- if false ; then
-
+-else
+- LIBID3TAG_ARGUMENT="unspecified"
+-fi
+-
+-
+- if false ; then
+-
-cat >>confdefs.h <<\_ACEOF
-#define USE_LIBID3TAG 1
-_ACEOF
-+$as_echo "#define USE_LIBID3TAG 1" >>confdefs.h
-
- fi
-
-
+-
+- fi
+-
+-
- { $as_echo "$as_me:$LINENO: checking for id3_file_open in -lid3tag" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for id3_file_open in -lid3tag" >&5
- $as_echo_n "checking for id3_file_open in -lid3tag... " >&6; }
+-$as_echo_n "checking for id3_file_open in -lid3tag... " >&6; }
-if test "${ac_cv_lib_id3tag_id3_file_open+set}" = set; then
-+if test "${ac_cv_lib_id3tag_id3_file_open+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lid3tag -lz $LIBS"
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lid3tag -lz $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.
-@@ -7268,177 +6115,26 @@ return id3_file_open ();
- 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 id3_file_open ();
+-int
+-main ()
+-{
+-return id3_file_open ();
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -6820,34 +6743,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_id3tag_id3_file_open=yes
- else
+- ac_cv_lib_id3tag_id3_file_open=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_id3tag_id3_file_open=no
-+ ac_cv_lib_id3tag_id3_file_open=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_id3tag_id3_file_open" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_id3tag_id3_file_open" >&5
- $as_echo "$ac_cv_lib_id3tag_id3_file_open" >&6; }
+-$as_echo "$ac_cv_lib_id3tag_id3_file_open" >&6; }
-if test "x$ac_cv_lib_id3tag_id3_file_open" = x""yes; then
-+if test "x$ac_cv_lib_id3tag_id3_file_open" = x""yes; then :
- libid3tag_found="yes"
- else
- libid3tag_found="no"
- fi
-
-
+- libid3tag_found="yes"
+-else
+- libid3tag_found="no"
+-fi
+-
+-
- if test "${ac_cv_header_id3tag_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for id3tag.h" >&5
-$as_echo_n "checking for id3tag.h... " >&6; }
@@ -6933,12 +6850,14 @@ Forwarded: not-needed
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
--fi
--
++else
++ LIBID3TAG_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: )
@@ -6961,27 +6880,72 @@ Forwarded: not-needed
-$as_echo "$as_me: WARNING: id3tag.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: id3tag.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: id3tag.h: in the future, the compiler will take precedence" >&2;}
--
++ if false ; then
+
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for id3tag.h" >&5
-$as_echo_n "checking for id3tag.h... " >&6; }
-if test "${ac_cv_header_id3tag_h+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++$as_echo "#define USE_LIBID3TAG 1" >>confdefs.h
++
++ fi
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for id3_file_open in -lid3tag" >&5
++$as_echo_n "checking for id3_file_open in -lid3tag... " >&6; }
++if test "${ac_cv_lib_id3tag_id3_file_open+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- ac_cv_header_id3tag_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_id3tag_h" >&5
-$as_echo "$ac_cv_header_id3tag_h" >&6; }
--
--fi
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lid3tag -lz $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 id3_file_open ();
++int
++main ()
++{
++return id3_file_open ();
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_link "$LINENO"; then :
++ ac_cv_lib_id3tag_id3_file_open=yes
++else
++ ac_cv_lib_id3tag_id3_file_open=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_id3tag_id3_file_open" >&5
++$as_echo "$ac_cv_lib_id3tag_id3_file_open" >&6; }
++if test "x$ac_cv_lib_id3tag_id3_file_open" = x""yes; then :
++ libid3tag_found="yes"
++else
++ libid3tag_found="no"
+ fi
-if test "x$ac_cv_header_id3tag_h" = x""yes; then
++
++
+ ac_fn_cxx_check_header_mongrel "$LINENO" "id3tag.h" "ac_cv_header_id3tag_h" "$ac_includes_default"
+if test "x$ac_cv_header_id3tag_h" = x""yes; then :
id3tag_h_found="yes"
else
id3tag_h_found="no"
-@@ -7450,38 +6146,33 @@ fi
+@@ -7450,38 +6153,33 @@
LIBID3TAG_SYSTEM_AVAILABLE="yes"
LIBID3TAG_SYSTEM_LIBS=-lid3tag
LIBID3TAG_SYSTEM_CPPSYMBOLS="USE_LIBID3TAG"
@@ -7028,7 +6992,7 @@ Forwarded: not-needed
frame_h_found="yes"
else
frame_h_found="no"
-@@ -7495,18 +6186,18 @@ fi
+@@ -7495,18 +6193,18 @@
LIBID3TAG_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libid3tag'
LIBID3TAG_LOCAL_CPPSYMBOLS="USE_LIBID3TAG"
LIBID3TAG_LOCAL_CONFIG_SUBDIRS="lib-src/libid3tag"
@@ -7050,7 +7014,7 @@ Forwarded: not-needed
withval=$with_sbsms; LIBSBSMS_ARGUMENT=$withval
else
LIBSBSMS_ARGUMENT="unspecified"
-@@ -7515,27 +6206,25 @@ fi
+@@ -7515,27 +6213,25 @@
if false ; then
@@ -7083,7 +7047,7 @@ Forwarded: not-needed
pkg_cv_SBSMS_CFLAGS=`$PKG_CONFIG --cflags "sbsms >= 1.6.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -7547,11 +6236,11 @@ if test -n "$SBSMS_LIBS"; then
+@@ -7547,11 +6243,11 @@
pkg_cv_SBSMS_LIBS="$SBSMS_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -7098,7 +7062,7 @@ Forwarded: not-needed
pkg_cv_SBSMS_LIBS=`$PKG_CONFIG --libs "sbsms >= 1.6.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -7577,7 +6266,7 @@ fi
+@@ -7577,7 +6273,7 @@
# Put the nasty error message in config.log where it belongs
echo "$SBSMS_PKG_ERRORS" >&5
@@ -7107,7 +7071,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
sbsms_available_system="no"
elif test $pkg_failed = untried; then
-@@ -7585,7 +6274,7 @@ elif test $pkg_failed = untried; then
+@@ -7585,7 +6281,7 @@
else
SBSMS_CFLAGS=$pkg_cv_SBSMS_CFLAGS
SBSMS_LIBS=$pkg_cv_SBSMS_LIBS
@@ -7116,7 +7080,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
sbsms_available_system="yes"
fi
-@@ -7596,38 +6285,33 @@ fi
+@@ -7596,38 +6292,33 @@
LIBSBSMS_SYSTEM_LIBS=$SBSMS_LIBS
LIBSBSMS_SYSTEM_CXXFLAGS=$SBSMS_CFLAGS
LIBSBSMS_SYSTEM_CPPSYMBOLS="USE_SBSMS"
@@ -7163,7 +7127,7 @@ Forwarded: not-needed
sbsms_h_found="yes"
else
sbsms_h_found="no"
-@@ -7643,11 +6327,11 @@ fi
+@@ -7643,11 +6334,11 @@
LIBSBSMS_LOCAL_CONFIG_SUBDIRS="lib-src/sbsms"
ac_configure_args="$ac_configure_args --disable-programs"
@@ -7177,7 +7141,7 @@ Forwarded: not-needed
$as_echo "$as_me: libsbsms libraries are NOT available in the local tree" >&6;}
fi
-@@ -7655,7 +6339,7 @@ $as_echo "$as_me: libsbsms libraries are
+@@ -7655,7 +6346,7 @@
# Check whether --with-soundtouch was given.
@@ -7186,7 +7150,7 @@ Forwarded: not-needed
withval=$with_soundtouch; LIBSOUNDTOUCH_ARGUMENT=$withval
else
LIBSOUNDTOUCH_ARGUMENT="unspecified"
-@@ -7664,27 +6348,25 @@ fi
+@@ -7664,27 +6355,25 @@
if false ; then
@@ -7219,7 +7183,7 @@ Forwarded: not-needed
pkg_cv_SOUNDTOUCH_CFLAGS=`$PKG_CONFIG --cflags "soundtouch-1.4 >= 1.3.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -7696,11 +6378,11 @@ if test -n "$SOUNDTOUCH_LIBS"; then
+@@ -7696,11 +6385,11 @@
pkg_cv_SOUNDTOUCH_LIBS="$SOUNDTOUCH_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -7234,7 +7198,7 @@ Forwarded: not-needed
pkg_cv_SOUNDTOUCH_LIBS=`$PKG_CONFIG --libs "soundtouch-1.4 >= 1.3.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -7726,7 +6408,7 @@ fi
+@@ -7726,7 +6415,7 @@
# Put the nasty error message in config.log where it belongs
echo "$SOUNDTOUCH_PKG_ERRORS" >&5
@@ -7243,7 +7207,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
soundtouch_available_system="no"
elif test $pkg_failed = untried; then
-@@ -7734,25 +6416,25 @@ elif test $pkg_failed = untried; then
+@@ -7734,25 +6423,25 @@
else
SOUNDTOUCH_CFLAGS=$pkg_cv_SOUNDTOUCH_CFLAGS
SOUNDTOUCH_LIBS=$pkg_cv_SOUNDTOUCH_LIBS
@@ -7274,7 +7238,7 @@ Forwarded: not-needed
pkg_cv_SOUNDTOUCH_CFLAGS=`$PKG_CONFIG --cflags "soundtouch-1.0 >= 1.3.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -7764,11 +6446,11 @@ if test -n "$SOUNDTOUCH_LIBS"; then
+@@ -7764,11 +6453,11 @@
pkg_cv_SOUNDTOUCH_LIBS="$SOUNDTOUCH_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -7289,7 +7253,7 @@ Forwarded: not-needed
pkg_cv_SOUNDTOUCH_LIBS=`$PKG_CONFIG --libs "soundtouch-1.0 >= 1.3.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -7794,7 +6476,7 @@ fi
+@@ -7794,7 +6483,7 @@
# Put the nasty error message in config.log where it belongs
echo "$SOUNDTOUCH_PKG_ERRORS" >&5
@@ -7298,7 +7262,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
soundtouch_available_system="no"
elif test $pkg_failed = untried; then
-@@ -7802,7 +6484,7 @@ elif test $pkg_failed = untried; then
+@@ -7802,7 +6491,7 @@
else
SOUNDTOUCH_CFLAGS=$pkg_cv_SOUNDTOUCH_CFLAGS
SOUNDTOUCH_LIBS=$pkg_cv_SOUNDTOUCH_LIBS
@@ -7307,7 +7271,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
soundtouch_available_system="yes"
fi
-@@ -7813,38 +6495,33 @@ fi
+@@ -7813,38 +6502,33 @@
LIBSOUNDTOUCH_SYSTEM_LIBS=$SOUNDTOUCH_LIBS
LIBSOUNDTOUCH_SYSTEM_CXXFLAGS=$SOUNDTOUCH_CFLAGS
LIBSOUNDTOUCH_SYSTEM_CPPSYMBOLS="USE_SOUNDTOUCH"
@@ -7354,7 +7318,7 @@ Forwarded: not-needed
soundtouch_h_found="yes"
else
soundtouch_h_found="no"
-@@ -7857,18 +6534,18 @@ fi
+@@ -7857,18 +6541,18 @@
LIBSOUNDTOUCH_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/soundtouch/include'
LIBSOUNDTOUCH_LOCAL_CPPSYMBOLS="USE_SOUNDTOUCH"
LIBSOUNDTOUCH_LOCAL_CONFIG_SUBDIRS="lib-src/soundtouch"
@@ -7376,7 +7340,7 @@ Forwarded: not-needed
enableval=$enable_nyquist; LIBNYQUIST_ARGUMENT=$enableval
else
LIBNYQUIST_ARGUMENT="unspecified"
-@@ -7877,9 +6554,7 @@ fi
+@@ -7877,9 +6561,7 @@
if false ; then
@@ -7387,7 +7351,7 @@ Forwarded: not-needed
fi
-@@ -7887,28 +6562,23 @@ _ACEOF
+@@ -7887,28 +6569,23 @@
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libnyquist/nyx.h" | $as_tr_sh`
@@ -7422,7 +7386,7 @@ Forwarded: not-needed
nyx_h_found="yes"
else
nyx_h_found="no"
-@@ -7925,18 +6595,18 @@ fi
+@@ -7925,18 +6602,18 @@
LIBNYQUIST_LOCAL_CONFIG_SUBDIRS="lib-src/libnyquist"
@@ -7444,7 +7408,7 @@ Forwarded: not-needed
withval=$with_libvamp; LIBVAMP_ARGUMENT=$withval
else
LIBVAMP_ARGUMENT="unspecified"
-@@ -7945,27 +6615,25 @@ fi
+@@ -7945,27 +6622,25 @@
if false ; then
@@ -7477,7 +7441,7 @@ Forwarded: not-needed
pkg_cv_VAMP_CFLAGS=`$PKG_CONFIG --cflags "vamp-hostsdk >= 2.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -7977,11 +6645,11 @@ if test -n "$VAMP_LIBS"; then
+@@ -7977,11 +6652,11 @@
pkg_cv_VAMP_LIBS="$VAMP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -7492,7 +7456,7 @@ Forwarded: not-needed
pkg_cv_VAMP_LIBS=`$PKG_CONFIG --libs "vamp-hostsdk >= 2.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -8007,7 +6675,7 @@ fi
+@@ -8007,7 +6682,7 @@
# Put the nasty error message in config.log where it belongs
echo "$VAMP_PKG_ERRORS" >&5
@@ -7501,7 +7465,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
vamp_available_system="no"
elif test $pkg_failed = untried; then
-@@ -8015,7 +6683,7 @@ elif test $pkg_failed = untried; then
+@@ -8015,7 +6690,7 @@
else
VAMP_CFLAGS=$pkg_cv_VAMP_CFLAGS
VAMP_LIBS=$pkg_cv_VAMP_LIBS
@@ -7510,7 +7474,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
vamp_available_system="yes"
fi
-@@ -8026,38 +6694,33 @@ fi
+@@ -8026,38 +6701,33 @@
LIBVAMP_SYSTEM_CXXFLAGS=$VAMP_CFLAGS
LIBVAMP_SYSTEM_OPTOBJS="effects/vamp/VampEffect.o effects/vamp/LoadVamp.o"
LIBVAMP_SYSTEM_CPPSYMBOLS="USE_VAMP"
@@ -7557,7 +7521,7 @@ Forwarded: not-needed
vamp_h_found="yes"
else
vamp_h_found="no"
-@@ -8074,18 +6737,18 @@ fi
+@@ -8074,18 +6744,18 @@
LIBVAMP_LOCAL_CONFIG_SUBDIRS="lib-src/libvamp"
ac_configure_args="$ac_configure_args --disable-programs"
@@ -7579,7 +7543,7 @@ Forwarded: not-needed
withval=$with_libtwolame; LIBTWOLAME_ARGUMENT=$withval
else
LIBTWOLAME_ARGUMENT="unspecified"
-@@ -8094,27 +6757,25 @@ fi
+@@ -8094,27 +6764,25 @@
if false ; then
@@ -7612,7 +7576,7 @@ Forwarded: not-needed
pkg_cv_LIBTWOLAME_CFLAGS=`$PKG_CONFIG --cflags "twolame >= 0.3.9" 2>/dev/null`
else
pkg_failed=yes
-@@ -8126,11 +6787,11 @@ if test -n "$LIBTWOLAME_LIBS"; then
+@@ -8126,11 +6794,11 @@
pkg_cv_LIBTWOLAME_LIBS="$LIBTWOLAME_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -7627,7 +7591,7 @@ Forwarded: not-needed
pkg_cv_LIBTWOLAME_LIBS=`$PKG_CONFIG --libs "twolame >= 0.3.9" 2>/dev/null`
else
pkg_failed=yes
-@@ -8156,7 +6817,7 @@ fi
+@@ -8156,7 +6824,7 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBTWOLAME_PKG_ERRORS" >&5
@@ -7636,7 +7600,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
twolame_available_system="no"
elif test $pkg_failed = untried; then
-@@ -8164,7 +6825,7 @@ elif test $pkg_failed = untried; then
+@@ -8164,7 +6832,7 @@
else
LIBTWOLAME_CFLAGS=$pkg_cv_LIBTWOLAME_CFLAGS
LIBTWOLAME_LIBS=$pkg_cv_LIBTWOLAME_LIBS
@@ -7645,7 +7609,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
twolame_available_system="yes"
fi
-@@ -8174,38 +6835,33 @@ fi
+@@ -8174,38 +6842,33 @@
LIBTWOLAME_SYSTEM_LIBS=$LIBTWOLAME_LIBS
LIBTWOLAME_SYSTEM_CXXFLAGS=$LIBTWOLAME_CFLAGS
LIBTWOLAME_SYSTEM_CPPSYMBOLS="USE_LIBTWOLAME"
@@ -7692,7 +7656,7 @@ Forwarded: not-needed
twolame_h_found="yes"
else
twolame_h_found="no"
-@@ -8221,18 +6877,18 @@ fi
+@@ -8221,18 +6884,18 @@
LIBTWOLAME_LOCAL_CONFIG_SUBDIRS="lib-src/twolame"
ac_configure_args="$ac_configure_args --disable-programs"
@@ -7714,7 +7678,7 @@ Forwarded: not-needed
withval=$with_ffmpeg; FFMPEG_ARGUMENT=$withval
else
FFMPEG_ARGUMENT="unspecified"
-@@ -8241,27 +6897,25 @@ fi
+@@ -8241,27 +6904,25 @@
if false ; then
@@ -7747,7 +7711,7 @@ Forwarded: not-needed
pkg_cv_AVCODEC_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 51.53" 2>/dev/null`
else
pkg_failed=yes
-@@ -8273,11 +6927,11 @@ if test -n "$AVCODEC_LIBS"; then
+@@ -8273,11 +6934,11 @@
pkg_cv_AVCODEC_LIBS="$AVCODEC_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -7762,7 +7726,7 @@ Forwarded: not-needed
pkg_cv_AVCODEC_LIBS=`$PKG_CONFIG --libs "libavcodec >= 51.53" 2>/dev/null`
else
pkg_failed=yes
-@@ -8303,7 +6957,7 @@ fi
+@@ -8303,7 +6964,7 @@
# Put the nasty error message in config.log where it belongs
echo "$AVCODEC_PKG_ERRORS" >&5
@@ -7771,7 +7735,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
avcodec_available_system="no"
elif test $pkg_failed = untried; then
-@@ -8311,24 +6965,24 @@ elif test $pkg_failed = untried; then
+@@ -8311,24 +6972,24 @@
else
AVCODEC_CFLAGS=$pkg_cv_AVCODEC_CFLAGS
AVCODEC_LIBS=$pkg_cv_AVCODEC_LIBS
@@ -7801,7 +7765,7 @@ Forwarded: not-needed
pkg_cv_AVFORMAT_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 52.12" 2>/dev/null`
else
pkg_failed=yes
-@@ -8340,11 +6994,11 @@ if test -n "$AVFORMAT_LIBS"; then
+@@ -8340,11 +7001,11 @@
pkg_cv_AVFORMAT_LIBS="$AVFORMAT_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -7816,7 +7780,7 @@ Forwarded: not-needed
pkg_cv_AVFORMAT_LIBS=`$PKG_CONFIG --libs "libavformat >= 52.12" 2>/dev/null`
else
pkg_failed=yes
-@@ -8370,7 +7024,7 @@ fi
+@@ -8370,7 +7031,7 @@
# Put the nasty error message in config.log where it belongs
echo "$AVFORMAT_PKG_ERRORS" >&5
@@ -7825,7 +7789,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
avformat_available_system="no"
elif test $pkg_failed = untried; then
-@@ -8378,7 +7032,7 @@ elif test $pkg_failed = untried; then
+@@ -8378,52 +7039,122 @@
else
AVFORMAT_CFLAGS=$pkg_cv_AVFORMAT_CFLAGS
AVFORMAT_LIBS=$pkg_cv_AVFORMAT_LIBS
@@ -7834,21 +7798,98 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
avformat_available_system="yes"
fi
-@@ -8389,41 +7043,42 @@ fi
- FFMPEG_SYSTEM_AVAILABLE="yes"
- FFMPEG_SYSTEM_CXXFLAGS="$AVCODEC_CFLAGS $AVFORMAT_CFLAGS"
- FFMPEG_SYSTEM_CPPSYMBOLS="USE_FFMPEG"
-+ if test "x$dynamic_loading" = "xno"; then
-+ FFMPEG_SYSTEM_LIBS="$AVCODEC_LIBS $AVFORMAT_LIBS"
+
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVUTIL" >&5
++$as_echo_n "checking for AVUTIL... " >&6; }
++
++if test -n "$AVUTIL_CFLAGS"; then
++ pkg_cv_AVUTIL_CFLAGS="$AVUTIL_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavutil\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libavutil") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_AVUTIL_CFLAGS=`$PKG_CONFIG --cflags "libavutil" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$AVUTIL_LIBS"; then
++ pkg_cv_AVUTIL_LIBS="$AVUTIL_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavutil\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libavutil") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_AVUTIL_LIBS=`$PKG_CONFIG --libs "libavutil" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
+
-+$as_echo "#define USE_SYSTEM_FFMPEG 1" >>confdefs.h
+
-+ fi
- FFMPEG_SYSTEM_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
- export/ExportFFmpegDialogs.o"
++
++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
++ AVUTIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavutil" 2>&1`
++ else
++ AVUTIL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavutil" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$AVUTIL_PKG_ERRORS" >&5
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ libavutil_available_system="no"
++elif test $pkg_failed = untried; then
++ libavutil_available_system="no"
++else
++ AVUTIL_CFLAGS=$pkg_cv_AVUTIL_CFLAGS
++ AVUTIL_LIBS=$pkg_cv_AVUTIL_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ libavutil_available_system="yes"
++fi
++
+ FFMPEG_SYSTEM_AVAILABLE="no"
+ if test "x$avcodec_available_system" = "xyes" ; then
+ if test "x$avformat_available_system" = "xyes" ; then
+- FFMPEG_SYSTEM_AVAILABLE="yes"
+- FFMPEG_SYSTEM_CXXFLAGS="$AVCODEC_CFLAGS $AVFORMAT_CFLAGS"
+- FFMPEG_SYSTEM_CPPSYMBOLS="USE_FFMPEG"
+- FFMPEG_SYSTEM_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
+- export/ExportFFmpegDialogs.o"
- { $as_echo "$as_me:$LINENO: FFmpeg library available as system library" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: FFmpeg library available as system library" >&5
++ if test "x$libavutil_available_system" = "xyes" ; then
++ FFMPEG_SYSTEM_AVAILABLE="yes"
++ FFMPEG_SYSTEM_CXXFLAGS="$AVCODEC_CFLAGS $AVFORMAT_CFLAGS $AVUTIL_CFLAGS"
++ FFMPEG_SYSTEM_CPPSYMBOLS="USE_FFMPEG"
++ if test "x$dynamic_loading" = "xno"; then
++ FFMPEG_SYSTEM_LIBS="$AVCODEC_LIBS $AVFORMAT_LIBS $AVUTIL_LIBS"
++
++$as_echo "#define USE_SYSTEM_FFMPEG 1" >>confdefs.h
++
++ fi
++ FFMPEG_SYSTEM_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
++ export/ExportFFmpegDialogs.o"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: FFmpeg library available as system library" >&5
$as_echo "$as_me: FFmpeg library available as system library" >&6;}
++ fi
fi
fi
if test "x$FFMPEG_SYSTEM_AVAILABLE" = "xno" ; then
@@ -7890,7 +7931,7 @@ Forwarded: not-needed
avcodec_h_found="yes"
else
avcodec_h_found="no"
-@@ -8431,28 +7086,23 @@ fi
+@@ -8431,28 +7162,23 @@
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" | $as_tr_sh`
@@ -7925,7 +7966,7 @@ Forwarded: not-needed
avformat_h_found="yes"
else
avformat_h_found="no"
-@@ -8467,12 +7117,12 @@ fi
+@@ -8467,12 +7193,12 @@
FFMPEG_LOCAL_CPPSYMBOLS="USE_FFMPEG"
FFMPEG_LOCAL_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
export/ExportFFmpegDialogs.o"
@@ -7940,7 +7981,7 @@ Forwarded: not-needed
$as_echo "$as_me: ffmpeg library is NOT available in the local tree" >&6;}
fi
-@@ -8480,7 +7130,7 @@ $as_echo "$as_me: ffmpeg library is NOT
+@@ -8480,7 +7206,7 @@
# Check whether --with-midi was given.
@@ -7949,7 +7990,7 @@ Forwarded: not-needed
withval=$with_midi; PORTSMF_ARGUMENT=$withval
else
PORTSMF_ARGUMENT="unspecified"
-@@ -8488,9 +7138,7 @@ fi
+@@ -8488,9 +7214,7 @@
if false ; then
@@ -7960,7 +8001,7 @@ Forwarded: not-needed
fi
-@@ -8547,49 +7195,9 @@ _ACEOF
+@@ -8547,49 +7271,9 @@
fi
ax_popdir=`pwd`
@@ -8012,7 +8053,7 @@ Forwarded: not-needed
ac_builddir=.
case ""${srcdir}/lib-src/portsmf"" in
-@@ -8635,7 +7243,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+@@ -8635,7 +7319,7 @@
# This should be Cygnus configure.
ax_sub_configure=$ac_aux_dir/configure
else
@@ -8021,7 +8062,7 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: no configuration information is in \"${srcdir}/lib-src/portsmf\"" >&2;}
ax_sub_configure=
fi
-@@ -8649,7 +7257,7 @@ $as_echo "$as_me: WARNING: no configurat
+@@ -8649,7 +7333,7 @@
ax_sub_cache_file=$ac_top_build_prefix$cache_file ;;
esac
@@ -8030,7 +8071,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 \
-@@ -8657,7 +7265,7 @@ $as_echo "$as_me: running $SHELL $ax_sub
+@@ -8657,7 +7341,7 @@
fi
cd "$ax_popdir"
@@ -8039,7 +8080,7 @@ Forwarded: not-needed
$as_echo "$as_me: Done configuring in \"${srcdir}/lib-src/portsmf\"" >&6;}
fi
-@@ -8665,18 +7273,18 @@ $as_echo "$as_me: Done configuring in \"
+@@ -8665,18 +7349,18 @@
export PKG_CONFIG_PATH
pkg_failed=no
@@ -8062,7 +8103,7 @@ Forwarded: not-needed
pkg_cv_PORTSMF_CFLAGS=`$PKG_CONFIG --cflags "portSMF" 2>/dev/null`
else
pkg_failed=yes
-@@ -8688,11 +7296,11 @@ if test -n "$PORTSMF_LIBS"; then
+@@ -8688,11 +7372,11 @@
pkg_cv_PORTSMF_LIBS="$PORTSMF_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -8077,7 +8118,7 @@ Forwarded: not-needed
pkg_cv_PORTSMF_LIBS=`$PKG_CONFIG --libs "portSMF" 2>/dev/null`
else
pkg_failed=yes
-@@ -8718,7 +7326,7 @@ fi
+@@ -8718,7 +7402,7 @@
# Put the nasty error message in config.log where it belongs
echo "$PORTSMF_PKG_ERRORS" >&5
@@ -8086,7 +8127,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
portsmf_available="no"
elif test $pkg_failed = untried; then
-@@ -8726,7 +7334,7 @@ elif test $pkg_failed = untried; then
+@@ -8726,7 +7410,7 @@
else
PORTSMF_CFLAGS=$pkg_cv_PORTSMF_CFLAGS
PORTSMF_LIBS=$pkg_cv_PORTSMF_LIBS
@@ -8095,7 +8136,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
portsmf_available="yes"
fi
-@@ -8744,7 +7352,7 @@ fi
+@@ -8744,7 +7428,7 @@
@@ -8104,7 +8145,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 +7369,37 @@ for lib in $LIBRARIES ; do
+@@ -8761,43 +7445,37 @@
if test "$AVAILABLE" = "yes" ; then
eval ${lib}_USE_${sys_or_local}="yes"
lib_activated="yes"
@@ -8156,7 +8197,7 @@ Forwarded: not-needed
fi
fi
done
-@@ -8809,39 +7411,33 @@ done
+@@ -8809,39 +7487,33 @@
# liblrdf
if test "$LIBSNDFILE_USE_LOCAL" != "yes" && test "$LIBSNDFILE_USE_SYSTEM" != "yes" ; then
@@ -8203,7 +8244,7 @@ Forwarded: not-needed
$as_echo "$as_me: Using libsamplerate as requested" >&6;}
fi
fi
-@@ -8892,7 +7488,7 @@ done
+@@ -8892,7 +7564,7 @@
# Check whether --enable-audiounits was given.
@@ -8212,7 +8253,7 @@ Forwarded: not-needed
enableval=$enable_audiounits; use_audiounits=$enableval
else
use_audiounits="auto"
-@@ -8900,7 +7496,7 @@ fi
+@@ -8900,7 +7572,7 @@
# Check whether --enable-ladspa was given.
@@ -8221,7 +8262,7 @@ Forwarded: not-needed
enableval=$enable_ladspa; use_ladspa=$enableval
else
use_ladspa="yes"
-@@ -8908,7 +7504,7 @@ fi
+@@ -8908,7 +7580,7 @@
# Check whether --enable-quicktime was given.
@@ -8230,7 +8271,7 @@ Forwarded: not-needed
enableval=$enable_quicktime; use_quicktime=$enableval
else
use_quicktime="auto"
-@@ -8918,7 +7514,7 @@ fi
+@@ -8918,7 +7590,7 @@
# Check whether --with-portmixer was given.
@@ -8239,7 +8280,7 @@ Forwarded: not-needed
withval=$with_portmixer; use_portmixer=$withval
else
use_portmixer="yes"
-@@ -8927,35 +7523,27 @@ fi
+@@ -8927,35 +7599,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -8282,7 +8323,7 @@ Forwarded: not-needed
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -8971,28 +7559,24 @@ IFS=$ac_save_IFS
+@@ -8971,28 +7635,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -8316,7 +8357,7 @@ Forwarded: not-needed
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -9031,14 +7615,10 @@ case "${host_os}" in
+@@ -9031,14 +7691,10 @@
CONFIGHEADER="configwin.h"
@@ -8333,7 +8374,7 @@ Forwarded: not-needed
AFTERBUILD=""
-@@ -9050,17 +7630,13 @@ _ACEOF
+@@ -9050,17 +7706,13 @@
EXTRAINSTALLTARGETS="$EXTRAINSTALLTARGETS install-extra-data"
EXTRAUNINSTALLTARGETS="$EXTRAUNINSTALLTARGETS uninstall-extra-data"
@@ -8354,7 +8395,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9085,79 +7661,50 @@ for ac_lib in '' dl; do
+@@ -9085,79 +7737,50 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -8447,7 +8488,7 @@ Forwarded: not-needed
pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -9169,11 +7716,11 @@ if test -n "$GTK_LIBS"; then
+@@ -9169,11 +7792,11 @@
pkg_cv_GTK_LIBS="$GTK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -8462,7 +8503,7 @@ Forwarded: not-needed
pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -9199,7 +7746,7 @@ fi
+@@ -9199,7 +7822,7 @@
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
@@ -8471,7 +8512,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
have_gtk=no
elif test $pkg_failed = untried; then
-@@ -9207,16 +7754,14 @@ elif test $pkg_failed = untried; then
+@@ -9207,16 +7830,14 @@
else
GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
GTK_LIBS=$pkg_cv_GTK_LIBS
@@ -8490,7 +8531,7 @@ Forwarded: not-needed
CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
-@@ -9240,18 +7785,14 @@ case "${host_os}" in
+@@ -9240,18 +7861,14 @@
cygwin*)
;;
*)
@@ -8512,7 +8553,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9269,43 +7810,18 @@ return snd_pcm_open ();
+@@ -9269,43 +7886,18 @@
return 0;
}
_ACEOF
@@ -8562,7 +8603,7 @@ Forwarded: not-needed
have_alsa=yes
else
have_alsa=no
-@@ -9316,18 +7832,18 @@ fi
+@@ -9316,18 +7908,18 @@
fi
pkg_failed=no
@@ -8585,7 +8626,7 @@ Forwarded: not-needed
pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack" 2>/dev/null`
else
pkg_failed=yes
-@@ -9339,11 +7855,11 @@ if test -n "$JACK_LIBS"; then
+@@ -9339,11 +7931,11 @@
pkg_cv_JACK_LIBS="$JACK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -8600,7 +8641,7 @@ Forwarded: not-needed
pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack" 2>/dev/null`
else
pkg_failed=yes
-@@ -9369,7 +7885,7 @@ fi
+@@ -9369,7 +7961,7 @@
# Put the nasty error message in config.log where it belongs
echo "$JACK_PKG_ERRORS" >&5
@@ -8609,7 +8650,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
have_jack=no
elif test $pkg_failed = untried; then
-@@ -9377,25 +7893,21 @@ elif test $pkg_failed = untried; then
+@@ -9377,25 +7969,21 @@
else
JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
JACK_LIBS=$pkg_cv_JACK_LIBS
@@ -8639,7 +8680,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9413,43 +7925,18 @@ return HPI_SubSysCreate ();
+@@ -9413,43 +8001,18 @@
return 0;
}
_ACEOF
@@ -8689,7 +8730,7 @@ Forwarded: not-needed
have_asihpi=yes
else
have_asihpi=no
-@@ -9458,18 +7945,14 @@ fi
+@@ -9458,18 +8021,14 @@
if [ $have_asihpi = "yes" ] ; then
LIBS="$LIBS -lhpi"
fi
@@ -8711,7 +8752,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9484,145 +7967,30 @@ main ()
+@@ -9484,145 +8043,30 @@
{
return clock_gettime ();
;
@@ -8878,7 +8919,7 @@ Forwarded: not-needed
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -9636,9 +8004,7 @@ esac
+@@ -9636,9 +8080,7 @@
if [ "$use_portmixer" = "yes" ] ; then
@@ -8889,7 +8930,7 @@ Forwarded: not-needed
CXXFLAGS="-I\$(top_srcdir)/lib-src/portmixer/include $CXXFLAGS"
-@@ -9649,16 +8015,12 @@ _ACEOF
+@@ -9649,16 +8091,12 @@
ac_configure_args="$ac_configure_args --with-pa-include=../portaudio-v19/include"
fi
@@ -8909,7 +8950,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#define _ISOC9X_SOURCE 1
-@@ -9674,54 +8036,27 @@ main ()
+@@ -9674,54 +8112,27 @@
return 0;
}
_ACEOF
@@ -8971,7 +9012,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#define _ISOC9X_SOURCE 1
-@@ -9737,41 +8072,18 @@ main ()
+@@ -9737,41 +8148,18 @@
return 0;
}
_ACEOF
@@ -9017,7 +9058,7 @@ Forwarded: not-needed
fi
-@@ -9782,9 +8094,7 @@ if [ "$use_ladspa" = "yes" ] ; then
+@@ -9782,9 +8170,7 @@
OPTOBJS="$OPTOBJS effects/ladspa/LadspaEffect.o"
@@ -9028,7 +9069,7 @@ Forwarded: not-needed
case "$host_os" in
-@@ -9801,9 +8111,7 @@ if [ "$use_audiounits" = "yes" ] ; then
+@@ -9801,9 +8187,7 @@
OPTOBJS="$OPTOBJS effects/audiounits/AudioUnitEffect.o"
@@ -9039,7 +9080,7 @@ Forwarded: not-needed
fi
-@@ -9812,9 +8120,7 @@ if [ "$use_quicktime" = "yes" ] ; then
+@@ -9812,9 +8196,7 @@
OPTOBJS="$OPTOBJS import/ImportQTWrapper.o"
@@ -9050,7 +9091,7 @@ Forwarded: not-needed
fi
-@@ -9869,13 +8175,13 @@ _ACEOF
+@@ -9869,13 +8251,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -9066,7 +9107,7 @@ Forwarded: not-needed
esac ;;
esac
done
-@@ -9883,8 +8189,8 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -9883,8 +8265,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -9077,7 +9118,7 @@ Forwarded: not-needed
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -9907,11 +8213,11 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -9907,11 +8289,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" &&
@@ -9091,7 +9132,7 @@ Forwarded: not-needed
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -9925,14 +8231,15 @@ DEFS=-DHAVE_CONFIG_H
+@@ -9925,14 +8307,15 @@
ac_libobjs=
ac_ltlibobjs=
@@ -9109,7 +9150,7 @@ Forwarded: not-needed
done
LIBOBJS=$ac_libobjs
-@@ -9944,9 +8251,10 @@ LTLIBOBJS=$ac_ltlibobjs
+@@ -9944,9 +8327,10 @@
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -9122,7 +9163,7 @@ Forwarded: not-needed
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -9956,17 +8264,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
+@@ -9956,17 +8340,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -9148,7 +9189,7 @@ Forwarded: not-needed
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -9974,23 +8283,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -9974,23 +8359,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -9177,7 +9218,7 @@ Forwarded: not-needed
as_nl='
'
export as_nl
-@@ -9998,7 +8299,13 @@ export as_nl
+@@ -9998,7 +8375,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
@@ -9192,7 +9233,7 @@ Forwarded: not-needed
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -10009,7 +8316,7 @@ else
+@@ -10009,7 +8392,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -9201,7 +9242,7 @@ Forwarded: not-needed
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -10032,13 +8339,6 @@ if test "${PATH_SEPARATOR+set}" != set;
+@@ -10032,13 +8415,6 @@
}
fi
@@ -9215,7 +9256,7 @@ Forwarded: not-needed
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -10048,15 +8348,15 @@ fi
+@@ -10048,15 +8424,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -9234,7 +9275,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
;;
-@@ -10068,12 +8368,16 @@ if test "x$as_myself" = x; then
+@@ -10068,12 +8444,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -9255,7 +9296,7 @@ Forwarded: not-needed
done
PS1='$ '
PS2='> '
-@@ -10085,7 +8389,89 @@ export LC_ALL
+@@ -10085,7 +8465,89 @@
LANGUAGE=C
export LANGUAGE
@@ -9346,7 +9387,7 @@ Forwarded: not-needed
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -10099,8 +8485,12 @@ else
+@@ -10099,8 +8561,12 @@
as_basename=false
fi
@@ -9360,7 +9401,7 @@ Forwarded: not-needed
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -10120,76 +8510,25 @@ $as_echo X/"$0" |
+@@ -10120,76 +8586,25 @@
}
s/.*/./; q'`
@@ -9448,7 +9489,7 @@ Forwarded: not-needed
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -10218,8 +8557,56 @@ fi
+@@ -10218,8 +8633,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -9506,7 +9547,7 @@ Forwarded: not-needed
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -10238,10 +8625,10 @@ else
+@@ -10238,10 +8701,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -9519,7 +9560,7 @@ Forwarded: not-needed
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -10256,13 +8643,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+@@ -10256,13 +8719,19 @@
exec 6>&1
@@ -9541,7 +9582,7 @@ Forwarded: not-needed
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -10293,13 +8686,15 @@ _ACEOF
+@@ -10293,13 +8762,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -9560,7 +9601,7 @@ Forwarded: not-needed
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -10315,16 +8710,17 @@ $config_files
+@@ -10315,16 +8786,17 @@
Configuration headers:
$config_headers
@@ -9582,7 +9623,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 +8736,16 @@ ac_need_defaults=:
+@@ -10340,11 +8812,16 @@
while test $# != 0
do
case $1 in
@@ -9600,7 +9641,7 @@ Forwarded: not-needed
*)
ac_option=$1
ac_optarg=$2
-@@ -10358,27 +8759,29 @@ do
+@@ -10358,27 +8835,29 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -9635,7 +9676,7 @@ Forwarded: not-needed
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -10386,11 +8789,10 @@ Try \`$0 --help' for more information."
+@@ -10386,11 +8865,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -9650,7 +9691,7 @@ Forwarded: not-needed
ac_need_defaults=false ;;
esac
-@@ -10445,9 +8847,7 @@ do
+@@ -10445,9 +8923,7 @@
"lib-src/expat/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/expat/Makefile" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
@@ -9661,7 +9702,7 @@ Forwarded: not-needed
esac
done
-@@ -10473,7 +8873,7 @@ $debug ||
+@@ -10473,7 +8949,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -9670,7 +9711,7 @@ Forwarded: not-needed
}
# Create a (secure) tmp directory for tmp files.
-@@ -10484,11 +8884,7 @@ $debug ||
+@@ -10484,11 +8960,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -9683,7 +9724,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 +8892,13 @@ $debug ||
+@@ -10496,7 +8968,13 @@
if test -n "$CONFIG_FILES"; then
@@ -9698,7 +9739,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 +8915,18 @@ _ACEOF
+@@ -10513,24 +8991,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -9727,7 +9768,7 @@ Forwarded: not-needed
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -10552,7 +8948,7 @@ s/'"$ac_delim"'$//
+@@ -10552,7 +9024,7 @@
t delim
:nl
h
@@ -9736,7 +9777,7 @@ Forwarded: not-needed
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -10566,7 +8962,7 @@ s/.\{148\}//
+@@ -10566,7 +9038,7 @@
t nl
:delim
h
@@ -9745,7 +9786,7 @@ Forwarded: not-needed
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -10619,22 +9015,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
+@@ -10619,22 +9091,28 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -9784,7 +9825,7 @@ Forwarded: not-needed
s/^[^=]*=[ ]*$//
}'
fi
-@@ -10662,9 +9064,7 @@ for ac_last_try in false false :; do
+@@ -10662,9 +9140,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -9795,7 +9836,7 @@ Forwarded: not-needed
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -10749,9 +9149,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -10749,9 +9225,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -9806,7 +9847,7 @@ Forwarded: not-needed
fi # test -n "$CONFIG_HEADERS"
-@@ -10764,9 +9162,7 @@ do
+@@ -10764,9 +9238,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -9817,7 +9858,7 @@ Forwarded: not-needed
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -10794,12 +9190,10 @@ $as_echo "$as_me: error: invalid tag $ac
+@@ -10794,12 +9266,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -9832,7 +9873,7 @@ Forwarded: not-needed
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -10810,7 +9204,7 @@ $as_echo "$as_me: error: cannot find inp
+@@ -10810,7 +9280,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -9841,7 +9882,7 @@ Forwarded: not-needed
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -10823,9 +9217,7 @@ $as_echo "$as_me: creating $ac_file" >&6
+@@ -10823,9 +9293,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -9852,7 +9893,7 @@ Forwarded: not-needed
esac
;;
esac
-@@ -10853,47 +9245,7 @@ $as_echo X"$ac_file" |
+@@ -10853,47 +9321,7 @@
q
}
s/.*/./; q'`
@@ -9901,7 +9942,7 @@ Forwarded: not-needed
ac_builddir=.
case "$ac_dir" in
-@@ -10945,7 +9297,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+@@ -10945,7 +9373,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=
@@ -9909,7 +9950,7 @@ Forwarded: not-needed
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -10955,12 +9306,11 @@ ac_sed_dataroot='
+@@ -10955,12 +9382,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -9924,7 +9965,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 +9320,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -10970,7 +9396,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -9933,7 +9974,7 @@ Forwarded: not-needed
esac
_ACEOF
-@@ -10998,26 +9348,22 @@ s&@INSTALL@&$ac_INSTALL&;t t
+@@ -10998,26 +9424,22 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -9965,7 +10006,7 @@ Forwarded: not-needed
;;
:H)
#
-@@ -11028,25 +9374,19 @@ $as_echo "$as_me: error: could not creat
+@@ -11028,25 +9450,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -9995,7 +10036,7 @@ Forwarded: not-needed
fi
;;
-@@ -11056,15 +9396,12 @@ $as_echo "$as_me: error: could not creat
+@@ -11056,15 +9472,12 @@
done # for ac_tag
@@ -10013,7 +10054,7 @@ Forwarded: not-needed
# configure is writing to config.log, and then calls config.status.
-@@ -11085,7 +9422,7 @@ if test "$no_create" != yes; then
+@@ -11085,7 +9498,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.
@@ -10022,7 +10063,7 @@ Forwarded: not-needed
fi
#
-@@ -11129,7 +9466,7 @@ if test "$no_recursion" != yes; then
+@@ -11129,7 +9542,7 @@
case $ac_arg in
*\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -10031,7 +10072,7 @@ Forwarded: not-needed
esac
done
-@@ -11158,49 +9495,9 @@ if test "$no_recursion" != yes; then
+@@ -11158,49 +9571,9 @@
test -d "$srcdir/$ac_dir" || continue
ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
@@ -10083,7 +10124,7 @@ Forwarded: not-needed
ac_builddir=.
case "$ac_dir" in
-@@ -11247,7 +9544,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+@@ -11247,7 +9620,7 @@
# This should be Cygnus configure.
ac_sub_configure=$ac_aux_dir/configure
else
@@ -10092,7 +10133,7 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
ac_sub_configure=
fi
-@@ -11261,21 +9558,19 @@ $as_echo "$as_me: WARNING: no configurat
+@@ -11261,21 +9634,19 @@
ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
esac
diff --git a/debian/patches/disable-dynamic-loading.patch b/debian/patches/disable-dynamic-loading.patch
index 497b188..1eb8328 100644
--- a/debian/patches/disable-dynamic-loading.patch
+++ b/debian/patches/disable-dynamic-loading.patch
@@ -55,17 +55,42 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
dnl Check for a copy of ffmpeg, whoose headers we will use for the importer
AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [
AC_ARG_WITH(ffmpeg,
-@@ -33,6 +33,10 @@
- FFMPEG_SYSTEM_AVAILABLE="yes"
- FFMPEG_SYSTEM_CXXFLAGS="$AVCODEC_CFLAGS $AVFORMAT_CFLAGS"
- FFMPEG_SYSTEM_CPPSYMBOLS="USE_FFMPEG"
-+ if test "x$dynamic_loading" = "xno"; then
-+ FFMPEG_SYSTEM_LIBS="$AVCODEC_LIBS $AVFORMAT_LIBS"
-+ AC_DEFINE(USE_SYSTEM_FFMPEG, 1, [Use system FFmpeg library and disable dynamic loading of it.])
-+ 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
- FFMPEG_SYSTEM_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
+@@ -26,18 +26,27 @@
+ PKG_CHECK_MODULES(AVFORMAT, libavformat >= 52.12,
+ avformat_available_system="yes",
+ avformat_available_system="no")
++ PKG_CHECK_MODULES(AVUTIL, libavutil,
++ libavutil_available_system="yes",
++ libavutil_available_system="no")
+
+ FFMPEG_SYSTEM_AVAILABLE="no"
+ if test "x$avcodec_available_system" = "xyes" ; then
+ if test "x$avformat_available_system" = "xyes" ; then
+- FFMPEG_SYSTEM_AVAILABLE="yes"
+- FFMPEG_SYSTEM_CXXFLAGS="$AVCODEC_CFLAGS $AVFORMAT_CFLAGS"
+- FFMPEG_SYSTEM_CPPSYMBOLS="USE_FFMPEG"
+- 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
+- FFMPEG_SYSTEM_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
+- export/ExportFFmpegDialogs.o"
+- AC_MSG_NOTICE([FFmpeg library available as system library])
++ if test "x$libavutil_available_system" = "xyes" ; then
++ FFMPEG_SYSTEM_AVAILABLE="yes"
++ FFMPEG_SYSTEM_CXXFLAGS="$AVCODEC_CFLAGS $AVFORMAT_CFLAGS $AVUTIL_CFLAGS"
++ FFMPEG_SYSTEM_CPPSYMBOLS="USE_FFMPEG"
++ if test "x$dynamic_loading" = "xno"; then
++ FFMPEG_SYSTEM_LIBS="$AVCODEC_LIBS $AVFORMAT_LIBS $AVUTIL_LIBS"
++ AC_DEFINE(USE_SYSTEM_FFMPEG, 1, [Use system FFmpeg library and disable dynamic loading of it.])
++ 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
++ FFMPEG_SYSTEM_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
++ export/ExportFFmpegDialogs.o"
++ AC_MSG_NOTICE([FFmpeg library available as system library])
++ fi
+ fi
+ fi
+ if test "x$FFMPEG_SYSTEM_AVAILABLE" = "xno" ; then
--- a/src/FFmpeg.cpp
+++ b/src/FFmpeg.cpp
@@ -40,6 +40,8 @@
--
Audacity debian packaging
More information about the pkg-multimedia-commits
mailing list