[SCM] audacity/master: Compile against system portAudio (Closes: #323711).
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Sat Feb 26 22:04:56 UTC 2011
The following commit has been merged in the master branch:
commit 971b068e2a4bc76900a13321d519343a0f88bcc6
Author: Benjamin Drung <bdrung at gmail.com>
Date: Sat Feb 26 16:38:08 2011 +0100
Compile against system portAudio (Closes: #323711).
diff --git a/debian/control b/debian/control
index 5f22180..47724a7 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Build-Depends: autotools-dev,
libtwolame-dev (>= 0.3.9),
libvorbis-dev (>= 1.0.0-3),
libwxgtk2.8-dev,
+ portaudio19-dev (>= 19+svn20101113-3~),
vamp-plugin-sdk (>= 2.0),
zip
Build-Conflicts: libwxbase2.6-dev, wx2.6-headers
diff --git a/debian/patches/autoreconf.patch b/debian/patches/autoreconf.patch
index fe1367d..3cf0999 100644
--- a/debian/patches/autoreconf.patch
+++ b/debian/patches/autoreconf.patch
@@ -3199,7 +3199,15 @@ Forwarded: not-needed
withval=$with_pa_include; with_portaudio=$withval
else
with_portaudio=""
-@@ -3464,696 +3320,226 @@
+@@ -3457,703 +3313,233 @@
+ #
+ #
+ #
+-if [ with_portaudio != "" ] ; then
++if test -n "$with_portaudio"; then
+ CPPFLAGS="$CPPFLAGS -I$withval"
+ cflags="$cflags -I$withval"
+
fi
#
diff --git a/debian/patches/configure.patch b/debian/patches/configure.patch
index b8eafe3..32b38d4 100644
--- a/debian/patches/configure.patch
+++ b/debian/patches/configure.patch
@@ -814,8 +814,12 @@ Forwarded: not-needed
ac_unique_file="src/Audacity.h"
ac_default_prefix=/usr/local
-@@ -655,6 +611,8 @@
+@@ -653,8 +609,12 @@
+ build_vendor
+ build_cpu
build
++PORTAUDIO_LIBS
++PORTAUDIO_CFLAGS
PORTSMF_LIBS
PORTSMF_CFLAGS
+AVUTIL_LIBS
@@ -823,7 +827,7 @@ Forwarded: not-needed
AVFORMAT_LIBS
AVFORMAT_CFLAGS
AVCODEC_LIBS
-@@ -742,6 +700,7 @@
+@@ -742,6 +702,7 @@
program_transform_name
prefix
exec_prefix
@@ -831,7 +835,7 @@ Forwarded: not-needed
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -756,6 +715,7 @@
+@@ -756,6 +717,7 @@
enable_unicode
enable_debug
with_lib_preference
@@ -839,7 +843,15 @@ Forwarded: not-needed
with_libsndfile
with_expat
with_libsamplerate
-@@ -809,13 +769,15 @@
+@@ -771,6 +733,7 @@
+ with_libtwolame
+ with_ffmpeg
+ with_midi
++with_portaudio
+ enable_audiounits
+ enable_ladspa
+ enable_quicktime
+@@ -809,15 +772,18 @@
AVCODEC_LIBS
AVFORMAT_CFLAGS
AVFORMAT_LIBS
@@ -847,6 +859,8 @@ Forwarded: not-needed
+AVUTIL_LIBS
PORTSMF_CFLAGS
PORTSMF_LIBS
++PORTAUDIO_CFLAGS
++PORTAUDIO_LIBS
GTK_CFLAGS
GTK_LIBS
JACK_CFLAGS
@@ -854,9 +868,11 @@ Forwarded: not-needed
-ac_subdirs_all='"lib-src/FileDialog"
+ac_subdirs_all='lib-src/FileDialog
$CONFIG_SUBDIRS
- lib-src/portaudio-v19
+-lib-src/portaudio-v19
lib-src/portmixer'
-@@ -880,8 +842,9 @@
+
+ # Initialize some variables set by options.
+@@ -880,8 +846,9 @@
fi
case $ac_option in
@@ -868,7 +884,7 @@ Forwarded: not-needed
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -926,8 +889,7 @@
+@@ -926,8 +893,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 &&
@@ -878,7 +894,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 +915,7 @@
+@@ -953,8 +919,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 &&
@@ -888,7 +904,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 +1119,7 @@
+@@ -1158,8 +1123,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 &&
@@ -898,7 +914,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 +1135,7 @@
+@@ -1175,8 +1139,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 &&
@@ -908,7 +924,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 +1165,17 @@
+@@ -1206,17 +1169,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -932,7 +948,7 @@ Forwarded: not-needed
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1233,15 +1192,13 @@
+@@ -1233,15 +1196,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -950,7 +966,7 @@ Forwarded: not-needed
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1264,8 +1221,7 @@
+@@ -1264,8 +1225,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -960,7 +976,7 @@ Forwarded: not-needed
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1279,8 +1235,8 @@
+@@ -1279,8 +1239,8 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
@@ -971,7 +987,7 @@ Forwarded: not-needed
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
-@@ -1295,11 +1251,9 @@
+@@ -1295,11 +1255,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -985,7 +1001,7 @@ Forwarded: not-needed
# Find the source files, if location was not specified.
-@@ -1338,13 +1292,11 @@
+@@ -1338,13 +1296,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -1001,7 +1017,7 @@ Forwarded: not-needed
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1384,7 +1336,7 @@
+@@ -1384,7 +1340,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
@@ -1010,7 +1026,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 +1401,9 @@
+@@ -1449,6 +1405,9 @@
--enable-static link wx statically [default=no]
--enable-unicode enable unicode support [default=yes]
--enable-debug enable debug support [default=no]
@@ -1020,7 +1036,15 @@ 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 +1441,7 @@
+@@ -1478,6 +1437,7 @@
+ --with-libtwolame use libtwolame for MP2 export support
+ --with-ffmpeg use ffmpeg for import and export support
+ --with-midi use portSMF for Midi support
++ --with-portaudio use portaudio19
+ --with-portmixer compile with PortMixer [default=yes]
+
+ Some influential environment variables:
+@@ -1486,7 +1446,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>
@@ -1029,7 +1053,7 @@ Forwarded: not-needed
you have headers in a nonstandard directory <include dir>
CXX C++ compiler command
CXXFLAGS C++ compiler flags
-@@ -1528,6 +1483,9 @@
+@@ -1528,96 +1488,547 @@
C compiler flags for AVFORMAT, overriding pkg-config
AVFORMAT_LIBS
linker flags for AVFORMAT, overriding pkg-config
@@ -1039,7 +1063,13 @@ Forwarded: not-needed
PORTSMF_CFLAGS
C compiler flags for PORTSMF, overriding pkg-config
PORTSMF_LIBS
-@@ -1537,87 +1495,531 @@
+ linker flags for PORTSMF, overriding pkg-config
++ PORTAUDIO_CFLAGS
++ C compiler flags for PORTAUDIO, overriding pkg-config
++ PORTAUDIO_LIBS
++ linker flags for PORTAUDIO, overriding pkg-config
+ GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
+ GTK_LIBS linker flags for GTK, overriding pkg-config
JACK_CFLAGS C compiler flags for JACK, overriding pkg-config
JACK_LIBS linker flags for JACK, overriding pkg-config
@@ -1281,7 +1311,7 @@ Forwarded: not-needed
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
-+
+
+} # ac_fn_cxx_try_link
+
+# ac_fn_cxx_check_type LINENO TYPE VAR INCLUDES
@@ -1308,7 +1338,8 @@ Forwarded: not-needed
+ ;
+ return 0;
+}
-+_ACEOF
+ _ACEOF
+-ac_status=$?
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
@@ -1328,16 +1359,33 @@ Forwarded: not-needed
+ eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+
+
+-if test "$ac_init_help" = "recursive"; then
+- # If there are subdirs, report their specific --help.
+- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+- test -d "$ac_dir" ||
+- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+- continue
+- ac_builddir=.
+} # ac_fn_cxx_check_type
-+
+
+-case "$ac_dir" in
+-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+-*)
+- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+- # A ".." for each directory in $ac_dir_suffix.
+- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+- case $ac_top_builddir_sub in
+- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+- esac ;;
+# ac_fn_cxx_try_run LINENO
+# ------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
@@ -1349,7 +1397,25 @@ Forwarded: not-needed
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
-+esac
+ esac
+-ac_abs_top_builddir=$ac_pwd
+-ac_abs_builddir=$ac_pwd$ac_dir_suffix
+-# for backward compatibility:
+-ac_top_builddir=$ac_top_build_prefix
+-
+-case $srcdir in
+- .) # We are building in place.
+- ac_srcdir=.
+- ac_top_srcdir=$ac_top_builddir_sub
+- ac_abs_top_srcdir=$ac_pwd ;;
+- [\\/]* | ?:[\\/]* ) # Absolute name.
+- ac_srcdir=$srcdir$ac_dir_suffix;
+- ac_top_srcdir=$srcdir
+- ac_abs_top_srcdir=$srcdir ;;
+- *) # Relative name.
+- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+- ac_top_srcdir=$ac_top_build_prefix$srcdir
+- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
@@ -1359,7 +1425,8 @@ Forwarded: not-needed
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
-+esac
+ esac
+-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
@@ -1372,14 +1439,36 @@ Forwarded: not-needed
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+- cd "$ac_dir" || { ac_status=$?; continue; }
+- # Check for guested configure.
+- if test -f "$ac_srcdir/configure.gnu"; then
+- echo &&
+- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+- elif test -f "$ac_srcdir/configure"; then
+- echo &&
+- $SHELL "$ac_srcdir/configure" --help=recursive
+- else
+- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+- fi || ac_status=$?
+- cd "$ac_pwd" || { ac_status=$?; break; }
+- done
+ ac_retval=$ac_status
-+fi
+ fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
-+
+
+-test -n "$ac_init_help" && exit $ac_status
+-if $ac_init_version; then
+- cat <<\_ACEOF
+-configure
+-generated by GNU Autoconf 2.63
+} # ac_fn_cxx_try_run
-+
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+-This configure script is free software; the Free Software Foundation
+-gives unlimited permission to copy, distribute and modify it.
+# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
@@ -1397,43 +1486,21 @@ Forwarded: not-needed
+$4
+#include <$2>
_ACEOF
--ac_status=$?
+- exit
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
++fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
--if test "$ac_init_help" = "recursive"; then
-- # If there are subdirs, report their specific --help.
-- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-- test -d "$ac_dir" ||
-- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-- continue
-- ac_builddir=.
++
+} # ac_fn_cxx_check_header_compile
-
--case "$ac_dir" in
--.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
--*)
-- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-- # A ".." for each directory in $ac_dir_suffix.
-- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-- case $ac_top_builddir_sub in
-- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-- esac ;;
--esac
--ac_abs_top_builddir=$ac_pwd
--ac_abs_builddir=$ac_pwd$ac_dir_suffix
--# for backward compatibility:
--ac_top_builddir=$ac_top_build_prefix
++
+# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
@@ -1464,26 +1531,11 @@ Forwarded: not-needed
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
-+fi
+ fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
-
--case $srcdir in
-- .) # We are building in place.
-- ac_srcdir=.
-- ac_top_srcdir=$ac_top_builddir_sub
-- ac_abs_top_srcdir=$ac_pwd ;;
-- [\\/]* | ?:[\\/]* ) # Absolute name.
-- ac_srcdir=$srcdir$ac_dir_suffix;
-- ac_top_srcdir=$srcdir
-- ac_abs_top_srcdir=$srcdir ;;
-- *) # Relative name.
-- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_build_prefix$srcdir
-- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
--esac
--ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
++
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
@@ -1499,20 +1551,7 @@ Forwarded: not-needed
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
-
-- cd "$ac_dir" || { ac_status=$?; continue; }
-- # Check for guested configure.
-- if test -f "$ac_srcdir/configure.gnu"; then
-- echo &&
-- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-- elif test -f "$ac_srcdir/configure"; then
-- echo &&
-- $SHELL "$ac_srcdir/configure" --help=recursive
-- else
-- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-- fi || ac_status=$?
-- cd "$ac_pwd" || { ac_status=$?; break; }
-- done
++
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
+ yes:no: )
@@ -1544,20 +1583,11 @@ Forwarded: not-needed
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
- fi
++fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
--test -n "$ac_init_help" && exit $ac_status
--if $ac_init_version; then
-- cat <<\_ACEOF
--configure
--generated by GNU Autoconf 2.63
++
+} # ac_fn_cxx_check_header_mongrel
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
--This configure script is free software; the Free Software Foundation
--gives unlimited permission to copy, distribute and modify it.
++
+# ac_fn_cxx_check_func LINENO FUNC VAR
+# ------------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -1609,8 +1639,7 @@ Forwarded: not-needed
+ ;
+ return 0;
+}
- _ACEOF
-- exit
++_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ eval "$3=yes"
+else
@@ -1618,7 +1647,7 @@ Forwarded: not-needed
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
- fi
++fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
@@ -1635,7 +1664,7 @@ Forwarded: not-needed
$ $0 $@
-@@ -1653,8 +2055,8 @@
+@@ -1653,8 +2064,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1646,7 +1675,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
} >&5
-@@ -1691,9 +2093,9 @@
+@@ -1691,9 +2102,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1658,7 +1687,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 +2111,13 @@
+@@ -1709,13 +2120,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -1675,7 +1704,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 +2129,9 @@
+@@ -1727,11 +2138,9 @@
{
echo
@@ -1689,7 +1718,7 @@ Forwarded: not-needed
echo
# The following way of writing the cache mishandles newlines in values,
(
-@@ -1740,13 +2140,13 @@
+@@ -1740,13 +2149,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -1705,7 +1734,7 @@ Forwarded: not-needed
esac ;;
esac
done
-@@ -1765,11 +2165,9 @@
+@@ -1765,11 +2174,9 @@
)
echo
@@ -1719,7 +1748,7 @@ Forwarded: not-needed
echo
for ac_var in $ac_subst_vars
do
-@@ -1782,11 +2180,9 @@
+@@ -1782,11 +2189,9 @@
echo
if test -n "$ac_subst_files"; then
@@ -1733,7 +1762,7 @@ Forwarded: not-needed
echo
for ac_var in $ac_subst_files
do
-@@ -1800,11 +2196,9 @@
+@@ -1800,11 +2205,9 @@
fi
if test -s confdefs.h; then
@@ -1747,7 +1776,7 @@ Forwarded: not-needed
echo
cat confdefs.h
echo
-@@ -1818,46 +2212,53 @@
+@@ -1818,46 +2221,53 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -1807,7 +1836,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 +2269,23 @@
+@@ -1868,19 +2278,23 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -1838,7 +1867,7 @@ Forwarded: not-needed
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -1888,12 +2293,12 @@
+@@ -1888,12 +2302,12 @@
esac
fi
else
@@ -1853,7 +1882,7 @@ Forwarded: not-needed
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
-@@ -1904,11 +2309,11 @@
+@@ -1904,11 +2318,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -1867,7 +1896,7 @@ Forwarded: not-needed
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -1918,17 +2323,17 @@
+@@ -1918,17 +2332,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
@@ -1889,7 +1918,7 @@ Forwarded: not-needed
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -1940,35 +2345,20 @@
+@@ -1940,35 +2354,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -1932,7 +1961,7 @@ Forwarded: not-needed
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -1991,9 +2381,9 @@
+@@ -1991,9 +2390,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
@@ -1944,7 +1973,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2004,24 +2394,24 @@
+@@ -2004,24 +2403,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1974,7 +2003,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2031,9 +2421,9 @@
+@@ -2031,9 +2430,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
@@ -1986,7 +2015,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -2044,24 +2434,24 @@
+@@ -2044,24 +2443,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2016,7 +2045,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2070,7 +2460,7 @@
+@@ -2070,7 +2469,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2025,7 +2054,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 +2474,9 @@
+@@ -2084,9 +2483,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
@@ -2037,7 +2066,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2097,24 +2487,24 @@
+@@ -2097,24 +2496,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2067,7 +2096,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2124,9 +2514,9 @@
+@@ -2124,9 +2523,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
@@ -2079,7 +2108,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2138,18 +2528,18 @@
+@@ -2138,18 +2537,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2101,7 +2130,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -2168,10 +2558,10 @@
+@@ -2168,10 +2567,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2114,7 +2143,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2183,9 +2573,9 @@
+@@ -2183,9 +2582,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
@@ -2126,7 +2155,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2196,24 +2586,24 @@
+@@ -2196,24 +2595,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2156,7 +2185,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2227,9 +2617,9 @@
+@@ -2227,9 +2626,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
@@ -2168,7 +2197,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -2240,24 +2630,24 @@
+@@ -2240,24 +2639,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2198,7 +2227,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2270,7 +2660,7 @@
+@@ -2270,7 +2669,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2207,7 +2236,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 +2671,37 @@
+@@ -2281,57 +2680,37 @@
fi
@@ -2285,7 +2314,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -2347,8 +2717,8 @@
+@@ -2347,8 +2726,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.
@@ -2296,7 +2325,7 @@ Forwarded: not-needed
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -2364,17 +2734,17 @@
+@@ -2364,17 +2743,17 @@
done
rm -f $ac_rmfiles
@@ -2319,7 +2348,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 +2761,7 @@
+@@ -2391,7 +2770,7 @@
# certainly right.
break;;
*.* )
@@ -2328,7 +2357,7 @@ Forwarded: not-needed
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -2410,84 +2780,41 @@
+@@ -2410,84 +2789,41 @@
else
ac_file=''
fi
@@ -2344,16 +2373,26 @@ Forwarded: not-needed
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
--fi
--
--ac_exeext=$ac_cv_exeext
++as_fn_error 77 "C compiler cannot create executables
++See \`config.log' for more details" "$LINENO" 5 ; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ fi
-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
++$as_echo "$ac_file" >&6; }
+ ac_exeext=$ac_cv_exeext
+
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
@@ -2378,8 +2417,7 @@ Forwarded: not-needed
- cross_compiling=yes
- else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
@@ -2391,18 +2429,8 @@ Forwarded: not-needed
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+as_fn_error 77 "C compiler cannot create executables
-+See \`config.log' for more details" "$LINENO" 5 ; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
-+ac_exeext=$ac_cv_exeext
-
+-$as_echo "yes" >&6; }
+-
rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run. If not, either
@@ -2434,7 +2462,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 +2829,83 @@
+@@ -2502,32 +2838,83 @@
esac
done
else
@@ -2534,7 +2562,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -2539,17 +2917,17 @@
+@@ -2539,17 +2926,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -2557,7 +2585,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 +2940,23 @@
+@@ -2562,31 +2949,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2596,7 +2624,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -2600,37 +2970,16 @@
+@@ -2600,37 +2979,16 @@
return 0;
}
_ACEOF
@@ -2637,7 +2665,7 @@ Forwarded: not-needed
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -2639,20 +2988,16 @@
+@@ -2639,20 +2997,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -2661,7 +2689,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -2663,35 +3008,11 @@
+@@ -2663,35 +3017,11 @@
return 0;
}
_ACEOF
@@ -2700,7 +2728,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -2702,36 +3023,12 @@
+@@ -2702,36 +3032,12 @@
return 0;
}
_ACEOF
@@ -2741,7 +2769,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -2742,42 +3039,17 @@
+@@ -2742,42 +3048,17 @@
return 0;
}
_ACEOF
@@ -2786,7 +2814,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 +3066,14 @@
+@@ -2794,18 +3075,14 @@
CFLAGS=
fi
fi
@@ -2808,7 +2836,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -2862,32 +3130,9 @@
+@@ -2862,32 +3139,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -2842,7 +2870,7 @@ Forwarded: not-needed
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -2898,17 +3143,19 @@
+@@ -2898,17 +3152,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -2865,7 +2893,7 @@ Forwarded: not-needed
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2936,9 +3183,9 @@
+@@ -2936,9 +3192,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
@@ -2877,7 +2905,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -2949,24 +3196,24 @@
+@@ -2949,24 +3205,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2907,7 +2935,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -2980,9 +3227,9 @@
+@@ -2980,9 +3236,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
@@ -2919,7 +2947,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -2993,24 +3240,24 @@
+@@ -2993,24 +3249,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2949,7 +2977,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -3023,7 +3270,7 @@
+@@ -3023,7 +3279,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2958,7 +2986,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 +3281,36 @@
+@@ -3034,53 +3290,36 @@
fi
fi
# Provide some information about the compiler.
@@ -3031,7 +3059,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -3094,37 +3324,16 @@
+@@ -3094,37 +3333,16 @@
return 0;
}
_ACEOF
@@ -3072,7 +3100,7 @@ Forwarded: not-needed
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GXX=yes
-@@ -3133,20 +3342,16 @@
+@@ -3133,20 +3351,16 @@
fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
@@ -3096,7 +3124,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -3157,35 +3362,11 @@
+@@ -3157,35 +3371,11 @@
return 0;
}
_ACEOF
@@ -3135,7 +3163,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -3196,36 +3377,12 @@
+@@ -3196,36 +3386,12 @@
return 0;
}
_ACEOF
@@ -3176,7 +3204,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -3236,42 +3393,17 @@
+@@ -3236,42 +3402,17 @@
return 0;
}
_ACEOF
@@ -3221,7 +3249,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 +3431,10 @@
+@@ -3299,10 +3440,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
@@ -3234,7 +3262,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
# Double quotes because CXXCPP needs to be expanded
-@@ -3317,11 +3449,7 @@
+@@ -3317,11 +3458,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.
@@ -3247,7 +3275,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -3330,78 +3458,34 @@
+@@ -3330,78 +3467,34 @@
#endif
Syntax error
_ACEOF
@@ -3334,7 +3362,7 @@ Forwarded: not-needed
break
fi
-@@ -3413,7 +3497,7 @@
+@@ -3413,7 +3506,7 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -3343,7 +3371,7 @@ Forwarded: not-needed
$as_echo "$CXXCPP" >&6; }
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
-@@ -3424,11 +3508,7 @@
+@@ -3424,11 +3517,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.
@@ -3356,7 +3384,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -3437,87 +3517,40 @@
+@@ -3437,87 +3526,40 @@
#endif
Syntax error
_ACEOF
@@ -3456,7 +3484,7 @@ Forwarded: not-needed
fi
ac_ext=cpp
-@@ -3547,9 +3580,7 @@
+@@ -3547,9 +3589,7 @@
fi
done
if test -z "$ac_aux_dir"; then
@@ -3467,7 +3495,7 @@ Forwarded: not-needed
fi
# These three variables are undocumented and unsupported,
-@@ -3575,10 +3606,10 @@
+@@ -3575,10 +3615,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.
@@ -3480,7 +3508,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -3586,11 +3617,11 @@
+@@ -3586,11 +3626,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3496,7 +3524,7 @@ Forwarded: not-needed
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -3627,7 +3658,7 @@
+@@ -3627,7 +3667,7 @@
;;
esac
@@ -3505,7 +3533,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -3643,7 +3674,7 @@
+@@ -3643,7 +3683,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -3514,7 +3542,7 @@ Forwarded: not-needed
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -3656,9 +3687,9 @@
+@@ -3656,9 +3696,9 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -3526,7 +3554,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -n "$HAVE_PKG_CONFIG"; then
-@@ -3669,14 +3700,14 @@
+@@ -3669,14 +3709,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3544,7 +3572,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 +3715,16 @@
+@@ -3684,18 +3724,16 @@
fi
HAVE_PKG_CONFIG=$ac_cv_prog_HAVE_PKG_CONFIG
if test -n "$HAVE_PKG_CONFIG"; then
@@ -3566,7 +3594,7 @@ Forwarded: not-needed
fi
-@@ -3730,9 +3759,7 @@
+@@ -3730,9 +3768,7 @@
if [ "$AUDACITY_NAME" = "audacity" ] ; then
@@ -3577,7 +3605,7 @@ Forwarded: not-needed
else
cat >>confdefs.h <<_ACEOF
-@@ -3755,16 +3782,14 @@
+@@ -3755,16 +3791,14 @@
### Configuration of Audacity module support ###
################################################
@@ -3597,7 +3625,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -3772,7 +3797,7 @@
+@@ -3772,7 +3806,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -3606,7 +3634,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 +3806,7 @@
+@@ -3781,7 +3815,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3615,7 +3643,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 +3826,7 @@
+@@ -3801,7 +3835,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
@@ -3624,7 +3652,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 +3841,17 @@
+@@ -3816,19 +3850,17 @@
$ac_path_SED_found && break 3
done
done
@@ -3647,7 +3675,7 @@ Forwarded: not-needed
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -3841,9 +3864,9 @@
+@@ -3841,9 +3873,9 @@
flag=`echo "-rdynamic" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
@@ -3659,7 +3687,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
-@@ -3852,59 +3875,30 @@
+@@ -3852,14 +3884,10 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -rdynamic"
@@ -3675,13 +3703,11 @@ Forwarded: not-needed
+
int
main ()
--{
--
-- ;
-- return 0;
--}
--
--_ACEOF
+ {
+@@ -3869,42 +3897,17 @@
+ }
+
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -3703,13 +3729,6 @@ Forwarded: not-needed
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+{
-+
-+ ;
-+ return 0;
-+}
-+
-+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
eval "ax_cv_ld_check_flag_$flag=yes"
@@ -3731,7 +3750,7 @@ Forwarded: not-needed
LDFLAGS="$save_LDFLAGS"
-@@ -3912,12 +3906,11 @@
+@@ -3912,12 +3915,11 @@
fi
@@ -3747,7 +3766,7 @@ Forwarded: not-needed
:
have_dynamic_link=yes
-@@ -3929,13 +3922,12 @@
+@@ -3929,13 +3931,12 @@
fi
@@ -3763,7 +3782,7 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: \"Audacity module support will probably not work\"" >&2;}
fi
-@@ -3943,7 +3935,7 @@
+@@ -3943,7 +3944,7 @@
#####################
# Check whether --enable-static was given.
@@ -3772,7 +3791,7 @@ Forwarded: not-needed
enableval=$enable_static; static_preference="--static=$enableval"
else
static_preference=""
-@@ -3951,7 +3943,7 @@
+@@ -3951,7 +3952,7 @@
# Check whether --enable-unicode was given.
@@ -3781,7 +3800,7 @@ Forwarded: not-needed
enableval=$enable_unicode; unicode_preference="--unicode=$enableval"
else
unicode_preference="--unicode=yes"
-@@ -3959,7 +3951,7 @@
+@@ -3959,7 +3960,7 @@
# Check whether --enable-debug was given.
@@ -3790,7 +3809,7 @@ Forwarded: not-needed
enableval=$enable_debug; debug_preference="$enableval"
else
debug_preference="no"
-@@ -3968,32 +3960,36 @@
+@@ -3968,32 +3969,36 @@
# Check whether --with-lib-preference was given.
@@ -3836,7 +3855,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -4053,48 +4049,25 @@
+@@ -4053,48 +4058,25 @@
return 0;
}
_ACEOF
@@ -3891,7 +3910,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4105,7 +4078,7 @@
+@@ -4105,7 +4087,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3900,7 +3919,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 +4098,7 @@
+@@ -4125,7 +4107,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
@@ -3909,7 +3928,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 +4113,24 @@
+@@ -4140,26 +4122,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -3941,7 +3960,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4173,7 +4144,7 @@
+@@ -4173,7 +4153,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3950,7 +3969,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 +4164,7 @@
+@@ -4193,7 +4173,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
@@ -3959,7 +3978,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 +4179,10 @@
+@@ -4208,12 +4188,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -3974,7 +3993,7 @@ Forwarded: not-needed
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4221,21 +4190,17 @@
+@@ -4221,21 +4199,17 @@
fi
fi
@@ -4000,7 +4019,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -4250,48 +4215,23 @@
+@@ -4250,48 +4224,23 @@
return 0;
}
_ACEOF
@@ -4054,7 +4073,7 @@ Forwarded: not-needed
else
ac_cv_header_stdc=no
fi
-@@ -4301,18 +4241,14 @@
+@@ -4301,18 +4250,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -4076,7 +4095,7 @@ Forwarded: not-needed
else
ac_cv_header_stdc=no
fi
-@@ -4322,14 +4258,10 @@
+@@ -4322,14 +4267,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -4093,7 +4112,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -4356,118 +4288,33 @@
+@@ -4356,118 +4297,33 @@
return 0;
}
_ACEOF
@@ -4224,7 +4243,7 @@ Forwarded: not-needed
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -4477,102 +4324,9 @@
+@@ -4477,102 +4333,9 @@
done
@@ -4329,7 +4348,7 @@ Forwarded: not-needed
else
cat >>confdefs.h <<_ACEOF
-@@ -4585,144 +4339,12 @@
+@@ -4585,144 +4348,12 @@
@@ -4480,7 +4499,7 @@ Forwarded: not-needed
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -4737,14 +4359,9 @@
+@@ -4737,14 +4368,9 @@
@@ -4497,7 +4516,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
ac_cv_cflags_strict_prototypes="no, unknown"
-@@ -4758,11 +4375,7 @@
+@@ -4758,11 +4384,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,%,,'`
@@ -4510,7 +4529,7 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -4773,43 +4386,16 @@
+@@ -4773,43 +4395,16 @@
return 0;
}
_ACEOF
@@ -4556,7 +4575,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#include <signal.h>
int
-@@ -4822,34 +4408,13 @@
+@@ -4822,34 +4417,13 @@
return 0;
}
_ACEOF
@@ -4593,7 +4612,7 @@ Forwarded: not-needed
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
rm config.tmp
;;
-@@ -4863,7 +4428,7 @@
+@@ -4863,7 +4437,7 @@
fi
@@ -4602,7 +4621,7 @@ Forwarded: not-needed
$as_echo "$ac_cv_cflags_strict_prototypes" >&6; }
case ".$ac_cv_cflags_strict_prototypes" in
.ok|.ok,*) ;;
-@@ -4871,25 +4436,25 @@
+@@ -4871,25 +4445,25 @@
;;
*)
if echo " $CFLAGS " | grep " $ac_cv_cflags_strict_prototypes " 2>&1 >/dev/null
@@ -4636,7 +4655,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
ac_cv_cflags_warn_all="no, unknown"
-@@ -4903,11 +4468,7 @@
+@@ -4903,11 +4477,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,%,,'`
@@ -4649,12 +4668,10 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -4916,34 +4477,11 @@
- return 0;
- ;
+@@ -4918,32 +4488,9 @@
return 0;
--}
--_ACEOF
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -4673,22 +4690,19 @@ Forwarded: not-needed
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ac_cv_cflags_warn_all=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_cflags_warn_all=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_cflags_warn_all=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
CFLAGS="$ac_save_CFLAGS"
-@@ -4955,7 +4493,7 @@
+@@ -4955,7 +4502,7 @@
fi
@@ -4697,7 +4711,7 @@ Forwarded: not-needed
$as_echo "$ac_cv_cflags_warn_all" >&6; }
case ".$ac_cv_cflags_warn_all" in
.ok|.ok,*) ;;
-@@ -4963,16 +4501,16 @@
+@@ -4963,16 +4510,16 @@
;;
*)
if echo " $wall_flags " | grep " $ac_cv_cflags_warn_all " 2>&1 >/dev/null
@@ -4720,7 +4734,7 @@ Forwarded: not-needed
wall_flags="$wall_flags $ac_cv_cflags_warn_all"
fi
;;
-@@ -4986,9 +4524,9 @@
+@@ -4986,9 +4533,9 @@
flag=`echo "$wall_flags" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
@@ -4732,7 +4746,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
-@@ -5002,14 +4540,10 @@
+@@ -5002,14 +4549,10 @@
save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $wall_flags"
@@ -4750,7 +4764,7 @@ Forwarded: not-needed
int
main ()
{
-@@ -5019,36 +4553,15 @@
+@@ -5019,36 +4562,15 @@
}
_ACEOF
@@ -4788,7 +4802,7 @@ Forwarded: not-needed
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5062,12 +4575,11 @@
+@@ -5062,12 +4584,11 @@
fi
@@ -4804,7 +4818,7 @@ Forwarded: not-needed
:
cxx_does_wall="yes"
-@@ -5079,7 +4591,6 @@
+@@ -5079,7 +4600,6 @@
fi
@@ -4812,7 +4826,7 @@ Forwarded: not-needed
if test "x$cxx_does_wall" = "xyes" ; then
CXXFLAGS="${CXXFLAGS} $wall_flags"
fi
-@@ -5090,9 +4601,9 @@
+@@ -5090,9 +4610,9 @@
flag=`echo "$wall_flags" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
@@ -4824,7 +4838,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
-@@ -5106,14 +4617,10 @@
+@@ -5106,14 +4626,10 @@
save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $wall_flags"
@@ -4842,7 +4856,7 @@ Forwarded: not-needed
int
main ()
{
-@@ -5123,36 +4630,16 @@
+@@ -5123,36 +4639,16 @@
}
_ACEOF
@@ -4881,7 +4895,7 @@ Forwarded: not-needed
CXXFLAGS="$save_CXXFLAGS"
-@@ -5165,12 +4652,11 @@
+@@ -5165,12 +4661,11 @@
fi
@@ -4897,7 +4911,7 @@ Forwarded: not-needed
:
cpp_does_wall="yes"
-@@ -5182,7 +4668,6 @@
+@@ -5182,7 +4677,6 @@
fi
@@ -4905,7 +4919,7 @@ Forwarded: not-needed
if test "x$cpp_does_wall" = "xyes" ; then
CPPFLAGS="${CPPFLAGS} $wall_flags"
fi
-@@ -5192,19 +4677,15 @@
+@@ -5192,19 +4686,15 @@
CFLAG_VISIBILITY=
HAVE_VISIBILITY=0
if test -n "$GCC"; then
@@ -4928,7 +4942,7 @@ Forwarded: not-needed
/* end confdefs.h. */
extern __attribute__((__visibility__("hidden"))) int hiddenvar;
extern __attribute__((__visibility__("default"))) int exportedvar;
-@@ -5218,37 +4699,16 @@
+@@ -5218,37 +4708,16 @@
return 0;
}
_ACEOF
@@ -4969,7 +4983,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 +4727,9 @@
+@@ -5267,9 +4736,9 @@
# Extract the first word of "wx-config", so it can be a program name with args.
set dummy wx-config; ac_word=$2
@@ -4981,7 +4995,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
case $WX_CONFIG in
-@@ -5283,14 +4743,14 @@
+@@ -5283,14 +4752,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4999,7 +5013,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
test -z "$ac_cv_path_WX_CONFIG" && ac_cv_path_WX_CONFIG="no"
-@@ -5299,18 +4759,16 @@
+@@ -5299,18 +4768,16 @@
fi
WX_CONFIG=$ac_cv_path_WX_CONFIG
if test -n "$WX_CONFIG"; then
@@ -5021,7 +5035,7 @@ Forwarded: not-needed
fi
if test "x$debug_preference" = "xyes"; then
-@@ -5322,7 +4780,7 @@
+@@ -5322,7 +4789,7 @@
wxconfigargs="$static_preference $unicode_preference $wxconfigargs $wx_preference"
wx_version=`${WX_CONFIG} $wxconfigargs --version`
@@ -5030,29 +5044,29 @@ 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 +4789,12 @@
+@@ -5331,19 +4798,12 @@
;;
*)
wx_list=`${WX_CONFIG} --list`
- { { $as_echo "$as_me:$LINENO: error: Unable to locate a suitable configuration of wxWidgets v2.8.x or higher.
--The currently available configurations are listed below. If necessary, either
--install the package for your distribution or download the latest version of
--wxWidgets
--from http://wxwidgets.org.
--${wx_list}" >&5
--$as_echo "$as_me: error: Unable to locate a suitable configuration of wxWidgets v2.8.x or higher.
+ as_fn_error $? "Unable to locate a suitable configuration of wxWidgets v2.8.x or higher.
The currently available configurations are listed below. If necessary, either
install the package for your distribution or download the latest version of
wxWidgets
from http://wxwidgets.org.
+-${wx_list}" >&5
+-$as_echo "$as_me: error: Unable to locate a suitable configuration of wxWidgets v2.8.x or higher.
+-The currently available configurations are listed below. If necessary, either
+-install the package for your distribution or download the latest version of
+-wxWidgets
+-from http://wxwidgets.org.
-${wx_list}" >&2;}
- { (exit 1); exit 1; }; }
+${wx_list}" "$LINENO" 5
esac
ac_configure_args="$ac_configure_args --with-wx-config=\"$WX_CONFIG\""
-@@ -5355,7 +4806,7 @@
+@@ -5355,7 +4815,7 @@
@@ -5061,7 +5075,7 @@ Forwarded: not-needed
LOCAL_LIBS="$LOCAL_LIBS FileDialog.a"
CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/lib-src/FileDialog"
-@@ -5366,9 +4817,9 @@
+@@ -5366,9 +4826,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
@@ -5073,7 +5087,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -5381,14 +4832,14 @@
+@@ -5381,14 +4841,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5091,7 +5105,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
;;
-@@ -5396,10 +4847,10 @@
+@@ -5396,10 +4856,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -5104,7 +5118,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -5409,9 +4860,9 @@
+@@ -5409,9 +4869,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
@@ -5116,7 +5130,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -5424,14 +4875,14 @@
+@@ -5424,14 +4884,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5134,7 +5148,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
;;
-@@ -5439,10 +4890,10 @@
+@@ -5439,10 +4899,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -5147,7 +5161,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
fi
-@@ -5451,7 +4902,7 @@
+@@ -5451,7 +4911,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5156,7 +5170,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 +4915,13 @@
+@@ -5464,13 +4924,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -5173,7 +5187,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -5529,49 +4980,9 @@
+@@ -5529,49 +4989,9 @@
fi
ax_popdir=`pwd`
@@ -5225,7 +5239,7 @@ Forwarded: not-needed
ac_builddir=.
case ""${srcdir}/lib-src/lib-widget-extra"" in
-@@ -5617,7 +5028,7 @@
+@@ -5617,7 +5037,7 @@
# This should be Cygnus configure.
ax_sub_configure=$ac_aux_dir/configure
else
@@ -5234,7 +5248,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 +5042,7 @@
+@@ -5631,7 +5051,7 @@
ax_sub_cache_file=$ac_top_build_prefix$cache_file ;;
esac
@@ -5243,7 +5257,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 +5050,25 @@
+@@ -5639,25 +5059,25 @@
fi
cd "$ax_popdir"
@@ -5274,7 +5288,7 @@ Forwarded: not-needed
pkg_cv_WIDGETEXTRA_CFLAGS=`$PKG_CONFIG --cflags "libwidgetextra" 2>/dev/null`
else
pkg_failed=yes
-@@ -5669,11 +5080,11 @@
+@@ -5669,11 +5089,11 @@
pkg_cv_WIDGETEXTRA_LIBS="$WIDGETEXTRA_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -5289,7 +5303,7 @@ Forwarded: not-needed
pkg_cv_WIDGETEXTRA_LIBS=`$PKG_CONFIG --libs "libwidgetextra" 2>/dev/null`
else
pkg_failed=yes
-@@ -5699,7 +5110,7 @@
+@@ -5699,7 +5119,7 @@
# Put the nasty error message in config.log where it belongs
echo "$WIDGETEXTRA_PKG_ERRORS" >&5
@@ -5298,7 +5312,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
widgetextra_available="no"
elif test $pkg_failed = untried; then
-@@ -5707,15 +5118,13 @@
+@@ -5707,31 +5127,29 @@
else
WIDGETEXTRA_CFLAGS=$pkg_cv_WIDGETEXTRA_CFLAGS
WIDGETEXTRA_LIBS=$pkg_cv_WIDGETEXTRA_LIBS
@@ -5316,9 +5330,11 @@ Forwarded: not-needed
fi
BUILD_LDFLAGS="$BUILD_LDFLAGS $WIDGETEXTRA_LIBS"
-@@ -5724,14 +5133,14 @@
+ CXXFLAGS="$CXXFLAGS $WIDGETEXTRA_CFLAGS"
+ LIBSRC_BUILD="$LIBSRC_BUILD widgetextra"
- LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG PORTSMF"
+-LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG PORTSMF"
++LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG PORTSMF PORTAUDIO"
-{ $as_echo "$as_me:$LINENO: Determining what libraries are available in this tree and on the system" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Determining what libraries are available in this tree and on the system" >&5
@@ -5333,7 +5349,7 @@ Forwarded: not-needed
withval=$with_libsndfile; LIBSNDFILE_ARGUMENT=$withval
else
LIBSNDFILE_ARGUMENT="unspecified"
-@@ -5741,18 +5150,18 @@
+@@ -5741,18 +5159,18 @@
pkg_failed=no
@@ -5356,7 +5372,7 @@ Forwarded: not-needed
pkg_cv_SNDFILE_CFLAGS=`$PKG_CONFIG --cflags "sndfile >= 1.0.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -5764,11 +5173,11 @@
+@@ -5764,11 +5182,11 @@
pkg_cv_SNDFILE_LIBS="$SNDFILE_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -5371,7 +5387,7 @@ Forwarded: not-needed
pkg_cv_SNDFILE_LIBS=`$PKG_CONFIG --libs "sndfile >= 1.0.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -5794,7 +5203,7 @@
+@@ -5794,7 +5212,7 @@
# Put the nasty error message in config.log where it belongs
echo "$SNDFILE_PKG_ERRORS" >&5
@@ -5380,7 +5396,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
sndfile_available_system="no"
elif test $pkg_failed = untried; then
-@@ -5802,7 +5211,7 @@
+@@ -5802,7 +5220,7 @@
else
SNDFILE_CFLAGS=$pkg_cv_SNDFILE_CFLAGS
SNDFILE_LIBS=$pkg_cv_SNDFILE_LIBS
@@ -5389,7 +5405,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
sndfile_available_system="yes"
fi
-@@ -5811,38 +5220,33 @@
+@@ -5811,38 +5229,33 @@
LIBSNDFILE_SYSTEM_AVAILABLE="yes"
LIBSNDFILE_SYSTEM_LIBS=$SNDFILE_LIBS
LIBSNDFILE_SYSTEM_CXXFLAGS=$SNDFILE_CFLAGS
@@ -5436,7 +5452,7 @@ Forwarded: not-needed
libsndfile_found="yes"
else
libsndfile_found="no"
-@@ -5854,14 +5258,14 @@
+@@ -5854,14 +5267,14 @@
LIBSNDFILE_LOCAL_LIBS="libsndfile.a"
LIBSNDFILE_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libsndfile/src'
LIBSNDFILE_LOCAL_CONFIG_SUBDIRS="lib-src/libsndfile"
@@ -5453,7 +5469,7 @@ Forwarded: not-needed
$as_echo "$as_me: libsndfile libraries are NOT available in this source tree" >&6;}
fi
-@@ -5870,7 +5274,7 @@
+@@ -5870,7 +5283,7 @@
# Check whether --with-expat was given.
@@ -5462,7 +5478,7 @@ Forwarded: not-needed
withval=$with_expat; LIBEXPAT_ARGUMENT=$withval
else
LIBEXPAT_ARGUMENT="unspecified"
-@@ -5878,18 +5282,14 @@
+@@ -5878,18 +5291,14 @@
@@ -5484,7 +5500,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -5907,43 +5307,18 @@
+@@ -5907,43 +5316,18 @@
return 0;
}
_ACEOF
@@ -5534,7 +5550,7 @@ Forwarded: not-needed
libexpat_found="yes"
else
libexpat_found="no"
-@@ -5952,134 +5327,8 @@
+@@ -5952,134 +5336,8 @@
expat_h_found="no"
@@ -5671,7 +5687,7 @@ Forwarded: not-needed
expat_h_found="yes"
else
expat_h_found="no"
-@@ -6091,38 +5340,33 @@
+@@ -6091,38 +5349,33 @@
LIBEXPAT_SYSTEM_AVAILABLE="yes"
LIBEXPAT_SYSTEM_LIBS="-lexpat"
LIBEXPAT_SYSTEM_CPPSYMBOLS="USE_SYSTEM_EXPAT"
@@ -5718,7 +5734,7 @@ Forwarded: not-needed
xmlparse_h_found="yes"
else
xmlparse_h_found="no"
-@@ -6135,11 +5379,11 @@
+@@ -6135,11 +5388,11 @@
LIBEXPAT_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/expat'
LIBEXPAT_LOCAL_CPPSYMBOLS="USE_LOCAL_EXPAT"
@@ -5732,7 +5748,7 @@ Forwarded: not-needed
$as_echo "$as_me: Expat libraries are NOT available in the local tree" >&6;}
fi
-@@ -6147,7 +5391,7 @@
+@@ -6147,7 +5400,7 @@
# Check whether --with-libsamplerate was given.
@@ -5741,7 +5757,7 @@ Forwarded: not-needed
withval=$with_libsamplerate; LIBSAMPLERATE_ARGUMENT=$withval
else
LIBSAMPLERATE_ARGUMENT="unspecified"
-@@ -6156,27 +5400,25 @@
+@@ -6156,27 +5409,25 @@
if false ; then
@@ -5774,7 +5790,7 @@ Forwarded: not-needed
pkg_cv_SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate >= 0.1.2" 2>/dev/null`
else
pkg_failed=yes
-@@ -6188,11 +5430,11 @@
+@@ -6188,11 +5439,11 @@
pkg_cv_SAMPLERATE_LIBS="$SAMPLERATE_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -5789,7 +5805,7 @@ Forwarded: not-needed
pkg_cv_SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate >= 0.1.2" 2>/dev/null`
else
pkg_failed=yes
-@@ -6218,7 +5460,7 @@
+@@ -6218,7 +5469,7 @@
# Put the nasty error message in config.log where it belongs
echo "$SAMPLERATE_PKG_ERRORS" >&5
@@ -5798,7 +5814,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
samplerate_available_system="no"
elif test $pkg_failed = untried; then
-@@ -6226,7 +5468,7 @@
+@@ -6226,7 +5477,7 @@
else
SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS
SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS
@@ -5807,7 +5823,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
samplerate_available_system="yes"
fi
-@@ -6236,38 +5478,33 @@
+@@ -6236,38 +5487,33 @@
LIBSAMPLERATE_SYSTEM_LIBS=$SAMPLERATE_LIBS
LIBSAMPLERATE_SYSTEM_CXXFLAGS=$SAMPLERATE_CFLAGS
LIBSAMPLERATE_SYSTEM_CPPSYMBOLS="USE_LIBSAMPLERATE"
@@ -5854,7 +5870,7 @@ Forwarded: not-needed
samplerate_h_found="yes"
else
samplerate_h_found="no"
-@@ -6283,11 +5520,11 @@
+@@ -6283,11 +5529,11 @@
if test ! -f lib-src/libsamplerate/Makefile ; then
LIBSAMPLERATE_LOCAL_CONFIG_SUBDIRS="lib-src/libsamplerate"
fi
@@ -5868,7 +5884,7 @@ Forwarded: not-needed
$as_echo "$as_me: libsamplerate libraries are NOT available in the local tree" >&6;}
fi
-@@ -6295,7 +5532,7 @@
+@@ -6295,7 +5541,7 @@
# Check whether --with-libresample was given.
@@ -5877,7 +5893,7 @@ Forwarded: not-needed
withval=$with_libresample; LIBRESAMPLE_ARGUMENT=$withval
else
LIBRESAMPLE_ARGUMENT="unspecified"
-@@ -6304,9 +5541,7 @@
+@@ -6304,9 +5550,7 @@
if false ; then
@@ -5888,7 +5904,7 @@ Forwarded: not-needed
fi
-@@ -6316,28 +5551,23 @@
+@@ -6316,28 +5560,23 @@
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libresample/include/libresample.h" | $as_tr_sh`
@@ -5923,7 +5939,7 @@ Forwarded: not-needed
resample_h_found="yes"
else
resample_h_found="no"
-@@ -6353,11 +5583,11 @@
+@@ -6353,11 +5592,11 @@
if test ! -f lib-src/libresample/Makefile ; then
LIBRESAMPLE_LOCAL_CONFIG_SUBDIRS="lib-src/libresample"
fi
@@ -5937,7 +5953,7 @@ Forwarded: not-needed
$as_echo "$as_me: libresample libraries are NOT available in the local tree" >&6;}
fi
-@@ -6365,15 +5595,13 @@
+@@ -6365,15 +5604,13 @@
if false ; then
@@ -5955,39 +5971,32 @@ Forwarded: not-needed
withval=$with_libvorbis; LIBVORBIS_ARGUMENT=$withval
else
LIBVORBIS_ARGUMENT="unspecified"
-@@ -6381,206 +5609,51 @@
+@@ -6381,18 +5618,14 @@
- { $as_echo "$as_me:$LINENO: checking for vorbis_bitrate_addblock in -lvorbisfile" >&5
--$as_echo_n "checking for vorbis_bitrate_addblock in -lvorbisfile... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vorbis_bitrate_addblock in -lvorbisfile" >&5
+ $as_echo_n "checking for vorbis_bitrate_addblock in -lvorbisfile... " >&6; }
-if test "${ac_cv_lib_vorbisfile_vorbis_bitrate_addblock+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lvorbisfile -lvorbis -logg $LIBS"
++if test "${ac_cv_lib_vorbisfile_vorbis_bitrate_addblock+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lvorbisfile -lvorbis -logg $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char vorbis_bitrate_addblock ();
--int
--main ()
--{
--return vorbis_bitrate_addblock ();
-- ;
-- return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -6410,177 +5643,26 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -6009,28 +6018,34 @@ Forwarded: not-needed
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=yes
--else
++if ac_fn_cxx_try_link "$LINENO"; then :
+ ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=no
--fi
++ ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=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_vorbisfile_vorbis_bitrate_addblock" >&5
--$as_echo "$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&5
+ $as_echo "$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&6; }
-if test "x$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" = x""yes; then
-- lib_found="yes"
--else
-- lib_found="no"
--fi
--
--
++if test "x$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" = x""yes; then :
+ lib_found="yes"
+ else
+ lib_found="no"
+ fi
+
+
- if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for vorbis/vorbisfile.h" >&5
-$as_echo_n "checking for vorbis/vorbisfile.h... " >&6; }
@@ -6150,60 +6165,21 @@ Forwarded: not-needed
-{ $as_echo "$as_me:$LINENO: checking for vorbis/vorbisfile.h" >&5
-$as_echo_n "checking for vorbis/vorbisfile.h... " >&6; }
-if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vorbis_bitrate_addblock in -lvorbisfile" >&5
-+$as_echo_n "checking for vorbis_bitrate_addblock in -lvorbisfile... " >&6; }
-+if test "${ac_cv_lib_vorbisfile_vorbis_bitrate_addblock+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- ac_cv_header_vorbis_vorbisfile_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_vorbis_vorbisfile_h" >&5
-$as_echo "$ac_cv_header_vorbis_vorbisfile_h" >&6; }
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lvorbisfile -lvorbis -logg $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char vorbis_bitrate_addblock ();
-+int
-+main ()
-+{
-+return vorbis_bitrate_addblock ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_link "$LINENO"; then :
-+ ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=yes
-+else
-+ ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&5
-+$as_echo "$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&6; }
-+if test "x$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" = x""yes; then :
-+ lib_found="yes"
-+else
-+ lib_found="no"
- fi
+-
+-fi
-if test "x$ac_cv_header_vorbis_vorbisfile_h" = x""yes; then
-+
-+
+ ac_fn_cxx_check_header_mongrel "$LINENO" "vorbis/vorbisfile.h" "ac_cv_header_vorbis_vorbisfile_h" "$ac_includes_default"
+if test "x$ac_cv_header_vorbis_vorbisfile_h" = x""yes; then :
header_found="yes"
else
header_found="no"
-@@ -6592,38 +5665,33 @@
+@@ -6592,38 +5674,33 @@
LIBVORBIS_SYSTEM_AVAILABLE="yes"
LIBVORBIS_SYSTEM_LIBS="-lvorbisenc -lvorbisfile -lvorbis -logg"
LIBVORBIS_SYSTEM_CPPSYMBOLS="USE_LIBVORBIS"
@@ -6250,7 +6226,7 @@ Forwarded: not-needed
vorbisenc_h_available="yes"
else
vorbisenc_h_available="no"
-@@ -6631,28 +5699,23 @@
+@@ -6631,28 +5708,23 @@
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libogg/include/ogg/ogg.h" | $as_tr_sh`
@@ -6285,7 +6261,7 @@ Forwarded: not-needed
ogg_h_available="yes"
else
ogg_h_available="no"
-@@ -6670,10 +5733,10 @@
+@@ -6670,10 +5742,10 @@
LIBVORBIS_LOCAL_CPPSYMBOLS="USE_LIBVORBIS"
LIBVORBIS_LOCAL_CONFIG_SUBDIRS="lib-src/libogg lib-src/libvorbis"
@@ -6298,7 +6274,7 @@ Forwarded: not-needed
$as_echo "$as_me: Vorbis libraries are NOT available in this source tree" >&6;}
fi
-@@ -6681,15 +5744,13 @@
+@@ -6681,15 +5753,13 @@
if false ; then
@@ -6316,7 +6292,7 @@ Forwarded: not-needed
withval=$with_libmad; LIBMAD_ARGUMENT=$withval
else
LIBMAD_ARGUMENT="unspecified"
-@@ -6699,18 +5760,18 @@
+@@ -6699,18 +5769,18 @@
pkg_failed=no
@@ -6339,7 +6315,7 @@ Forwarded: not-needed
pkg_cv_LIBMAD_CFLAGS=`$PKG_CONFIG --cflags "mad >= 0.14.2b" 2>/dev/null`
else
pkg_failed=yes
-@@ -6722,11 +5783,11 @@
+@@ -6722,11 +5792,11 @@
pkg_cv_LIBMAD_LIBS="$LIBMAD_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -6354,7 +6330,7 @@ Forwarded: not-needed
pkg_cv_LIBMAD_LIBS=`$PKG_CONFIG --libs "mad >= 0.14.2b" 2>/dev/null`
else
pkg_failed=yes
-@@ -6752,7 +5813,7 @@
+@@ -6752,7 +5822,7 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBMAD_PKG_ERRORS" >&5
@@ -6363,7 +6339,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
libmad_available_system="no"
elif test $pkg_failed = untried; then
-@@ -6760,24 +5821,20 @@
+@@ -6760,24 +5830,20 @@
else
LIBMAD_CFLAGS=$pkg_cv_LIBMAD_CFLAGS
LIBMAD_LIBS=$pkg_cv_LIBMAD_LIBS
@@ -6392,10 +6368,12 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -6795,43 +5852,18 @@
+@@ -6793,45 +5859,20 @@
+ return mad_decoder_init ();
+ ;
return 0;
- }
- _ACEOF
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -6417,6 +6395,8 @@ Forwarded: not-needed
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
++}
++_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
ac_cv_lib_mad_mad_decoder_init=yes
else
@@ -6442,7 +6422,7 @@ Forwarded: not-needed
libmad_found="yes"
else
libmad_found="no"
-@@ -6839,7 +5871,7 @@
+@@ -6839,7 +5880,7 @@
if test "x$libmad_available_system" = "xyes" && test "x$libmad_found" = "xno" ; then
@@ -6451,7 +6431,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 +5880,32 @@
+@@ -6848,37 +5889,32 @@
LIBMAD_SYSTEM_LIBS="$LIBMAD_LIBS"
LIBMAD_SYSTEM_CXXFLAGS="$LIBMAD_CFLAGS"
LIBMAD_SYSTEM_CPPSYMBOLS="USE_LIBMAD"
@@ -6497,7 +6477,7 @@ Forwarded: not-needed
frame_h_found="yes"
else
frame_h_found="no"
-@@ -6891,11 +5918,11 @@
+@@ -6891,11 +5927,11 @@
LIBMAD_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libmad'
LIBMAD_LOCAL_CPPSYMBOLS="USE_LIBMAD"
LIBMAD_LOCAL_CONFIG_SUBDIRS="lib-src/libmad"
@@ -6511,7 +6491,7 @@ Forwarded: not-needed
$as_echo "$as_me: libmad libraries are NOT available in the local tree" >&6;}
fi
-@@ -6903,15 +5930,13 @@
+@@ -6903,15 +5939,13 @@
if false ; then
@@ -6529,7 +6509,7 @@ Forwarded: not-needed
withval=$with_libflac; LIBFLAC_ARGUMENT=$withval
else
LIBFLAC_ARGUMENT="unspecified"
-@@ -6919,18 +5944,14 @@
+@@ -6919,18 +5953,14 @@
@@ -6551,7 +6531,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -6948,177 +5969,26 @@
+@@ -6948,177 +5978,26 @@
return 0;
}
_ACEOF
@@ -6737,7 +6717,7 @@ Forwarded: not-needed
header_found="yes"
else
header_found="no"
-@@ -7132,38 +6002,33 @@
+@@ -7132,38 +6011,33 @@
LIBFLAC_SYSTEM_CPPSYMBOLS="USE_LIBFLAC"
# this file shouldn't be built at if no libflac is available
LIBFLAC_SYSTEM_OPTOBJS="ondemand/ODDecodeFlacTask.o"
@@ -6784,7 +6764,7 @@ Forwarded: not-needed
flac_h_available="yes"
else
flac_h_available="no"
-@@ -7171,28 +6036,23 @@
+@@ -7171,28 +6045,23 @@
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" | $as_tr_sh`
@@ -6819,7 +6799,7 @@ Forwarded: not-needed
flacpp_h_available="yes"
else
flacpp_h_available="no"
-@@ -7212,10 +6072,10 @@
+@@ -7212,10 +6081,10 @@
LIBFLAC_LOCAL_OPTOBJS="ondemand/ODDecodeFlacTask.o"
LIBFLAC_LOCAL_CONFIG_SUBDIRS="lib-src/libflac"
@@ -6832,7 +6812,7 @@ Forwarded: not-needed
$as_echo "$as_me: FLAC libraries are NOT available in this source tree" >&6;}
fi
-@@ -7223,7 +6083,7 @@
+@@ -7223,7 +6092,7 @@
# Check whether --with-libid3tag was given.
@@ -6841,7 +6821,7 @@ Forwarded: not-needed
withval=$with_libid3tag; LIBID3TAG_ARGUMENT=$withval
else
LIBID3TAG_ARGUMENT="unspecified"
-@@ -7232,25 +6092,19 @@
+@@ -7232,25 +6101,19 @@
if false ; then
@@ -6871,7 +6851,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -7268,177 +6122,26 @@
+@@ -7268,177 +6131,26 @@
return 0;
}
_ACEOF
@@ -7057,7 +7037,7 @@ Forwarded: not-needed
id3tag_h_found="yes"
else
id3tag_h_found="no"
-@@ -7450,38 +6153,33 @@
+@@ -7450,38 +6162,33 @@
LIBID3TAG_SYSTEM_AVAILABLE="yes"
LIBID3TAG_SYSTEM_LIBS=-lid3tag
LIBID3TAG_SYSTEM_CPPSYMBOLS="USE_LIBID3TAG"
@@ -7104,7 +7084,7 @@ Forwarded: not-needed
frame_h_found="yes"
else
frame_h_found="no"
-@@ -7495,18 +6193,18 @@
+@@ -7495,18 +6202,18 @@
LIBID3TAG_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libid3tag'
LIBID3TAG_LOCAL_CPPSYMBOLS="USE_LIBID3TAG"
LIBID3TAG_LOCAL_CONFIG_SUBDIRS="lib-src/libid3tag"
@@ -7126,7 +7106,7 @@ Forwarded: not-needed
withval=$with_sbsms; LIBSBSMS_ARGUMENT=$withval
else
LIBSBSMS_ARGUMENT="unspecified"
-@@ -7515,27 +6213,25 @@
+@@ -7515,27 +6222,25 @@
if false ; then
@@ -7159,7 +7139,7 @@ Forwarded: not-needed
pkg_cv_SBSMS_CFLAGS=`$PKG_CONFIG --cflags "sbsms >= 1.6.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -7547,11 +6243,11 @@
+@@ -7547,11 +6252,11 @@
pkg_cv_SBSMS_LIBS="$SBSMS_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -7174,7 +7154,7 @@ Forwarded: not-needed
pkg_cv_SBSMS_LIBS=`$PKG_CONFIG --libs "sbsms >= 1.6.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -7577,7 +6273,7 @@
+@@ -7577,7 +6282,7 @@
# Put the nasty error message in config.log where it belongs
echo "$SBSMS_PKG_ERRORS" >&5
@@ -7183,7 +7163,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
sbsms_available_system="no"
elif test $pkg_failed = untried; then
-@@ -7585,7 +6281,7 @@
+@@ -7585,7 +6290,7 @@
else
SBSMS_CFLAGS=$pkg_cv_SBSMS_CFLAGS
SBSMS_LIBS=$pkg_cv_SBSMS_LIBS
@@ -7192,7 +7172,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
sbsms_available_system="yes"
fi
-@@ -7596,38 +6292,33 @@
+@@ -7596,38 +6301,33 @@
LIBSBSMS_SYSTEM_LIBS=$SBSMS_LIBS
LIBSBSMS_SYSTEM_CXXFLAGS=$SBSMS_CFLAGS
LIBSBSMS_SYSTEM_CPPSYMBOLS="USE_SBSMS"
@@ -7239,7 +7219,7 @@ Forwarded: not-needed
sbsms_h_found="yes"
else
sbsms_h_found="no"
-@@ -7643,11 +6334,11 @@
+@@ -7643,11 +6343,11 @@
LIBSBSMS_LOCAL_CONFIG_SUBDIRS="lib-src/sbsms"
ac_configure_args="$ac_configure_args --disable-programs"
@@ -7253,7 +7233,7 @@ Forwarded: not-needed
$as_echo "$as_me: libsbsms libraries are NOT available in the local tree" >&6;}
fi
-@@ -7655,7 +6346,7 @@
+@@ -7655,7 +6355,7 @@
# Check whether --with-soundtouch was given.
@@ -7262,7 +7242,7 @@ Forwarded: not-needed
withval=$with_soundtouch; LIBSOUNDTOUCH_ARGUMENT=$withval
else
LIBSOUNDTOUCH_ARGUMENT="unspecified"
-@@ -7664,27 +6355,25 @@
+@@ -7664,27 +6364,25 @@
if false ; then
@@ -7295,7 +7275,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 +6385,11 @@
+@@ -7696,11 +6394,11 @@
pkg_cv_SOUNDTOUCH_LIBS="$SOUNDTOUCH_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -7310,7 +7290,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 +6415,7 @@
+@@ -7726,7 +6424,7 @@
# Put the nasty error message in config.log where it belongs
echo "$SOUNDTOUCH_PKG_ERRORS" >&5
@@ -7319,7 +7299,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
soundtouch_available_system="no"
elif test $pkg_failed = untried; then
-@@ -7734,25 +6423,25 @@
+@@ -7734,25 +6432,25 @@
else
SOUNDTOUCH_CFLAGS=$pkg_cv_SOUNDTOUCH_CFLAGS
SOUNDTOUCH_LIBS=$pkg_cv_SOUNDTOUCH_LIBS
@@ -7350,7 +7330,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 +6453,11 @@
+@@ -7764,11 +6462,11 @@
pkg_cv_SOUNDTOUCH_LIBS="$SOUNDTOUCH_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -7365,7 +7345,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 +6483,7 @@
+@@ -7794,7 +6492,7 @@
# Put the nasty error message in config.log where it belongs
echo "$SOUNDTOUCH_PKG_ERRORS" >&5
@@ -7374,7 +7354,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
soundtouch_available_system="no"
elif test $pkg_failed = untried; then
-@@ -7802,7 +6491,7 @@
+@@ -7802,7 +6500,7 @@
else
SOUNDTOUCH_CFLAGS=$pkg_cv_SOUNDTOUCH_CFLAGS
SOUNDTOUCH_LIBS=$pkg_cv_SOUNDTOUCH_LIBS
@@ -7383,7 +7363,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
soundtouch_available_system="yes"
fi
-@@ -7813,38 +6502,33 @@
+@@ -7813,38 +6511,33 @@
LIBSOUNDTOUCH_SYSTEM_LIBS=$SOUNDTOUCH_LIBS
LIBSOUNDTOUCH_SYSTEM_CXXFLAGS=$SOUNDTOUCH_CFLAGS
LIBSOUNDTOUCH_SYSTEM_CPPSYMBOLS="USE_SOUNDTOUCH"
@@ -7430,7 +7410,7 @@ Forwarded: not-needed
soundtouch_h_found="yes"
else
soundtouch_h_found="no"
-@@ -7857,18 +6541,18 @@
+@@ -7857,18 +6550,18 @@
LIBSOUNDTOUCH_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/soundtouch/include'
LIBSOUNDTOUCH_LOCAL_CPPSYMBOLS="USE_SOUNDTOUCH"
LIBSOUNDTOUCH_LOCAL_CONFIG_SUBDIRS="lib-src/soundtouch"
@@ -7452,7 +7432,7 @@ Forwarded: not-needed
enableval=$enable_nyquist; LIBNYQUIST_ARGUMENT=$enableval
else
LIBNYQUIST_ARGUMENT="unspecified"
-@@ -7877,9 +6561,7 @@
+@@ -7877,9 +6570,7 @@
if false ; then
@@ -7463,7 +7443,7 @@ Forwarded: not-needed
fi
-@@ -7887,28 +6569,23 @@
+@@ -7887,28 +6578,23 @@
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libnyquist/nyx.h" | $as_tr_sh`
@@ -7498,7 +7478,7 @@ Forwarded: not-needed
nyx_h_found="yes"
else
nyx_h_found="no"
-@@ -7925,18 +6602,18 @@
+@@ -7925,18 +6611,18 @@
LIBNYQUIST_LOCAL_CONFIG_SUBDIRS="lib-src/libnyquist"
@@ -7520,7 +7500,7 @@ Forwarded: not-needed
withval=$with_libvamp; LIBVAMP_ARGUMENT=$withval
else
LIBVAMP_ARGUMENT="unspecified"
-@@ -7945,27 +6622,25 @@
+@@ -7945,27 +6631,25 @@
if false ; then
@@ -7553,7 +7533,7 @@ Forwarded: not-needed
pkg_cv_VAMP_CFLAGS=`$PKG_CONFIG --cflags "vamp-hostsdk >= 2.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -7977,11 +6652,11 @@
+@@ -7977,11 +6661,11 @@
pkg_cv_VAMP_LIBS="$VAMP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -7568,7 +7548,7 @@ Forwarded: not-needed
pkg_cv_VAMP_LIBS=`$PKG_CONFIG --libs "vamp-hostsdk >= 2.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -8007,7 +6682,7 @@
+@@ -8007,7 +6691,7 @@
# Put the nasty error message in config.log where it belongs
echo "$VAMP_PKG_ERRORS" >&5
@@ -7577,7 +7557,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
vamp_available_system="no"
elif test $pkg_failed = untried; then
-@@ -8015,7 +6690,7 @@
+@@ -8015,7 +6699,7 @@
else
VAMP_CFLAGS=$pkg_cv_VAMP_CFLAGS
VAMP_LIBS=$pkg_cv_VAMP_LIBS
@@ -7586,7 +7566,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
vamp_available_system="yes"
fi
-@@ -8026,38 +6701,33 @@
+@@ -8026,38 +6710,33 @@
LIBVAMP_SYSTEM_CXXFLAGS=$VAMP_CFLAGS
LIBVAMP_SYSTEM_OPTOBJS="effects/vamp/VampEffect.o effects/vamp/LoadVamp.o"
LIBVAMP_SYSTEM_CPPSYMBOLS="USE_VAMP"
@@ -7633,7 +7613,7 @@ Forwarded: not-needed
vamp_h_found="yes"
else
vamp_h_found="no"
-@@ -8074,18 +6744,18 @@
+@@ -8074,18 +6753,18 @@
LIBVAMP_LOCAL_CONFIG_SUBDIRS="lib-src/libvamp"
ac_configure_args="$ac_configure_args --disable-programs"
@@ -7655,7 +7635,7 @@ Forwarded: not-needed
withval=$with_libtwolame; LIBTWOLAME_ARGUMENT=$withval
else
LIBTWOLAME_ARGUMENT="unspecified"
-@@ -8094,27 +6764,25 @@
+@@ -8094,27 +6773,25 @@
if false ; then
@@ -7688,7 +7668,7 @@ Forwarded: not-needed
pkg_cv_LIBTWOLAME_CFLAGS=`$PKG_CONFIG --cflags "twolame >= 0.3.9" 2>/dev/null`
else
pkg_failed=yes
-@@ -8126,11 +6794,11 @@
+@@ -8126,11 +6803,11 @@
pkg_cv_LIBTWOLAME_LIBS="$LIBTWOLAME_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -7703,7 +7683,7 @@ Forwarded: not-needed
pkg_cv_LIBTWOLAME_LIBS=`$PKG_CONFIG --libs "twolame >= 0.3.9" 2>/dev/null`
else
pkg_failed=yes
-@@ -8156,7 +6824,7 @@
+@@ -8156,7 +6833,7 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBTWOLAME_PKG_ERRORS" >&5
@@ -7712,7 +7692,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
twolame_available_system="no"
elif test $pkg_failed = untried; then
-@@ -8164,7 +6832,7 @@
+@@ -8164,7 +6841,7 @@
else
LIBTWOLAME_CFLAGS=$pkg_cv_LIBTWOLAME_CFLAGS
LIBTWOLAME_LIBS=$pkg_cv_LIBTWOLAME_LIBS
@@ -7721,7 +7701,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
twolame_available_system="yes"
fi
-@@ -8174,38 +6842,33 @@
+@@ -8174,38 +6851,33 @@
LIBTWOLAME_SYSTEM_LIBS=$LIBTWOLAME_LIBS
LIBTWOLAME_SYSTEM_CXXFLAGS=$LIBTWOLAME_CFLAGS
LIBTWOLAME_SYSTEM_CPPSYMBOLS="USE_LIBTWOLAME"
@@ -7768,7 +7748,7 @@ Forwarded: not-needed
twolame_h_found="yes"
else
twolame_h_found="no"
-@@ -8221,18 +6884,18 @@
+@@ -8221,18 +6893,18 @@
LIBTWOLAME_LOCAL_CONFIG_SUBDIRS="lib-src/twolame"
ac_configure_args="$ac_configure_args --disable-programs"
@@ -7790,7 +7770,7 @@ Forwarded: not-needed
withval=$with_ffmpeg; FFMPEG_ARGUMENT=$withval
else
FFMPEG_ARGUMENT="unspecified"
-@@ -8241,27 +6904,25 @@
+@@ -8241,27 +6913,25 @@
if false ; then
@@ -7823,7 +7803,7 @@ Forwarded: not-needed
pkg_cv_AVCODEC_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 51.53" 2>/dev/null`
else
pkg_failed=yes
-@@ -8273,11 +6934,11 @@
+@@ -8273,11 +6943,11 @@
pkg_cv_AVCODEC_LIBS="$AVCODEC_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -7838,187 +7818,146 @@ Forwarded: not-needed
pkg_cv_AVCODEC_LIBS=`$PKG_CONFIG --libs "libavcodec >= 51.53" 2>/dev/null`
else
pkg_failed=yes
-@@ -8298,54 +6959,121 @@
- if test $_pkg_short_errors_supported = yes; then
- AVCODEC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavcodec >= 51.53" 2>&1`
- else
-- AVCODEC_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavcodec >= 51.53" 2>&1`
-+ AVCODEC_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavcodec >= 51.53" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$AVCODEC_PKG_ERRORS" >&5
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ avcodec_available_system="no"
-+elif test $pkg_failed = untried; then
-+ avcodec_available_system="no"
-+else
-+ AVCODEC_CFLAGS=$pkg_cv_AVCODEC_CFLAGS
-+ AVCODEC_LIBS=$pkg_cv_AVCODEC_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ avcodec_available_system="yes"
-+fi
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVFORMAT" >&5
-+$as_echo_n "checking for AVFORMAT... " >&6; }
-+
-+if test -n "$AVFORMAT_CFLAGS"; then
-+ pkg_cv_AVFORMAT_CFLAGS="$AVFORMAT_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libavformat >= 52.12") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_AVFORMAT_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 52.12" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$AVFORMAT_LIBS"; then
-+ pkg_cv_AVFORMAT_LIBS="$AVFORMAT_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libavformat >= 52.12") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_AVFORMAT_LIBS=`$PKG_CONFIG --libs "libavformat >= 52.12" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ AVFORMAT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavformat >= 52.12" 2>&1`
-+ else
-+ AVFORMAT_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavformat >= 52.12" 2>&1`
- fi
+@@ -8303,7 +6973,7 @@
# Put the nasty error message in config.log where it belongs
-- echo "$AVCODEC_PKG_ERRORS" >&5
-+ echo "$AVFORMAT_PKG_ERRORS" >&5
+ echo "$AVCODEC_PKG_ERRORS" >&5
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-- avcodec_available_system="no"
-+ avformat_available_system="no"
+ avcodec_available_system="no"
elif test $pkg_failed = untried; then
-- avcodec_available_system="no"
-+ avformat_available_system="no"
+@@ -8311,24 +6981,24 @@
else
-- AVCODEC_CFLAGS=$pkg_cv_AVCODEC_CFLAGS
-- AVCODEC_LIBS=$pkg_cv_AVCODEC_LIBS
+ AVCODEC_CFLAGS=$pkg_cv_AVCODEC_CFLAGS
+ AVCODEC_LIBS=$pkg_cv_AVCODEC_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ AVFORMAT_CFLAGS=$pkg_cv_AVFORMAT_CFLAGS
-+ AVFORMAT_LIBS=$pkg_cv_AVFORMAT_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-- avcodec_available_system="yes"
-+ avformat_available_system="yes"
+ avcodec_available_system="yes"
fi
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for AVFORMAT" >&5
--$as_echo_n "checking for AVFORMAT... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVUTIL" >&5
-+$as_echo_n "checking for AVUTIL... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVFORMAT" >&5
+ $as_echo_n "checking for AVFORMAT... " >&6; }
--if test -n "$AVFORMAT_CFLAGS"; then
-- pkg_cv_AVFORMAT_CFLAGS="$AVFORMAT_CFLAGS"
-+if test -n "$AVUTIL_CFLAGS"; then
-+ pkg_cv_AVUTIL_CFLAGS="$AVUTIL_CFLAGS"
+ if test -n "$AVFORMAT_CFLAGS"; then
+ pkg_cv_AVFORMAT_CFLAGS="$AVFORMAT_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\"") >&5
-- ($PKG_CONFIG --exists --print-errors "libavformat >= 52.12") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavutil\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libavutil") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libavformat >= 52.12") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_AVFORMAT_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 52.12" 2>/dev/null`
+ $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`
+ pkg_cv_AVFORMAT_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 52.12" 2>/dev/null`
else
pkg_failed=yes
- fi
- else
- pkg_failed=untried
- fi
--if test -n "$AVFORMAT_LIBS"; then
-- pkg_cv_AVFORMAT_LIBS="$AVFORMAT_LIBS"
-+if test -n "$AVUTIL_LIBS"; then
-+ pkg_cv_AVUTIL_LIBS="$AVUTIL_LIBS"
+@@ -8340,11 +7010,11 @@
+ pkg_cv_AVFORMAT_LIBS="$AVFORMAT_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\"") >&5
-- ($PKG_CONFIG --exists --print-errors "libavformat >= 52.12") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavutil\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libavutil") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libavformat >= 52.12") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_AVFORMAT_LIBS=`$PKG_CONFIG --libs "libavformat >= 52.12" 2>/dev/null`
+ $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`
+ pkg_cv_AVFORMAT_LIBS=`$PKG_CONFIG --libs "libavformat >= 52.12" 2>/dev/null`
else
pkg_failed=yes
- fi
-@@ -8363,67 +7091,70 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- AVFORMAT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavformat >= 52.12" 2>&1`
-+ AVUTIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavutil" 2>&1`
- else
-- AVFORMAT_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavformat >= 52.12" 2>&1`
-+ AVUTIL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavutil" 2>&1`
- fi
+@@ -8370,7 +7040,7 @@
# Put the nasty error message in config.log where it belongs
-- echo "$AVFORMAT_PKG_ERRORS" >&5
-+ echo "$AVUTIL_PKG_ERRORS" >&5
+ echo "$AVFORMAT_PKG_ERRORS" >&5
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-- avformat_available_system="no"
-+ libavutil_available_system="no"
+ avformat_available_system="no"
elif test $pkg_failed = untried; then
-- avformat_available_system="no"
-+ libavutil_available_system="no"
+@@ -8378,52 +7048,122 @@
else
-- AVFORMAT_CFLAGS=$pkg_cv_AVFORMAT_CFLAGS
-- AVFORMAT_LIBS=$pkg_cv_AVFORMAT_LIBS
+ AVFORMAT_CFLAGS=$pkg_cv_AVFORMAT_CFLAGS
+ AVFORMAT_LIBS=$pkg_cv_AVFORMAT_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ 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; }
-- avformat_available_system="yes"
-+ libavutil_available_system="yes"
+ avformat_available_system="yes"
fi
++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
++
++
++
++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
@@ -8084,7 +8023,7 @@ Forwarded: not-needed
avcodec_h_found="yes"
else
avcodec_h_found="no"
-@@ -8431,28 +7162,23 @@
+@@ -8431,28 +7171,23 @@
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" | $as_tr_sh`
@@ -8119,7 +8058,7 @@ Forwarded: not-needed
avformat_h_found="yes"
else
avformat_h_found="no"
-@@ -8467,12 +7193,12 @@
+@@ -8467,12 +7202,12 @@
FFMPEG_LOCAL_CPPSYMBOLS="USE_FFMPEG"
FFMPEG_LOCAL_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
export/ExportFFmpegDialogs.o"
@@ -8134,7 +8073,7 @@ Forwarded: not-needed
$as_echo "$as_me: ffmpeg library is NOT available in the local tree" >&6;}
fi
-@@ -8480,18 +7206,100 @@
+@@ -8480,18 +7215,100 @@
# Check whether --with-midi was given.
@@ -8145,12 +8084,15 @@ Forwarded: not-needed
PORTSMF_ARGUMENT="unspecified"
fi
-+
- if false ; then
-
+- if false ; then
+-
-cat >>confdefs.h <<\_ACEOF
-#define USE_MIDI 1
-_ACEOF
+-
++
++ if false ; then
++
+$as_echo "#define USE_MIDI 1" >>confdefs.h
+
+ fi
@@ -8223,7 +8165,7 @@ Forwarded: not-needed
+$as_echo "yes" >&6; }
+ portsmf_available_system="yes"
+fi
-
++
+ if test "x$portsmf_available_system" = "xyes" ; then
+ PORTSMF_SYSTEM_AVAILABLE="yes"
+ PORTSMF_SYSTEM_LIBS="$PORTSMF_LIBS"
@@ -8239,7 +8181,7 @@ Forwarded: not-needed
fi
if test -d ${srcdir}/lib-src/portsmf ; then
-@@ -8547,49 +7355,9 @@
+@@ -8547,49 +7364,9 @@
fi
ax_popdir=`pwd`
@@ -8291,7 +8233,7 @@ Forwarded: not-needed
ac_builddir=.
case ""${srcdir}/lib-src/portsmf"" in
-@@ -8635,7 +7403,7 @@
+@@ -8635,7 +7412,7 @@
# This should be Cygnus configure.
ax_sub_configure=$ac_aux_dir/configure
else
@@ -8300,7 +8242,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 +7417,7 @@
+@@ -8649,7 +7426,7 @@
ax_sub_cache_file=$ac_top_build_prefix$cache_file ;;
esac
@@ -8309,7 +8251,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 +7425,7 @@
+@@ -8657,7 +7434,7 @@
fi
cd "$ax_popdir"
@@ -8318,7 +8260,7 @@ Forwarded: not-needed
$as_echo "$as_me: Done configuring in \"${srcdir}/lib-src/portsmf\"" >&6;}
fi
-@@ -8665,18 +7433,18 @@
+@@ -8665,18 +7442,18 @@
export PKG_CONFIG_PATH
pkg_failed=no
@@ -8341,7 +8283,7 @@ Forwarded: not-needed
pkg_cv_PORTSMF_CFLAGS=`$PKG_CONFIG --cflags "portSMF" 2>/dev/null`
else
pkg_failed=yes
-@@ -8688,11 +7456,11 @@
+@@ -8688,11 +7465,11 @@
pkg_cv_PORTSMF_LIBS="$PORTSMF_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -8356,7 +8298,7 @@ Forwarded: not-needed
pkg_cv_PORTSMF_LIBS=`$PKG_CONFIG --libs "portSMF" 2>/dev/null`
else
pkg_failed=yes
-@@ -8718,7 +7486,7 @@
+@@ -8718,7 +7495,7 @@
# Put the nasty error message in config.log where it belongs
echo "$PORTSMF_PKG_ERRORS" >&5
@@ -8365,7 +8307,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
portsmf_available="no"
elif test $pkg_failed = untried; then
-@@ -8726,7 +7494,7 @@
+@@ -8726,7 +7503,7 @@
else
PORTSMF_CFLAGS=$pkg_cv_PORTSMF_CFLAGS
PORTSMF_LIBS=$pkg_cv_PORTSMF_LIBS
@@ -8374,7 +8316,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
portsmf_available="yes"
fi
-@@ -8736,15 +7504,15 @@
+@@ -8736,15 +7513,168 @@
PORTSMF_LOCAL_LDFLAGS=$PORTSMF_LIBS
PORTSMF_LOCAL_CXXFLAGS=$PORTSMF_CFLAGS
PORTSMF_LOCAL_CPPSYMBOLS="USE_MIDI"
@@ -8382,19 +8324,172 @@ Forwarded: not-needed
- PORTSMF_LOCAL_BUILD="portSMF"
+ PORTSMF_LOCAL_OPTOBJS="NoteTrack.o import/ImportMIDI.o"
+ PORTSMF_LOCAL_BUILD="portSMF"
++ else
++ PORTSMF_LOCAL_AVAILABLE="no"
++ fi
++
++
++
++# Check whether --with-portaudio was given.
++if test "${with_portaudio+set}" = set; then :
++ withval=$with_portaudio; PORTAUDIO_ARGUMENT=$withval
++else
++ PORTAUDIO_ARGUMENT="unspecified"
++fi
++
++
++
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PORTAUDIO" >&5
++$as_echo_n "checking for PORTAUDIO... " >&6; }
++
++if test -n "$PORTAUDIO_CFLAGS"; then
++ pkg_cv_PORTAUDIO_CFLAGS="$PORTAUDIO_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_PORTAUDIO_CFLAGS=`$PKG_CONFIG --cflags "portaudio-2.0 >= 19" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$PORTAUDIO_LIBS"; then
++ pkg_cv_PORTAUDIO_LIBS="$PORTAUDIO_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_PORTAUDIO_LIBS=`$PKG_CONFIG --libs "portaudio-2.0 >= 19" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "portaudio-2.0 >= 19" 2>&1`
++ else
++ PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "portaudio-2.0 >= 19" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$PORTAUDIO_PKG_ERRORS" >&5
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ portaudio_available_system="no"
++elif test $pkg_failed = untried; then
++ portaudio_available_system="no"
++else
++ PORTAUDIO_CFLAGS=$pkg_cv_PORTAUDIO_CFLAGS
++ PORTAUDIO_LIBS=$pkg_cv_PORTAUDIO_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ portaudio_available_system="yes"
++fi
++
++ if test "x$portaudio_available_system" = "xyes" ; then
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <portaudio.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "Pa_GetStreamHostApiType" >/dev/null 2>&1; then :
++ have_portaudio_support=yes
++else
++ have_portaudio_support=no
++fi
++rm -f conftest*
++
++
++ if test "x$have_portaudio_support" = "xyes" ; then
++ PORTAUDIO_SYSTEM_AVAILABLE="yes"
++ PORTAUDIO_SYSTEM_LIBS=$PORTAUDIO_LIBS
++ PORTAUDIO_SYSTEM_CXXFLAGS=$PORTAUDIO_CFLAGS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: portaudio19 library is available as system library" >&5
++$as_echo "$as_me: portaudio19 library is available as system library" >&6;}
++ else
++ PORTAUDIO_SYSTEM_AVAILABLE="no"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: portaudio19 library is available as system library, but does not have the Pa_GetStreamHostApiType function." >&5
++$as_echo "$as_me: portaudio19 library is available as system library, but does not have the Pa_GetStreamHostApiType function." >&6;}
++ fi
++ else
++ PORTAUDIO_SYSTEM_AVAILABLE="no"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: portaudio19 library is NOT available as system library" >&5
++$as_echo "$as_me: portaudio19 library is NOT available as system library" >&6;}
++ fi
++
++
++ as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portaudio-v19/include/portaudio.h" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h" >&5
++$as_echo_n "checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h... " >&6; }
++if eval "test \"\${$as_ac_File+set}\"" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ test "$cross_compiling" = yes &&
++ as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
++if test -r "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
++ eval "$as_ac_File=yes"
++else
++ eval "$as_ac_File=no"
++fi
++fi
++eval ac_res=\$$as_ac_File
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
++ portaudio_h_found="yes"
++else
++ portaudio_h_found="no"
++fi
++
++
++ if test "x$portaudio_h_found" = "xyes" ; then
++ PORTAUDIO_LOCAL_AVAILABLE="yes"
++ PORTAUDIO_LOCAL_LIBS="portaudio-v19/lib/libportaudio.a"
++ PORTAUDIO_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/portaudio-v19/include'
++
++ PORTAUDIO_LOCAL_CONFIG_SUBDIRS="lib-src/portaudio-v19"
++ PORTAUDIO_LOCAL_CONFIGURE_ARGS="--with-pa-include=../portaudio-v19/include"
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: portaudio19 library is available in the local tree" >&5
++$as_echo "$as_me: portaudio19 library is available in the local tree" >&6;}
else
- PORTSMF_LOCAL_AVAILABLE="no"
-+ PORTSMF_LOCAL_AVAILABLE="no"
++ PORTAUDIO_LOCAL_AVAILABLE="no"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: portaudio19 library is NOT available in the local tree" >&5
++$as_echo "$as_me: portaudio19 library is NOT available in the local tree" >&6;}
fi
-{ $as_echo "$as_me:$LINENO: Figuring out what libraries to enable" >&5
++
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Figuring out what libraries to enable" >&5
$as_echo "$as_me: Figuring out what libraries to enable" >&6;}
lib_preference=`echo $lib_preference | tr [:lower:], "[:upper:] "`
-@@ -8761,43 +7529,37 @@
+@@ -8761,43 +7691,37 @@
if test "$AVAILABLE" = "yes" ; then
eval ${lib}_USE_${sys_or_local}="yes"
lib_activated="yes"
@@ -8446,7 +8541,7 @@ Forwarded: not-needed
fi
fi
done
-@@ -8809,39 +7571,33 @@
+@@ -8809,39 +7733,41 @@
# liblrdf
if test "$LIBSNDFILE_USE_LOCAL" != "yes" && test "$LIBSNDFILE_USE_SYSTEM" != "yes" ; then
@@ -8472,6 +8567,14 @@ Forwarded: not-needed
fi
fi
++if test "$PORTAUDIO_USE_LOCAL" = "yes"; then
++ ac_configure_args="$ac_configure_args $PORTAUDIO_LOCAL_CONFIGURE_ARGS"
++elif test "$PORTAUDIO_USE_SYSTEM" = "yes"; then
++ ac_configure_args="$ac_configure_args $PORTAUDIO_SYSTEM_CONFIGURE_ARGS"
++else
++ as_fn_error $? "Audacity requires portaudio to be enabled" "$LINENO" 5
++fi
++
if ( test "$LIBRESAMPLE_USE_LOCAL" = "yes" || test "$LIBRESAMPLE_USE_SYSTEM" = "yes") && ( test "$LIBSAMPLERATE_USE_LOCAL" = "yes" || test "$LIBSAMPLERATE_USE_SYSTEM" = "yes"); then
- { $as_echo "$as_me:$LINENO: Both libresample and libsamplerate are available" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Both libresample and libsamplerate are available" >&5
@@ -8493,7 +8596,7 @@ Forwarded: not-needed
$as_echo "$as_me: Using libsamplerate as requested" >&6;}
fi
fi
-@@ -8892,7 +7648,7 @@
+@@ -8892,7 +7818,7 @@
# Check whether --enable-audiounits was given.
@@ -8502,7 +8605,7 @@ Forwarded: not-needed
enableval=$enable_audiounits; use_audiounits=$enableval
else
use_audiounits="auto"
-@@ -8900,7 +7656,7 @@
+@@ -8900,7 +7826,7 @@
# Check whether --enable-ladspa was given.
@@ -8511,7 +8614,7 @@ Forwarded: not-needed
enableval=$enable_ladspa; use_ladspa=$enableval
else
use_ladspa="yes"
-@@ -8908,7 +7664,7 @@
+@@ -8908,7 +7834,7 @@
# Check whether --enable-quicktime was given.
@@ -8520,7 +8623,7 @@ Forwarded: not-needed
enableval=$enable_quicktime; use_quicktime=$enableval
else
use_quicktime="auto"
-@@ -8918,7 +7674,7 @@
+@@ -8918,7 +7844,7 @@
# Check whether --with-portmixer was given.
@@ -8529,7 +8632,7 @@ Forwarded: not-needed
withval=$with_portmixer; use_portmixer=$withval
else
use_portmixer="yes"
-@@ -8927,35 +7683,27 @@
+@@ -8927,35 +7853,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -8572,7 +8675,7 @@ Forwarded: not-needed
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -8971,28 +7719,24 @@
+@@ -8971,28 +7889,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -8606,7 +8709,7 @@ Forwarded: not-needed
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -9031,14 +7775,10 @@
+@@ -9031,14 +7945,10 @@
CONFIGHEADER="configwin.h"
@@ -8623,7 +8726,7 @@ Forwarded: not-needed
AFTERBUILD=""
-@@ -9050,17 +7790,13 @@
+@@ -9050,17 +7960,13 @@
EXTRAINSTALLTARGETS="$EXTRAINSTALLTARGETS install-extra-data"
EXTRAUNINSTALLTARGETS="$EXTRAUNINSTALLTARGETS uninstall-extra-data"
@@ -8644,7 +8747,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9085,79 +7821,50 @@
+@@ -9085,79 +7991,50 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -8737,7 +8840,7 @@ Forwarded: not-needed
pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -9169,11 +7876,11 @@
+@@ -9169,11 +8046,11 @@
pkg_cv_GTK_LIBS="$GTK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -8752,7 +8855,7 @@ Forwarded: not-needed
pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -9199,7 +7906,7 @@
+@@ -9199,7 +8076,7 @@
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
@@ -8761,7 +8864,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
have_gtk=no
elif test $pkg_failed = untried; then
-@@ -9207,16 +7914,14 @@
+@@ -9207,16 +8084,14 @@
else
GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
GTK_LIBS=$pkg_cv_GTK_LIBS
@@ -8780,7 +8883,21 @@ Forwarded: not-needed
CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
-@@ -9240,18 +7945,14 @@
+@@ -9225,13 +8100,6 @@
+ esac
+
+
+-LOCAL_LIBS="$LOCAL_LIBS portaudio-v19/lib/libportaudio.a"
+-EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a"
+-CXXFLAGS="-I\$(top_srcdir)/lib-src/portaudio-v19/include $CXXFLAGS"
+-
+-subdirs="$subdirs lib-src/portaudio-v19"
+-
+-
+ case "${host_os}" in
+ darwin* | rhapsody*)
+ LIBS="-framework AudioUnit -framework AudioToolbox $LIBS"
+@@ -9240,18 +8108,14 @@
cygwin*)
;;
*)
@@ -8802,7 +8919,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9269,43 +7970,18 @@
+@@ -9269,43 +8133,18 @@
return 0;
}
_ACEOF
@@ -8852,7 +8969,7 @@ Forwarded: not-needed
have_alsa=yes
else
have_alsa=no
-@@ -9316,18 +7992,18 @@
+@@ -9316,18 +8155,18 @@
fi
pkg_failed=no
@@ -8875,7 +8992,7 @@ Forwarded: not-needed
pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack" 2>/dev/null`
else
pkg_failed=yes
-@@ -9339,11 +8015,11 @@
+@@ -9339,11 +8178,11 @@
pkg_cv_JACK_LIBS="$JACK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -8890,7 +9007,7 @@ Forwarded: not-needed
pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack" 2>/dev/null`
else
pkg_failed=yes
-@@ -9369,7 +8045,7 @@
+@@ -9369,7 +8208,7 @@
# Put the nasty error message in config.log where it belongs
echo "$JACK_PKG_ERRORS" >&5
@@ -8899,7 +9016,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
have_jack=no
elif test $pkg_failed = untried; then
-@@ -9377,25 +8053,21 @@
+@@ -9377,25 +8216,21 @@
else
JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
JACK_LIBS=$pkg_cv_JACK_LIBS
@@ -8929,7 +9046,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9413,43 +8085,18 @@
+@@ -9413,43 +8248,18 @@
return 0;
}
_ACEOF
@@ -8979,7 +9096,7 @@ Forwarded: not-needed
have_asihpi=yes
else
have_asihpi=no
-@@ -9458,18 +8105,14 @@
+@@ -9458,18 +8268,14 @@
if [ $have_asihpi = "yes" ] ; then
LIBS="$LIBS -lhpi"
fi
@@ -9001,11 +9118,10 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9484,145 +8127,30 @@
- {
+@@ -9485,144 +8291,29 @@
return clock_gettime ();
;
-- return 0;
+ return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9126,7 +9242,6 @@ Forwarded: not-needed
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
@@ -9168,7 +9283,7 @@ Forwarded: not-needed
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -9636,9 +8164,7 @@
+@@ -9636,9 +8327,7 @@
if [ "$use_portmixer" = "yes" ] ; then
@@ -9179,8 +9294,11 @@ Forwarded: not-needed
CXXFLAGS="-I\$(top_srcdir)/lib-src/portmixer/include $CXXFLAGS"
-@@ -9649,16 +8175,12 @@
- ac_configure_args="$ac_configure_args --with-pa-include=../portaudio-v19/include"
+@@ -9646,19 +8335,14 @@
+
+ subdirs="$subdirs lib-src/portmixer"
+
+- ac_configure_args="$ac_configure_args --with-pa-include=../portaudio-v19/include"
fi
-{ $as_echo "$as_me:$LINENO: checking for lrint" >&5
@@ -9199,7 +9317,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#define _ISOC9X_SOURCE 1
-@@ -9674,54 +8196,27 @@
+@@ -9674,54 +8358,27 @@
return 0;
}
_ACEOF
@@ -9261,7 +9379,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#define _ISOC9X_SOURCE 1
-@@ -9737,41 +8232,18 @@
+@@ -9737,41 +8394,18 @@
return 0;
}
_ACEOF
@@ -9307,7 +9425,7 @@ Forwarded: not-needed
fi
-@@ -9782,9 +8254,7 @@
+@@ -9782,9 +8416,7 @@
OPTOBJS="$OPTOBJS effects/ladspa/LadspaEffect.o"
@@ -9318,7 +9436,7 @@ Forwarded: not-needed
case "$host_os" in
-@@ -9801,9 +8271,7 @@
+@@ -9801,9 +8433,7 @@
OPTOBJS="$OPTOBJS effects/audiounits/AudioUnitEffect.o"
@@ -9329,7 +9447,7 @@ Forwarded: not-needed
fi
-@@ -9812,9 +8280,7 @@
+@@ -9812,9 +8442,7 @@
OPTOBJS="$OPTOBJS import/ImportQTWrapper.o"
@@ -9340,7 +9458,7 @@ Forwarded: not-needed
fi
-@@ -9869,13 +8335,13 @@
+@@ -9869,13 +8497,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -9356,7 +9474,7 @@ Forwarded: not-needed
esac ;;
esac
done
-@@ -9883,8 +8349,8 @@
+@@ -9883,8 +8511,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -9367,7 +9485,7 @@ Forwarded: not-needed
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -9907,11 +8373,11 @@
+@@ -9907,11 +8535,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" &&
@@ -9381,7 +9499,7 @@ Forwarded: not-needed
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -9925,14 +8391,15 @@
+@@ -9925,14 +8553,15 @@
ac_libobjs=
ac_ltlibobjs=
@@ -9399,7 +9517,7 @@ Forwarded: not-needed
done
LIBOBJS=$ac_libobjs
-@@ -9944,9 +8411,10 @@
+@@ -9944,9 +8573,10 @@
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -9412,7 +9530,7 @@ Forwarded: not-needed
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -9956,17 +8424,18 @@
+@@ -9956,17 +8586,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -9438,7 +9556,7 @@ Forwarded: not-needed
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -9974,23 +8443,15 @@
+@@ -9974,23 +8605,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -9467,7 +9585,7 @@ Forwarded: not-needed
as_nl='
'
export as_nl
-@@ -9998,7 +8459,13 @@
+@@ -9998,7 +8621,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
@@ -9482,7 +9600,7 @@ Forwarded: not-needed
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -10009,7 +8476,7 @@
+@@ -10009,7 +8638,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -9491,7 +9609,7 @@ Forwarded: not-needed
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -10032,13 +8499,6 @@
+@@ -10032,13 +8661,6 @@
}
fi
@@ -9505,7 +9623,7 @@ Forwarded: not-needed
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -10048,15 +8508,15 @@
+@@ -10048,15 +8670,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -9524,7 +9642,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
;;
-@@ -10068,12 +8528,16 @@
+@@ -10068,12 +8690,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -9545,7 +9663,7 @@ Forwarded: not-needed
done
PS1='$ '
PS2='> '
-@@ -10085,7 +8549,89 @@
+@@ -10085,7 +8711,89 @@
LANGUAGE=C
export LANGUAGE
@@ -9636,7 +9754,7 @@ Forwarded: not-needed
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -10099,8 +8645,12 @@
+@@ -10099,8 +8807,12 @@
as_basename=false
fi
@@ -9650,7 +9768,7 @@ Forwarded: not-needed
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -10120,76 +8670,25 @@
+@@ -10120,76 +8832,25 @@
}
s/.*/./; q'`
@@ -9738,7 +9856,7 @@ Forwarded: not-needed
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -10218,8 +8717,56 @@
+@@ -10218,8 +8879,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -9796,7 +9914,7 @@ Forwarded: not-needed
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -10238,10 +8785,10 @@
+@@ -10238,10 +8947,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -9809,7 +9927,7 @@ Forwarded: not-needed
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -10256,13 +8803,19 @@
+@@ -10256,13 +8965,19 @@
exec 6>&1
@@ -9831,7 +9949,7 @@ Forwarded: not-needed
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -10293,13 +8846,15 @@
+@@ -10293,13 +9008,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -9850,7 +9968,7 @@ Forwarded: not-needed
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -10315,16 +8870,17 @@
+@@ -10315,16 +9032,17 @@
Configuration headers:
$config_headers
@@ -9872,7 +9990,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 +8896,16 @@
+@@ -10340,11 +9058,16 @@
while test $# != 0
do
case $1 in
@@ -9890,7 +10008,7 @@ Forwarded: not-needed
*)
ac_option=$1
ac_optarg=$2
-@@ -10358,27 +8919,29 @@
+@@ -10358,27 +9081,29 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -9925,7 +10043,7 @@ Forwarded: not-needed
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -10386,11 +8949,10 @@
+@@ -10386,11 +9111,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -9940,7 +10058,7 @@ Forwarded: not-needed
ac_need_defaults=false ;;
esac
-@@ -10445,9 +9007,7 @@
+@@ -10445,9 +9169,7 @@
"lib-src/expat/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/expat/Makefile" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
@@ -9951,7 +10069,7 @@ Forwarded: not-needed
esac
done
-@@ -10473,7 +9033,7 @@
+@@ -10473,7 +9195,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -9960,7 +10078,7 @@ Forwarded: not-needed
}
# Create a (secure) tmp directory for tmp files.
-@@ -10484,11 +9044,7 @@
+@@ -10484,11 +9206,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -9973,7 +10091,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 +9052,13 @@
+@@ -10496,7 +9214,13 @@
if test -n "$CONFIG_FILES"; then
@@ -9988,7 +10106,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 +9075,18 @@
+@@ -10513,24 +9237,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -10017,7 +10135,7 @@ Forwarded: not-needed
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -10552,7 +9108,7 @@
+@@ -10552,7 +9270,7 @@
t delim
:nl
h
@@ -10026,7 +10144,7 @@ Forwarded: not-needed
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -10566,7 +9122,7 @@
+@@ -10566,7 +9284,7 @@
t nl
:delim
h
@@ -10035,7 +10153,7 @@ Forwarded: not-needed
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -10619,22 +9175,28 @@
+@@ -10619,22 +9337,28 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -10074,7 +10192,7 @@ Forwarded: not-needed
s/^[^=]*=[ ]*$//
}'
fi
-@@ -10662,9 +9224,7 @@
+@@ -10662,9 +9386,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -10085,7 +10203,7 @@ Forwarded: not-needed
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -10749,9 +9309,7 @@
+@@ -10749,9 +9471,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -10096,7 +10214,7 @@ Forwarded: not-needed
fi # test -n "$CONFIG_HEADERS"
-@@ -10764,9 +9322,7 @@
+@@ -10764,9 +9484,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -10107,7 +10225,7 @@ Forwarded: not-needed
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -10794,12 +9350,10 @@
+@@ -10794,12 +9512,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -10122,7 +10240,7 @@ Forwarded: not-needed
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -10810,7 +9364,7 @@
+@@ -10810,7 +9526,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -10131,7 +10249,7 @@ Forwarded: not-needed
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -10823,9 +9377,7 @@
+@@ -10823,9 +9539,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -10142,7 +10260,7 @@ Forwarded: not-needed
esac
;;
esac
-@@ -10853,47 +9405,7 @@
+@@ -10853,47 +9567,7 @@
q
}
s/.*/./; q'`
@@ -10191,7 +10309,7 @@ Forwarded: not-needed
ac_builddir=.
case "$ac_dir" in
-@@ -10945,7 +9457,6 @@
+@@ -10945,7 +9619,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=
@@ -10199,7 +10317,7 @@ Forwarded: not-needed
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -10955,12 +9466,11 @@
+@@ -10955,12 +9628,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -10214,7 +10332,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 +9480,7 @@
+@@ -10970,7 +9642,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -10223,7 +10341,7 @@ Forwarded: not-needed
esac
_ACEOF
-@@ -10998,26 +9508,22 @@
+@@ -10998,26 +9670,22 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -10255,7 +10373,7 @@ Forwarded: not-needed
;;
:H)
#
-@@ -11028,25 +9534,19 @@
+@@ -11028,25 +9696,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -10285,7 +10403,7 @@ Forwarded: not-needed
fi
;;
-@@ -11056,15 +9556,12 @@
+@@ -11056,15 +9718,12 @@
done # for ac_tag
@@ -10303,7 +10421,7 @@ Forwarded: not-needed
# configure is writing to config.log, and then calls config.status.
-@@ -11085,7 +9582,7 @@
+@@ -11085,7 +9744,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.
@@ -10312,7 +10430,7 @@ Forwarded: not-needed
fi
#
-@@ -11129,7 +9626,7 @@
+@@ -11129,7 +9788,7 @@
case $ac_arg in
*\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -10321,7 +10439,7 @@ Forwarded: not-needed
esac
done
-@@ -11158,49 +9655,9 @@
+@@ -11158,49 +9817,9 @@
test -d "$srcdir/$ac_dir" || continue
ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
@@ -10373,7 +10491,7 @@ Forwarded: not-needed
ac_builddir=.
case "$ac_dir" in
-@@ -11247,7 +9704,7 @@
+@@ -11247,7 +9866,7 @@
# This should be Cygnus configure.
ac_sub_configure=$ac_aux_dir/configure
else
@@ -10382,7 +10500,7 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
ac_sub_configure=
fi
-@@ -11261,21 +9718,19 @@
+@@ -11261,29 +9880,23 @@
ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
esac
@@ -10407,3 +10525,11 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
+
+-pa_libs=
+-pa_libs=`grep 'Libs:' lib-src/portaudio-v19/portaudio-2.0.pc | sed -e 's/Libs://;s/-L${libdir}//;s/-lportaudio//'`
+-sed -i -e "s/@PA_LIBS@/$pa_libs/" src/Makefile
+-
+ echo ""
+ echo "Finished configure:"
+
diff --git a/debian/patches/portmixer-include-directory.patch b/debian/patches/portmixer-include-directory.patch
new file mode 100644
index 0000000..b406d08
--- /dev/null
+++ b/debian/patches/portmixer-include-directory.patch
@@ -0,0 +1,14 @@
+Description: Fix include directory check in portmixer configure script.
+Author: Benjamin Drung <bdrung at debian.org>
+
+--- a/lib-src/portmixer/configure.ac
++++ b/lib-src/portmixer/configure.ac
+@@ -43,7 +43,7 @@
+ #
+ #
+ #
+-if [[ with_portaudio != "" ]] ; then
++if test -n "$with_portaudio"; then
+ CPPFLAGS="$CPPFLAGS -I$withval"
+ AC_SUBST(cflags, ["$cflags -I$withval"] )
+ fi
diff --git a/debian/patches/series b/debian/patches/series
index ae7d5e4..add3ef1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,8 +2,10 @@ enable-experimental-linking.patch
fix-slider-background-color.patch
open-mixer.patch
fix-ftbfs-with-gcc-4.5.patch
-autoreconf.patch
disable-dynamic-loading.patch
portsmf-configure.patch
-configure.patch
fix-const-char-conversion.patch
+system-portaudio.patch
+portmixer-include-directory.patch
+autoreconf.patch
+configure.patch
diff --git a/debian/patches/system-portaudio.patch b/debian/patches/system-portaudio.patch
new file mode 100644
index 0000000..e857800
--- /dev/null
+++ b/debian/patches/system-portaudio.patch
@@ -0,0 +1,143 @@
+Description: Support compiling Audacity against system portAudio.
+Author: Benjamin Drung <bdrung at debian.org>
+
+--- a/configure.in
++++ b/configure.in
+@@ -311,7 +311,7 @@
+ dnl-------------------------------------------------------------
+ dnl LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG LIBLRDF SLV2 REDLAND PORTSMF TAGLIB"
+ dnl disable plugin categorisation and LV2 libs for 1.3.7 release
+-LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG PORTSMF"
++LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG PORTSMF PORTAUDIO"
+
+ AC_MSG_NOTICE([Determining what libraries are available in this tree and on the system])
+
+@@ -334,6 +334,7 @@
+ dnl AUDACITY_CHECKLIB_LIBLRDF
+ AUDACITY_CHECKLIB_PORTSMF
+ dnl AUDACITY_CHECKLIB_TAGLIB
++AUDACITY_CHECKLIB_PORTAUDIO
+
+ dnl Decide what libraries to build with, and whether to use system or local libraries
+ dnl Set variables based on choices.
+@@ -403,6 +404,14 @@
+ fi
+ fi
+
++if test "$PORTAUDIO_USE_LOCAL" = "yes"; then
++ ac_configure_args="$ac_configure_args $PORTAUDIO_LOCAL_CONFIGURE_ARGS"
++elif test "$PORTAUDIO_USE_SYSTEM" = "yes"; then
++ ac_configure_args="$ac_configure_args $PORTAUDIO_SYSTEM_CONFIGURE_ARGS"
++else
++ AC_MSG_ERROR([Audacity requires portaudio to be enabled])
++fi
++
+ dnl we can only have one sample rate conversion library used.
+ dnl by now we will have both enabled if they are present, regardless of whether
+ dnl they were requested, unless one was specifically disabled.
+@@ -564,13 +573,6 @@
+ ;;
+ esac
+
+-dnl PortAudio configuration
+-
+-LOCAL_LIBS="$LOCAL_LIBS portaudio-v19/lib/libportaudio.a"
+-EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a"
+-CXXFLAGS="-I\$(top_srcdir)/lib-src/portaudio-v19/include $CXXFLAGS"
+-
+-AC_CONFIG_SUBDIRS([lib-src/portaudio-v19])
+
+ case "${host_os}" in
+ darwin* | rhapsody*)
+@@ -608,7 +610,6 @@
+ LOCAL_LIBS="$LOCAL_LIBS portmixer/libportmixer.a"
+
+ AC_CONFIG_SUBDIRS([lib-src/portmixer])
+- ac_configure_args="$ac_configure_args --with-pa-include=../portaudio-v19/include"
+ fi
+
+ dnl Check for lrint/lrintf
+@@ -673,13 +674,6 @@
+
+ AC_OUTPUT
+
+-dnl
+-dnl Substitute any addition libraries that portaudio (v19) requires
+-dnl
+-pa_libs=
+-pa_libs=`grep 'Libs:' lib-src/portaudio-v19/portaudio-2.0.pc | sed -e 's/Libs://;s/-L${libdir}//;s/-lportaudio//'`
+-sed -i -e "s/@PA_LIBS@/$pa_libs/" src/Makefile
+-
+ echo ""
+ echo "Finished configure:"
+
+--- /dev/null
++++ b/m4/audacity_checklib_portaudio.m4
+@@ -0,0 +1,56 @@
++dnl Please increment the serial number below whenever you alter this macro
++dnl for the benefit of automatic macro update systems
++# audacity_checklib_portaudio.m4 serial 1
++
++AC_DEFUN([AUDACITY_CHECKLIB_PORTAUDIO], [
++ AC_ARG_WITH(portaudio,
++ [AS_HELP_STRING([--with-portaudio], [use portaudio19])],
++ PORTAUDIO_ARGUMENT=$withval,
++ PORTAUDIO_ARGUMENT="unspecified")
++
++ dnl see if portaudio is installed on the system
++
++ PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 19,
++ portaudio_available_system="yes",
++ portaudio_available_system="no")
++
++ if test "x$portaudio_available_system" = "xyes" ; then
++ AC_EGREP_HEADER([Pa_GetStreamHostApiType], [portaudio.h],
++ [have_portaudio_support=yes], [have_portaudio_support=no])
++
++ if test "x$have_portaudio_support" = "xyes" ; then
++ PORTAUDIO_SYSTEM_AVAILABLE="yes"
++ PORTAUDIO_SYSTEM_LIBS=$PORTAUDIO_LIBS
++ PORTAUDIO_SYSTEM_CXXFLAGS=$PORTAUDIO_CFLAGS
++ AC_MSG_NOTICE([portaudio19 library is available as system library])
++ else
++ PORTAUDIO_SYSTEM_AVAILABLE="no"
++ AC_MSG_NOTICE([portaudio19 library is available as system library, but does not have the Pa_GetStreamHostApiType function.])
++ fi
++ else
++ PORTAUDIO_SYSTEM_AVAILABLE="no"
++ AC_MSG_NOTICE([portaudio19 library is NOT available as system library])
++ fi
++
++ dnl see if portaudio is available locally
++
++ AC_CHECK_FILE(${srcdir}/lib-src/portaudio-v19/include/portaudio.h,
++ portaudio_h_found="yes",
++ portaudio_h_found="no")
++
++ if test "x$portaudio_h_found" = "xyes" ; then
++ PORTAUDIO_LOCAL_AVAILABLE="yes"
++ PORTAUDIO_LOCAL_LIBS="portaudio-v19/lib/libportaudio.a"
++ PORTAUDIO_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/portaudio-v19/include'
++
++ dnl set up configuring portaudio
++ PORTAUDIO_LOCAL_CONFIG_SUBDIRS="lib-src/portaudio-v19"
++ PORTAUDIO_LOCAL_CONFIGURE_ARGS="--with-pa-include=../portaudio-v19/include"
++
++ AC_MSG_NOTICE([portaudio19 library is available in the local tree])
++ else
++ PORTAUDIO_LOCAL_AVAILABLE="no"
++ AC_MSG_NOTICE([portaudio19 library is NOT available in the local tree])
++ fi
++
++])
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -20,7 +20,7 @@
+ LOCAL_LIBS = @LOCAL_LIBS@
+ EXTRAOBJS = @EXTRAOBJS@
+ EXTRATARGETS = @EXTRATARGETS@
+-LIBS = @LIBS@ @PA_LIBS@
++LIBS = @LIBS@
+ DIRS=blockfile commands effects effects/ladspa effects/nyquist effects/vamp export import prefs toolbars widgets xml
+
+ srcdir=@srcdir@
diff --git a/debian/rules b/debian/rules
index 88135b1..1b14b5e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,7 @@ configure_flags := \
--with-libvamp=system \
--with-libvorbis=system \
--with-midi=local \
+ --with-portaudio=system \
--with-sbsms=local \
--with-soundtouch=system \
$(NULL)
--
Audacity debian packaging
More information about the pkg-multimedia-commits
mailing list