[SCM] VLC media player packaging branch, sid, updated. debian/1.1.2-1-13-g4370b9d
bdrung-guest at users.alioth.debian.org
bdrung-guest at users.alioth.debian.org
Thu Aug 19 19:41:52 UTC 2010
The following commit has been merged in the sid branch:
commit 09cfeb675b4b39aa053ea86735eb0f8c15f91070
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Aug 19 21:09:41 2010 +0200
Refresh xulrunner patch.
diff --git a/debian/patches/502_xulrunner_191.diff b/debian/patches/502_xulrunner_191.diff
index 4bb2043..d27fb0d 100644
--- a/debian/patches/502_xulrunner_191.diff
+++ b/debian/patches/502_xulrunner_191.diff
@@ -16,7 +16,7 @@ Forwarded: not-needed
--- a/configure.ac
+++ b/configure.ac
-@@ -4561,25 +4561,23 @@
+@@ -4568,25 +4568,23 @@
if test -n "$i"
then
echo "Trying to find $i package" >&AS_MESSAGE_LOG_FD
@@ -45,7 +45,7 @@ Forwarded: not-needed
AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
[#if HAVE_NPAPI_H
-@@ -4587,21 +4585,19 @@
+@@ -4594,21 +4592,19 @@
#endif
])
if test "${MOZILLA_REQUIRED_HEADERS}" = "0"; then
@@ -76,7 +76,7 @@ Forwarded: not-needed
])
])
VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS} ${XPM_CFLAGS}])
-@@ -4615,7 +4611,7 @@
+@@ -4622,7 +4618,7 @@
AC_PATH_PROGS(MOZILLA_CONFIG,
[mozilla-config seamonkey-config xulrunner-config],
[no])
@@ -85,7 +85,7 @@ Forwarded: not-needed
]
)
dnl pkg-config failed but we might have found a mozilla-config
-@@ -4671,8 +4667,9 @@
+@@ -4678,8 +4674,9 @@
fi
real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`"
@@ -96,7 +96,7 @@ Forwarded: not-needed
AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
[#if HAVE_NPAPI_H
-@@ -4686,7 +4683,17 @@
+@@ -4693,7 +4690,17 @@
MOZILLA_REQUIRED_HEADERS=
mozilla=:
PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
diff --git a/debian/patches/503_autoreconf.diff b/debian/patches/503_autoreconf.diff
index d8e5ada..40d9e33 100644
--- a/debian/patches/503_autoreconf.diff
+++ b/debian/patches/503_autoreconf.diff
@@ -2,9 +2,72 @@ Description: Run autoreconf to pickup configure.ac and Makefile.am changes
Author: Benjamin Drung <bdrung at ubuntu.com>
Forwarded: not-needed
---- vlc-1.1.2.orig/configure
-+++ vlc-1.1.2/configure
-@@ -1146,7 +1146,6 @@ MINIZIP_LIBS
+--- a/configure
++++ b/configure
+@@ -1,13 +1,13 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.67 for vlc 1.1.3.
++# Generated by GNU Autoconf 2.65 for vlc 1.1.3.
+ #
+ # Copyright 2002-2010 the VideoLAN team
+ #
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+-# Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
+ #
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -318,7 +318,7 @@
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
++ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+ } # as_fn_mkdir_p
+@@ -358,19 +358,19 @@
+ fi # as_fn_arith
+
+
+-# as_fn_error STATUS ERROR [LINENO LOG_FD]
+-# ----------------------------------------
++# as_fn_error ERROR [LINENO LOG_FD]
++# ---------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with STATUS, using 1 if that was 0.
++# script with status $?, using 1 if that was 0.
+ as_fn_error ()
+ {
+- as_status=$1; test $as_status -eq 0 && as_status=1
+- if test "$4"; then
+- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
++ as_status=$?; test $as_status -eq 0 && as_status=1
++ if test "$3"; then
++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ fi
+- $as_echo "$as_me: error: $2" >&2
++ $as_echo "$as_me: error: $1" >&2
+ as_fn_exit $as_status
+ } # as_fn_error
+
+@@ -681,7 +681,7 @@
+ exec 6>&1
+
+ # Name of the host.
+-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
++# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+@@ -1146,7 +1146,6 @@
MINIZIP_CFLAGS
HAVE_ZLIB_FALSE
HAVE_ZLIB_TRUE
@@ -12,7 +75,7 @@ Forwarded: not-needed
PKG_CONFIG
PKG_CONFIG_PATH
BUILD_DIRENT_FALSE
-@@ -1545,7 +1544,6 @@ CONTRIB_DIR
+@@ -1545,7 +1544,6 @@
CXXCPP
PKG_CONFIG_PATH
PKG_CONFIG
@@ -20,7 +83,146 @@ Forwarded: not-needed
MINIZIP_CFLAGS
MINIZIP_LIBS
DBUS_CFLAGS
-@@ -2581,8 +2579,6 @@ Some influential environment variables:
+@@ -1763,9 +1761,8 @@
+ fi
+
+ case $ac_option in
+- *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+- *=) ac_optarg= ;;
+- *) ac_optarg=yes ;;
++ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++ *) ac_optarg=yes ;;
+ esac
+
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+@@ -1810,7 +1807,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 &&
+- as_fn_error $? "invalid feature name: $ac_useropt"
++ as_fn_error "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1836,7 +1833,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 &&
+- as_fn_error $? "invalid feature name: $ac_useropt"
++ as_fn_error "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -2040,7 +2037,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 &&
+- as_fn_error $? "invalid package name: $ac_useropt"
++ as_fn_error "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -2056,7 +2053,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 &&
+- as_fn_error $? "invalid package name: $ac_useropt"
++ as_fn_error "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -2086,8 +2083,8 @@
+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+ x_libraries=$ac_optarg ;;
+
+- -*) as_fn_error $? "unrecognized option: \`$ac_option'
+-Try \`$0 --help' for more information"
++ -*) as_fn_error "unrecognized option: \`$ac_option'
++Try \`$0 --help' for more information."
+ ;;
+
+ *=*)
+@@ -2095,7 +2092,7 @@
+ # Reject names that are not valid shell variable names.
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
++ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+ esac
+ eval $ac_envvar=\$ac_optarg
+ export $ac_envvar ;;
+@@ -2113,13 +2110,13 @@
+
+ if test -n "$ac_prev"; then
+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+- as_fn_error $? "missing argument to $ac_option"
++ as_fn_error "missing argument to $ac_option"
+ fi
+
+ if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
++ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ esac
+ fi
+@@ -2142,7 +2139,7 @@
+ [\\/$]* | ?:[\\/]* ) continue;;
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ esac
+- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
++ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+ done
+
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -2156,8 +2153,8 @@
+ if test "x$host_alias" != x; then
+ if test "x$build_alias" = x; then
+ cross_compiling=maybe
+- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+- If a cross compiler is detected then cross compile mode will be used" >&2
++ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
++ If a cross compiler is detected then cross compile mode will be used." >&2
+ elif test "x$build_alias" != "x$host_alias"; then
+ cross_compiling=yes
+ fi
+@@ -2172,9 +2169,9 @@
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+- as_fn_error $? "working directory cannot be determined"
++ as_fn_error "working directory cannot be determined"
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+- as_fn_error $? "pwd does not report name of working directory"
++ as_fn_error "pwd does not report name of working directory"
+
+
+ # Find the source files, if location was not specified.
+@@ -2213,11 +2210,11 @@
+ fi
+ if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
++ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+ fi
+ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ ac_abs_confdir=`(
+- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+ pwd)`
+ # When building in place, set srcdir=.
+ if test "$ac_abs_confdir" = "$ac_pwd"; then
+@@ -2257,7 +2254,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
+- -q, --quiet, --silent do not print \`checking ...' messages
++ -q, --quiet, --silent do not print \`checking...' messages
+ --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
+@@ -2582,8 +2579,6 @@
PKG_CONFIG_PATH
Paths where to find .pc not at the default location
PKG_CONFIG path to pkg-config utility
@@ -29,149 +231,1364 @@ Forwarded: not-needed
MINIZIP_CFLAGS
C compiler flags for MINIZIP, overriding pkg-config
MINIZIP_LIBS
-@@ -10264,13 +10260,13 @@ if test "${lt_cv_nm_interface+set}" = se
+@@ -2892,9 +2887,9 @@
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ vlc configure 1.1.3
+-generated by GNU Autoconf 2.67
++generated by GNU Autoconf 2.65
+
+-Copyright (C) 2010 Free Software Foundation, Inc.
++Copyright (C) 2009 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+
+@@ -2966,7 +2961,7 @@
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } > conftest.i && {
++ test $ac_status = 0; } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+@@ -2990,10 +2985,10 @@
+ ac_fn_c_check_header_mongrel ()
+ {
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- if eval "test \"\${$3+set}\"" = set; then :
++ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ fi
+ eval ac_res=\$$3
+@@ -3029,7 +3024,7 @@
+ else
+ ac_header_preproc=no
+ fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+ $as_echo "$ac_header_preproc" >&6; }
+
+@@ -3056,7 +3051,7 @@
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ eval "$3=\$ac_header_compiler"
+@@ -3120,7 +3115,7 @@
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3272,7 +3267,7 @@
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3352,7 +3347,7 @@
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } > conftest.i && {
++ test $ac_status = 0; } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+@@ -3423,7 +3418,7 @@
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ eval "$3=no"
+@@ -3476,10 +3471,10 @@
+ ac_fn_cxx_check_header_mongrel ()
+ {
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- if eval "test \"\${$3+set}\"" = set; then :
++ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ fi
+ eval ac_res=\$$3
+@@ -3515,7 +3510,7 @@
+ else
+ ac_header_preproc=no
+ fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+ $as_echo "$ac_header_preproc" >&6; }
+
+@@ -3542,7 +3537,7 @@
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ eval "$3=\$ac_header_compiler"
+@@ -3555,18 +3550,15 @@
+
+ } # ac_fn_cxx_check_header_mongrel
+
+-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+-# ---------------------------------------------
+-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+-# accordingly.
++# ac_fn_c_check_decl LINENO SYMBOL VAR
++# ------------------------------------
++# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+ ac_fn_c_check_decl ()
+ {
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- as_decl_name=`echo $2|sed 's/ *(.*//'`
+- as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
++$as_echo_n "checking whether $2 is declared... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3575,12 +3567,8 @@
+ int
+ main ()
+ {
+-#ifndef $as_decl_name
+-#ifdef __cplusplus
+- (void) $as_decl_use;
+-#else
+- (void) $as_decl_name;
+-#endif
++#ifndef $2
++ (void) $2;
+ #endif
+
+ ;
+@@ -3610,7 +3598,7 @@
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3636,7 +3624,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by vlc $as_me 1.1.3, which was
+-generated by GNU Autoconf 2.67. Invocation command line was
++generated by GNU Autoconf 2.65. Invocation command line was
+
+ $ $0 $@
+
+@@ -3746,9 +3734,11 @@
+ {
+ echo
+
+- $as_echo "## ---------------- ##
++ cat <<\_ASBOX
++## ---------------- ##
+ ## Cache variables. ##
+-## ---------------- ##"
++## ---------------- ##
++_ASBOX
+ echo
+ # The following way of writing the cache mishandles newlines in values,
+ (
+@@ -3782,9 +3772,11 @@
+ )
+ echo
+
+- $as_echo "## ----------------- ##
++ cat <<\_ASBOX
++## ----------------- ##
+ ## Output variables. ##
+-## ----------------- ##"
++## ----------------- ##
++_ASBOX
+ echo
+ for ac_var in $ac_subst_vars
+ do
+@@ -3797,9 +3789,11 @@
+ echo
+
+ if test -n "$ac_subst_files"; then
+- $as_echo "## ------------------- ##
++ cat <<\_ASBOX
++## ------------------- ##
+ ## File substitutions. ##
+-## ------------------- ##"
++## ------------------- ##
++_ASBOX
+ echo
+ for ac_var in $ac_subst_files
+ do
+@@ -3813,9 +3807,11 @@
+ fi
+
+ if test -s confdefs.h; then
+- $as_echo "## ----------- ##
++ cat <<\_ASBOX
++## ----------- ##
+ ## confdefs.h. ##
+-## ----------- ##"
++## ----------- ##
++_ASBOX
+ echo
+ cat confdefs.h
+ echo
+@@ -3870,12 +3866,7 @@
+ ac_site_file1=NONE
+ ac_site_file2=NONE
+ if test -n "$CONFIG_SITE"; then
+- # We do not want a PATH search for config.site.
+- case $CONFIG_SITE in #((
+- -*) ac_site_file1=./$CONFIG_SITE;;
+- */*) ac_site_file1=$CONFIG_SITE;;
+- *) ac_site_file1=./$CONFIG_SITE;;
+- esac
++ ac_site_file1=$CONFIG_SITE
+ elif test "x$prefix" != xNONE; then
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
+@@ -3890,11 +3881,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ sed 's/^/| /' "$ac_site_file" >&5
+- . "$ac_site_file" \
+- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "failed to load site script $ac_site_file
+-See \`config.log' for more details" "$LINENO" 5 ; }
++ . "$ac_site_file"
+ fi
+ done
+
+@@ -3971,7 +3958,7 @@
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+ $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
++ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ fi
+ ## -------------------- ##
+ ## Main body of script. ##
+@@ -3999,22 +3986,16 @@
+
+ ac_aux_dir=
+ for ac_dir in autotools "$srcdir"/autotools; do
+- if test -f "$ac_dir/install-sh"; then
+- ac_aux_dir=$ac_dir
+- ac_install_sh="$ac_aux_dir/install-sh -c"
+- break
+- elif test -f "$ac_dir/install.sh"; then
+- ac_aux_dir=$ac_dir
+- ac_install_sh="$ac_aux_dir/install.sh -c"
+- break
+- elif test -f "$ac_dir/shtool"; then
+- ac_aux_dir=$ac_dir
+- ac_install_sh="$ac_aux_dir/shtool install -c"
+- break
+- fi
++ for ac_t in install-sh install.sh shtool; do
++ if test -f "$ac_dir/$ac_t"; then
++ ac_aux_dir=$ac_dir
++ ac_install_sh="$ac_aux_dir/$ac_t -c"
++ break 2
++ fi
++ done
+ done
+ if test -z "$ac_aux_dir"; then
+- as_fn_error $? "cannot find install-sh, install.sh, or shtool in autotools \"$srcdir\"/autotools" "$LINENO" 5
++ as_fn_error "cannot find install-sh, install.sh, or shtool in autotools \"$srcdir\"/autotools" "$LINENO" 5
+ fi
+
+ # These three variables are undocumented and unsupported,
+@@ -4030,7 +4011,7 @@
+
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
++ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+ $as_echo_n "checking build system type... " >&6; }
+@@ -4041,16 +4022,16 @@
+ test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+ test "x$ac_build_alias" = x &&
+- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
++ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+ ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
++ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+ $as_echo "$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
++*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+ esac
+ build=$ac_cv_build
+ ac_save_IFS=$IFS; IFS='-'
+@@ -4075,7 +4056,7 @@
+ ac_cv_host=$ac_cv_build
+ else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
++ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ fi
+
+ fi
+@@ -4083,7 +4064,7 @@
+ $as_echo "$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
++*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+ esac
+ host=$ac_cv_host
+ ac_save_IFS=$IFS; IFS='-'
+@@ -4209,11 +4190,11 @@
+ '
+ case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
++ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+ esac
+ case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
++ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ esac
+
+ # Do `set' in a subshell so we don't clobber the current shell's
+@@ -4235,7 +4216,7 @@
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
++ as_fn_error "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+
+@@ -4245,7 +4226,7 @@
+ # Ok.
+ :
+ else
+- as_fn_error $? "newly created file is older than distributed files!
++ as_fn_error "newly created file is older than distributed files!
+ Check your system clock" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+@@ -4483,7 +4464,7 @@
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat >conftest.make <<\_ACEOF
+@@ -4491,7 +4472,7 @@
+ all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+ _ACEOF
+-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
++# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+@@ -4525,7 +4506,7 @@
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+- as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
++ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ fi
+ fi
+
+@@ -5086,8 +5067,8 @@
+
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details" "$LINENO" 5 ; }
++as_fn_error "no acceptable C compiler found in \$PATH
++See \`config.log' for more details." "$LINENO" 5; }
+
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -5201,8 +5182,9 @@
+
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error 77 "C compiler cannot create executables
+-See \`config.log' for more details" "$LINENO" 5 ; }
++{ as_fn_set_status 77
++as_fn_error "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; }
+@@ -5244,8 +5226,8 @@
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details" "$LINENO" 5 ; }
++as_fn_error "cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+ rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+@@ -5302,9 +5284,9 @@
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run C compiled programs.
++as_fn_error "cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details" "$LINENO" 5 ; }
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+ fi
+ fi
+@@ -5355,8 +5337,8 @@
+
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details" "$LINENO" 5 ; }
++as_fn_error "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+@@ -5923,7 +5905,7 @@
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -5939,11 +5921,11 @@
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.i conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+ break
+ fi
+@@ -5982,7 +5964,7 @@
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -5998,18 +5980,18 @@
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.i conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details" "$LINENO" 5 ; }
++as_fn_error "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+
+ ac_ext=c
+@@ -6070,7 +6052,7 @@
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_GREP"; then
+- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_GREP=$GREP
+@@ -6136,7 +6118,7 @@
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP"; then
+- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_EGREP=$EGREP
+@@ -6268,7 +6250,8 @@
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+ "
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -6352,7 +6335,7 @@
+ fi
+ set dummy $CC; ac_cc=`$as_echo "$2" |
+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+-if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
++if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -6895,7 +6878,7 @@
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -6911,11 +6894,11 @@
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.i conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+ break
+ fi
+@@ -6954,7 +6937,7 @@
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -6970,18 +6953,18 @@
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.i conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details" "$LINENO" 5 ; }
++as_fn_error "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+
+ ac_ext=c
+@@ -7546,7 +7529,7 @@
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP"; then
+- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_EGREP=$EGREP
+@@ -7563,7 +7546,7 @@
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat >conftest.make <<\_ACEOF
+@@ -7571,7 +7554,7 @@
+ all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+ _ACEOF
+-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
++# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+@@ -8861,7 +8844,7 @@
+ $EGREP "yes" >/dev/null 2>&1; then :
+ SYS=mingw32
+ else
+- as_fn_error $? "VLC requires -mno-cygwin" "$LINENO" 5
++ as_fn_error "VLC requires -mno-cygwin" "$LINENO" 5
+ fi
+ rm -f conftest*
+
+@@ -9880,7 +9863,7 @@
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_SED"; then
+- as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
++ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_SED=$SED
+@@ -9959,7 +9942,7 @@
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_FGREP"; then
+- as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_FGREP=$FGREP
+@@ -10075,7 +10058,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
++test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+@@ -10277,13 +10260,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:10267: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:10280: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:10263: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:10270: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:10283: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:10266: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:10273: output\"" >&5)
+- (eval echo "\"\$as_me:10286: output\"" >&5)
+ (eval echo "\"\$as_me:10269: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -11472,7 +11468,7 @@ ia64-*-hpux*)
+@@ -11485,7 +11468,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 11475 "configure"' > conftest.$ac_ext
+- echo '#line 11488 "configure"' > conftest.$ac_ext
+ echo '#line 11471 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -13227,11 +13223,11 @@ else
+@@ -12672,7 +12655,7 @@
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -12688,11 +12671,11 @@
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.i conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+ break
+ fi
+@@ -12731,7 +12714,7 @@
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -12747,11 +12730,11 @@
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.i conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+
+ else
+@@ -13240,11 +13223,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13230: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13243: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13226: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13234: \$? = $ac_status" >&5
+- echo "$as_me:13247: \$? = $ac_status" >&5
+ echo "$as_me:13230: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -13566,11 +13562,11 @@ else
+@@ -13579,11 +13562,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13569: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13582: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13565: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13573: \$? = $ac_status" >&5
+- echo "$as_me:13586: \$? = $ac_status" >&5
+ echo "$as_me:13569: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -13671,11 +13667,11 @@ else
+@@ -13684,11 +13667,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13674: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13687: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13670: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13678: \$? = $ac_status" >&5
+- echo "$as_me:13691: \$? = $ac_status" >&5
+ echo "$as_me:13674: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -13726,11 +13722,11 @@ else
+@@ -13739,11 +13722,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13729: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13742: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13725: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13733: \$? = $ac_status" >&5
+- echo "$as_me:13746: \$? = $ac_status" >&5
+ echo "$as_me:13729: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -16110,7 +16106,7 @@ else
+@@ -16123,7 +16106,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 16113 "configure"
+-#line 16126 "configure"
+#line 16109 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -16206,7 +16202,7 @@ else
+@@ -16219,7 +16202,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 16209 "configure"
+-#line 16222 "configure"
+#line 16205 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -18162,11 +18158,11 @@ else
+@@ -16634,7 +16617,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
++test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+@@ -18175,11 +18158,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18165: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18178: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18161: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18169: \$? = $ac_status" >&5
+- echo "$as_me:18182: \$? = $ac_status" >&5
+ echo "$as_me:18165: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -18261,11 +18257,11 @@ else
+@@ -18274,11 +18257,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18264: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18277: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18260: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18268: \$? = $ac_status" >&5
+- echo "$as_me:18281: \$? = $ac_status" >&5
+ echo "$as_me:18264: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -18313,11 +18309,11 @@ else
+@@ -18326,11 +18309,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18316: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18329: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18312: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18320: \$? = $ac_status" >&5
+- echo "$as_me:18333: \$? = $ac_status" >&5
+ echo "$as_me:18316: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -23874,10 +23870,6 @@ fi # end "${SYS}" != "mingw32" -a "${SYS
+@@ -19301,7 +19284,7 @@
+
+ if test "${enable_shared}" = "no"; then :
+
+- as_fn_error $? "VLC is based on plugins. Shared libraries cannot be disabled." "$LINENO" 5
++ as_fn_error "VLC is based on plugins. Shared libraries cannot be disabled." "$LINENO" 5
+
+ fi
+
+@@ -19716,7 +19699,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
++test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+ if test "${acl_cv_prog_gnu_ld+set}" = set; then :
+@@ -20363,7 +20346,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+ $as_echo_n "checking for GNU gettext in libc... " >&6; }
+-if eval "test \"\${$gt_func_gnugettext_libc+set}\"" = set; then :
++if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -21034,7 +21017,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+ $as_echo_n "checking for GNU gettext in libintl... " >&6; }
+-if eval "test \"\${$gt_func_gnugettext_libintl+set}\"" = set; then :
++if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ gt_save_CPPFLAGS="$CPPFLAGS"
+@@ -21507,10 +21490,10 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: present" >&5
+ $as_echo "present" >&6; }
+- as_fn_error $? "LibVLC requires mingw-runtime version 3.15 or higher!" "$LINENO" 5
++ as_fn_error "LibVLC requires mingw-runtime version 3.15 or higher!" "$LINENO" 5
+
+ fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+ CPPFLAGS="${CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=1"
+ CPPFLAGS_save="${CPPFLAGS_save} -D__USE_MINGW_ANSI_STDIO=1"
+
+@@ -21749,7 +21732,7 @@
+ $as_echo "found" >&6; }
+ if test "x${enable_nls}" != "xno" || test "x${enable_mozilla}" != "xno"; then :
+
+- as_fn_error $? "Buggy GNU/libc (version 2.5 - 2.7) present. VLC would crash; there is no viable
++ as_fn_error "Buggy GNU/libc (version 2.5 - 2.7) present. VLC would crash; there is no viable
+ work-around for this. Check with your distribution vendor on how to update the
+ glibc run-time. Alternatively, build with --disable-nls --disable-mozilla and
+ be sure to not use LibVLC from other applications/wrappers." "$LINENO" 5
+@@ -21763,7 +21746,7 @@
+ fi
+
+ fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+
+
+
+@@ -21800,7 +21783,8 @@
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -21808,317 +21792,25 @@
+ fi
+ done
+
+-ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf"
+-if test "x$ac_cv_func_asprintf" = x""yes; then :
+- $as_echo "#define HAVE_ASPRINTF 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" asprintf.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS asprintf.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "atof" "ac_cv_func_atof"
+-if test "x$ac_cv_func_atof" = x""yes; then :
+- $as_echo "#define HAVE_ATOF 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" atof.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS atof.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "atoll" "ac_cv_func_atoll"
+-if test "x$ac_cv_func_atoll" = x""yes; then :
+- $as_echo "#define HAVE_ATOLL 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" atoll.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS atoll.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
+-if test "x$ac_cv_func_getcwd" = x""yes; then :
+- $as_echo "#define HAVE_GETCWD 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" getcwd.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS getcwd.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "getdelim" "ac_cv_func_getdelim"
+-if test "x$ac_cv_func_getdelim" = x""yes; then :
+- $as_echo "#define HAVE_GETDELIM 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" getdelim.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS getdelim.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "getpid" "ac_cv_func_getpid"
+-if test "x$ac_cv_func_getpid" = x""yes; then :
+- $as_echo "#define HAVE_GETPID 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" getpid.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS getpid.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "gmtime_r" "ac_cv_func_gmtime_r"
+-if test "x$ac_cv_func_gmtime_r" = x""yes; then :
+- $as_echo "#define HAVE_GMTIME_R 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" gmtime_r.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS gmtime_r.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "lldiv" "ac_cv_func_lldiv"
+-if test "x$ac_cv_func_lldiv" = x""yes; then :
+- $as_echo "#define HAVE_LLDIV 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" lldiv.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS lldiv.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r"
+-if test "x$ac_cv_func_localtime_r" = x""yes; then :
+- $as_echo "#define HAVE_LOCALTIME_R 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" localtime_r.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS localtime_r.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "nrand48" "ac_cv_func_nrand48"
+-if test "x$ac_cv_func_nrand48" = x""yes; then :
+- $as_echo "#define HAVE_NRAND48 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" nrand48.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS nrand48.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "rewind" "ac_cv_func_rewind"
+-if test "x$ac_cv_func_rewind" = x""yes; then :
+- $as_echo "#define HAVE_REWIND 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" rewind.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS rewind.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp"
+-if test "x$ac_cv_func_strcasecmp" = x""yes; then :
+- $as_echo "#define HAVE_STRCASECMP 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" strcasecmp.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "strcasestr" "ac_cv_func_strcasestr"
+-if test "x$ac_cv_func_strcasestr" = x""yes; then :
+- $as_echo "#define HAVE_STRCASESTR 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" strcasestr.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS strcasestr.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
+-if test "x$ac_cv_func_strdup" = x""yes; then :
+- $as_echo "#define HAVE_STRDUP 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" strdup.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS strdup.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy"
+-if test "x$ac_cv_func_strlcpy" = x""yes; then :
+- $as_echo "#define HAVE_STRLCPY 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" strlcpy.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS strlcpy.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp"
+-if test "x$ac_cv_func_strncasecmp" = x""yes; then :
+- $as_echo "#define HAVE_STRNCASECMP 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" strncasecmp.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS strncasecmp.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "strndup" "ac_cv_func_strndup"
+-if test "x$ac_cv_func_strndup" = x""yes; then :
+- $as_echo "#define HAVE_STRNDUP 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" strndup.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS strndup.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
+-if test "x$ac_cv_func_strnlen" = x""yes; then :
+- $as_echo "#define HAVE_STRNLEN 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" strnlen.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS strnlen.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "strsep" "ac_cv_func_strsep"
+-if test "x$ac_cv_func_strsep" = x""yes; then :
+- $as_echo "#define HAVE_STRSEP 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" strsep.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS strsep.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "strtof" "ac_cv_func_strtof"
+-if test "x$ac_cv_func_strtof" = x""yes; then :
+- $as_echo "#define HAVE_STRTOF 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" strtof.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS strtof.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "strtok_r" "ac_cv_func_strtok_r"
+-if test "x$ac_cv_func_strtok_r" = x""yes; then :
+- $as_echo "#define HAVE_STRTOK_R 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" strtok_r.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS strtok_r.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "strtoll" "ac_cv_func_strtoll"
+-if test "x$ac_cv_func_strtoll" = x""yes; then :
+- $as_echo "#define HAVE_STRTOLL 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" strtoll.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS strtoll.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "swab" "ac_cv_func_swab"
+-if test "x$ac_cv_func_swab" = x""yes; then :
+- $as_echo "#define HAVE_SWAB 1" >>confdefs.h
+-
+-else
+- case " $LIBOBJS " in
+- *" swab.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS swab.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf"
+-if test "x$ac_cv_func_vasprintf" = x""yes; then :
+- $as_echo "#define HAVE_VASPRINTF 1" >>confdefs.h
++for ac_func in asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab vasprintf
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+
+ else
+ case " $LIBOBJS " in
+- *" vasprintf.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS vasprintf.$ac_objext"
++ *" $ac_func.$ac_objext "* ) ;;
++ *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
+ ;;
+ esac
+
+ fi
++done
+
+
+ for ac_func in fdatasync
+@@ -22142,7 +21834,8 @@
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -22484,7 +22177,8 @@
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -23394,7 +23088,8 @@
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -23905,7 +23600,8 @@
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -23918,7 +23614,8 @@
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -23931,7 +23628,8 @@
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -23976,7 +23674,8 @@
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -23989,7 +23688,8 @@
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -24185,10 +23885,6 @@
@@ -182,7 +1599,7 @@ Forwarded: not-needed
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
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.
-@@ -23990,6 +23982,7 @@ $as_echo "yes" >&6; }
+@@ -24301,6 +23997,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
@@ -190,7 +1607,7 @@ Forwarded: not-needed
fi
if test -n "${PKG_CONFIG}" ; then :
-@@ -24059,10 +24052,11 @@ pkg_failed=no
+@@ -24370,10 +24067,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MINIZIP" >&5
$as_echo_n "checking for MINIZIP... " >&6; }
@@ -206,7 +1623,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"minizip \""; } >&5
($PKG_CONFIG --exists --print-errors "minizip ") 2>&5
ac_status=$?
-@@ -24072,13 +24066,15 @@ if test -n "$MINIZIP_CFLAGS"; then
+@@ -24383,13 +24081,15 @@
else
pkg_failed=yes
fi
@@ -228,7 +1645,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"minizip \""; } >&5
($PKG_CONFIG --exists --print-errors "minizip ") 2>&5
ac_status=$?
-@@ -24088,15 +24084,14 @@ if test -n "$MINIZIP_LIBS"; then
+@@ -24399,15 +24099,14 @@
else
pkg_failed=yes
fi
@@ -247,7 +1664,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -24104,13 +24099,15 @@ else
+@@ -24415,13 +24114,15 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -265,7 +1682,7 @@ Forwarded: not-needed
for ac_header in unzip.h
do :
-@@ -24135,8 +24132,6 @@ done
+@@ -24446,8 +24147,6 @@
elif test $pkg_failed = untried; then
@@ -274,7 +1691,7 @@ Forwarded: not-needed
for ac_header in unzip.h
do :
-@@ -24240,10 +24235,11 @@ pkg_failed=no
+@@ -24551,10 +24250,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
$as_echo_n "checking for DBUS... " >&6; }
@@ -290,7 +1707,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0.0\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.0.0") 2>&5
ac_status=$?
-@@ -24253,13 +24249,15 @@ if test -n "$DBUS_CFLAGS"; then
+@@ -24564,13 +24264,15 @@
else
pkg_failed=yes
fi
@@ -312,7 +1729,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0.0\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.0.0") 2>&5
ac_status=$?
-@@ -24269,15 +24267,14 @@ if test -n "$DBUS_LIBS"; then
+@@ -24580,15 +24282,14 @@
else
pkg_failed=yes
fi
@@ -331,7 +1748,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -24285,18 +24282,18 @@ else
+@@ -24596,19 +24297,19 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -344,7 +1761,7 @@ Forwarded: not-needed
# Put the nasty error message in config.log where it belongs
echo "$DBUS_PKG_ERRORS" >&5
-- as_fn_error "Couldn't find DBus >= 1.0.0, install libdbus-dev ?" "$LINENO" 5
+- as_fn_error $? "Couldn't find DBus >= 1.0.0, install libdbus-dev ?" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ as_fn_error "Couldn't find DBus >= 1.0.0, install libdbus-dev ?" "$LINENO" 5
@@ -352,10 +1769,39 @@ Forwarded: not-needed
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error "Couldn't find DBus >= 1.0.0, install libdbus-dev ?" "$LINENO" 5
+- as_fn_error $? "Couldn't find DBus >= 1.0.0, install libdbus-dev ?" "$LINENO" 5
++ as_fn_error "Couldn't find DBus >= 1.0.0, install libdbus-dev ?" "$LINENO" 5
else
-@@ -26098,10 +26095,11 @@ pkg_failed=no
+ DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
+@@ -24748,7 +24449,7 @@
+ as_ac_var=`echo "ac_cv_prog_cc_flags_-W$a" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -W$a" >&5
+ $as_echo_n "checking if $CC accepts -W$a... " >&6; }
+-if eval "test \"\${$as_ac_var+set}\"" = set; then :
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+@@ -24795,7 +24496,7 @@
+ as_ac_var=`echo "ac_cv_prog_cc_flags_-pipe" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -pipe" >&5
+ $as_echo_n "checking if $CC accepts -pipe... " >&6; }
+-if eval "test \"\${$as_ac_var+set}\"" = set; then :
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+@@ -26284,7 +25985,7 @@
+ else
+ CFLAGS_TUNING=""; tuning="no"
+ if test "${with_tuning}"; then :
+- as_fn_error $? "requested tuning not supported" "$LINENO" 5
++ as_fn_error "requested tuning not supported" "$LINENO" 5
+ fi
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -26412,10 +26113,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
$as_echo_n "checking for LUA... " >&6; }
@@ -371,7 +1817,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5
($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5
ac_status=$?
-@@ -26111,13 +26109,15 @@ if test -n "$LUA_CFLAGS"; then
+@@ -26425,13 +26127,15 @@
else
pkg_failed=yes
fi
@@ -393,7 +1839,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5
($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5
ac_status=$?
-@@ -26127,15 +26127,14 @@ if test -n "$LUA_LIBS"; then
+@@ -26441,15 +26145,14 @@
else
pkg_failed=yes
fi
@@ -412,7 +1858,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -26143,13 +26142,15 @@ else
+@@ -26457,13 +26160,15 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -430,7 +1876,7 @@ Forwarded: not-needed
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: lua5.1 not found, trying lua >= 5.1 instead" >&5
$as_echo "$as_me: WARNING: lua5.1 not found, trying lua >= 5.1 instead" >&2;}
-@@ -26158,10 +26159,11 @@ pkg_failed=no
+@@ -26472,10 +26177,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
$as_echo_n "checking for LUA... " >&6; }
@@ -446,7 +1892,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5
($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5
ac_status=$?
-@@ -26171,13 +26173,15 @@ if test -n "$LUA_CFLAGS"; then
+@@ -26485,13 +26191,15 @@
else
pkg_failed=yes
fi
@@ -468,7 +1914,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5
($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5
ac_status=$?
-@@ -26187,15 +26191,14 @@ if test -n "$LUA_LIBS"; then
+@@ -26501,15 +26209,14 @@
else
pkg_failed=yes
fi
@@ -487,7 +1933,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -26203,13 +26206,15 @@ else
+@@ -26517,20 +26224,23 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -505,7 +1951,117 @@ Forwarded: not-needed
have_lua=yes
for ac_header in lua.h lauxlib.h lualib.h
-@@ -26357,8 +26362,6 @@ fi
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -26541,10 +26251,9 @@
+
+ done
+
+- as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5
+ $as_echo_n "checking for luaL_newstate in -llua5.1 ... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if test "${ac_cv_lib_lua5_1__luaL_newstate+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -26568,24 +26277,22 @@
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- eval "$as_ac_Lib=yes"
++ ac_cv_lib_lua5_1__luaL_newstate=yes
+ else
+- eval "$as_ac_Lib=no"
++ ac_cv_lib_lua5_1__luaL_newstate=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-eval ac_res=\$$as_ac_Lib
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua5_1__luaL_newstate" >&5
++$as_echo "$ac_cv_lib_lua5_1__luaL_newstate" >&6; }
++if test "x$ac_cv_lib_lua5_1__luaL_newstate" = x""yes; then :
+ LUA_LIBS="-llua5.1"
+ else
+- as_ac_Lib=`$as_echo "ac_cv_lib_lua51 ''_luaL_newstate" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5
+ $as_echo_n "checking for luaL_newstate in -llua51 ... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if test "${ac_cv_lib_lua51__luaL_newstate+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -26609,24 +26316,22 @@
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- eval "$as_ac_Lib=yes"
++ ac_cv_lib_lua51__luaL_newstate=yes
+ else
+- eval "$as_ac_Lib=no"
++ ac_cv_lib_lua51__luaL_newstate=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-eval ac_res=\$$as_ac_Lib
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua51__luaL_newstate" >&5
++$as_echo "$ac_cv_lib_lua51__luaL_newstate" >&6; }
++if test "x$ac_cv_lib_lua51__luaL_newstate" = x""yes; then :
+ LUA_LIBS="-llua51"
+ else
+- as_ac_Lib=`$as_echo "ac_cv_lib_lua ''_luaL_newstate" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5
+ $as_echo_n "checking for luaL_newstate in -llua ... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if test "${ac_cv_lib_lua__luaL_newstate+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -26650,18 +26355,17 @@
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- eval "$as_ac_Lib=yes"
++ ac_cv_lib_lua__luaL_newstate=yes
+ else
+- eval "$as_ac_Lib=no"
++ ac_cv_lib_lua__luaL_newstate=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-eval ac_res=\$$as_ac_Lib
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua__luaL_newstate" >&5
++$as_echo "$ac_cv_lib_lua__luaL_newstate" >&6; }
++if test "x$ac_cv_lib_lua__luaL_newstate" = x""yes; then :
+ LUA_LIBS="-llua"
+ else
+ have_lua=no
+@@ -26676,15 +26380,14 @@
elif test $pkg_failed = untried; then
@@ -514,7 +2070,117 @@ Forwarded: not-needed
have_lua=yes
for ac_header in lua.h lauxlib.h lualib.h
-@@ -26514,8 +26517,6 @@ $as_echo "yes" >&6; }
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -26695,10 +26398,9 @@
+
+ done
+
+- as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5
+ $as_echo_n "checking for luaL_newstate in -llua5.1 ... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if test "${ac_cv_lib_lua5_1__luaL_newstate+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -26722,24 +26424,22 @@
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- eval "$as_ac_Lib=yes"
++ ac_cv_lib_lua5_1__luaL_newstate=yes
+ else
+- eval "$as_ac_Lib=no"
++ ac_cv_lib_lua5_1__luaL_newstate=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-eval ac_res=\$$as_ac_Lib
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua5_1__luaL_newstate" >&5
++$as_echo "$ac_cv_lib_lua5_1__luaL_newstate" >&6; }
++if test "x$ac_cv_lib_lua5_1__luaL_newstate" = x""yes; then :
+ LUA_LIBS="-llua5.1"
+ else
+- as_ac_Lib=`$as_echo "ac_cv_lib_lua51 ''_luaL_newstate" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5
+ $as_echo_n "checking for luaL_newstate in -llua51 ... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if test "${ac_cv_lib_lua51__luaL_newstate+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -26763,24 +26463,22 @@
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- eval "$as_ac_Lib=yes"
++ ac_cv_lib_lua51__luaL_newstate=yes
+ else
+- eval "$as_ac_Lib=no"
++ ac_cv_lib_lua51__luaL_newstate=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-eval ac_res=\$$as_ac_Lib
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua51__luaL_newstate" >&5
++$as_echo "$ac_cv_lib_lua51__luaL_newstate" >&6; }
++if test "x$ac_cv_lib_lua51__luaL_newstate" = x""yes; then :
+ LUA_LIBS="-llua51"
+ else
+- as_ac_Lib=`$as_echo "ac_cv_lib_lua ''_luaL_newstate" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5
+ $as_echo_n "checking for luaL_newstate in -llua ... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if test "${ac_cv_lib_lua__luaL_newstate+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -26804,18 +26502,17 @@
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- eval "$as_ac_Lib=yes"
++ ac_cv_lib_lua__luaL_newstate=yes
+ else
+- eval "$as_ac_Lib=no"
++ ac_cv_lib_lua__luaL_newstate=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-eval ac_res=\$$as_ac_Lib
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua__luaL_newstate" >&5
++$as_echo "$ac_cv_lib_lua__luaL_newstate" >&6; }
++if test "x$ac_cv_lib_lua__luaL_newstate" = x""yes; then :
+ LUA_LIBS="-llua"
+ else
+ have_lua=no
+@@ -26838,8 +26535,6 @@
fi
elif test $pkg_failed = untried; then
@@ -523,7 +2189,7 @@ Forwarded: not-needed
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: lua5.1 not found, trying lua >= 5.1 instead" >&5
$as_echo "$as_me: WARNING: lua5.1 not found, trying lua >= 5.1 instead" >&2;}
-@@ -26524,10 +26525,11 @@ pkg_failed=no
+@@ -26848,10 +26543,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
$as_echo_n "checking for LUA... " >&6; }
@@ -539,7 +2205,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5
($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5
ac_status=$?
-@@ -26537,13 +26539,15 @@ if test -n "$LUA_CFLAGS"; then
+@@ -26861,13 +26557,15 @@
else
pkg_failed=yes
fi
@@ -561,7 +2227,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5
($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5
ac_status=$?
-@@ -26553,15 +26557,14 @@ if test -n "$LUA_LIBS"; then
+@@ -26877,15 +26575,14 @@
else
pkg_failed=yes
fi
@@ -580,7 +2246,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -26569,13 +26572,15 @@ else
+@@ -26893,20 +26590,23 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -598,7 +2264,117 @@ Forwarded: not-needed
have_lua=yes
for ac_header in lua.h lauxlib.h lualib.h
-@@ -26723,8 +26728,6 @@ fi
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -26917,10 +26617,9 @@
+
+ done
+
+- as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5
+ $as_echo_n "checking for luaL_newstate in -llua5.1 ... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if test "${ac_cv_lib_lua5_1__luaL_newstate+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -26944,24 +26643,22 @@
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- eval "$as_ac_Lib=yes"
++ ac_cv_lib_lua5_1__luaL_newstate=yes
+ else
+- eval "$as_ac_Lib=no"
++ ac_cv_lib_lua5_1__luaL_newstate=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-eval ac_res=\$$as_ac_Lib
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua5_1__luaL_newstate" >&5
++$as_echo "$ac_cv_lib_lua5_1__luaL_newstate" >&6; }
++if test "x$ac_cv_lib_lua5_1__luaL_newstate" = x""yes; then :
+ LUA_LIBS="-llua5.1"
+ else
+- as_ac_Lib=`$as_echo "ac_cv_lib_lua51 ''_luaL_newstate" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5
+ $as_echo_n "checking for luaL_newstate in -llua51 ... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if test "${ac_cv_lib_lua51__luaL_newstate+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -26985,24 +26682,22 @@
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- eval "$as_ac_Lib=yes"
++ ac_cv_lib_lua51__luaL_newstate=yes
+ else
+- eval "$as_ac_Lib=no"
++ ac_cv_lib_lua51__luaL_newstate=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-eval ac_res=\$$as_ac_Lib
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua51__luaL_newstate" >&5
++$as_echo "$ac_cv_lib_lua51__luaL_newstate" >&6; }
++if test "x$ac_cv_lib_lua51__luaL_newstate" = x""yes; then :
+ LUA_LIBS="-llua51"
+ else
+- as_ac_Lib=`$as_echo "ac_cv_lib_lua ''_luaL_newstate" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5
+ $as_echo_n "checking for luaL_newstate in -llua ... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if test "${ac_cv_lib_lua__luaL_newstate+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -27026,18 +26721,17 @@
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- eval "$as_ac_Lib=yes"
++ ac_cv_lib_lua__luaL_newstate=yes
+ else
+- eval "$as_ac_Lib=no"
++ ac_cv_lib_lua__luaL_newstate=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-eval ac_res=\$$as_ac_Lib
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua__luaL_newstate" >&5
++$as_echo "$ac_cv_lib_lua__luaL_newstate" >&6; }
++if test "x$ac_cv_lib_lua__luaL_newstate" = x""yes; then :
+ LUA_LIBS="-llua"
+ else
+ have_lua=no
+@@ -27052,15 +26746,14 @@
elif test $pkg_failed = untried; then
@@ -607,7 +2383,135 @@ Forwarded: not-needed
have_lua=yes
for ac_header in lua.h lauxlib.h lualib.h
-@@ -27003,10 +27006,11 @@ pkg_failed=no
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -27071,10 +26764,9 @@
+
+ done
+
+- as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5
+ $as_echo_n "checking for luaL_newstate in -llua5.1 ... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if test "${ac_cv_lib_lua5_1__luaL_newstate+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -27098,24 +26790,22 @@
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- eval "$as_ac_Lib=yes"
++ ac_cv_lib_lua5_1__luaL_newstate=yes
+ else
+- eval "$as_ac_Lib=no"
++ ac_cv_lib_lua5_1__luaL_newstate=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-eval ac_res=\$$as_ac_Lib
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua5_1__luaL_newstate" >&5
++$as_echo "$ac_cv_lib_lua5_1__luaL_newstate" >&6; }
++if test "x$ac_cv_lib_lua5_1__luaL_newstate" = x""yes; then :
+ LUA_LIBS="-llua5.1"
+ else
+- as_ac_Lib=`$as_echo "ac_cv_lib_lua51 ''_luaL_newstate" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5
+ $as_echo_n "checking for luaL_newstate in -llua51 ... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if test "${ac_cv_lib_lua51__luaL_newstate+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -27139,24 +26829,22 @@
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- eval "$as_ac_Lib=yes"
++ ac_cv_lib_lua51__luaL_newstate=yes
+ else
+- eval "$as_ac_Lib=no"
++ ac_cv_lib_lua51__luaL_newstate=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-eval ac_res=\$$as_ac_Lib
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua51__luaL_newstate" >&5
++$as_echo "$ac_cv_lib_lua51__luaL_newstate" >&6; }
++if test "x$ac_cv_lib_lua51__luaL_newstate" = x""yes; then :
+ LUA_LIBS="-llua51"
+ else
+- as_ac_Lib=`$as_echo "ac_cv_lib_lua ''_luaL_newstate" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5
+ $as_echo_n "checking for luaL_newstate in -llua ... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if test "${ac_cv_lib_lua__luaL_newstate+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -27180,18 +26868,17 @@
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- eval "$as_ac_Lib=yes"
++ ac_cv_lib_lua__luaL_newstate=yes
+ else
+- eval "$as_ac_Lib=no"
++ ac_cv_lib_lua__luaL_newstate=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-eval ac_res=\$$as_ac_Lib
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua__luaL_newstate" >&5
++$as_echo "$ac_cv_lib_lua__luaL_newstate" >&6; }
++if test "x$ac_cv_lib_lua__luaL_newstate" = x""yes; then :
+ LUA_LIBS="-llua"
+ else
+ have_lua=no
+@@ -27234,7 +26921,7 @@
+
+
+ else
+- as_fn_error $? "Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error." "$LINENO" 5
++ as_fn_error "Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error." "$LINENO" 5
+ fi
+
+ for ac_prog in ${LUAC} luac
+@@ -27285,7 +26972,7 @@
+
+ if test "${LUAC}" = "false"; then :
+
+- as_fn_error $? "Could not find the LUA byte compiler." "$LINENO" 5
++ as_fn_error "Could not find the LUA byte compiler." "$LINENO" 5
+
+ fi
+ fi
+@@ -27337,10 +27024,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPROXY" >&5
$as_echo_n "checking for LIBPROXY... " >&6; }
@@ -623,7 +2527,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libproxy-1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libproxy-1.0") 2>&5
ac_status=$?
-@@ -27016,13 +27020,15 @@ if test -n "$LIBPROXY_CFLAGS"; then
+@@ -27350,13 +27038,15 @@
else
pkg_failed=yes
fi
@@ -645,7 +2549,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libproxy-1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libproxy-1.0") 2>&5
ac_status=$?
-@@ -27032,15 +27038,14 @@ if test -n "$LIBPROXY_LIBS"; then
+@@ -27366,15 +27056,14 @@
else
pkg_failed=yes
fi
@@ -664,7 +2568,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -27048,13 +27053,15 @@ else
+@@ -27382,27 +27071,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -682,7 +2586,9 @@ Forwarded: not-needed
if test "x${enable_libproxy}" != "x"; then :
-@@ -27063,8 +27070,6 @@ fi
+- as_fn_error $? "libproxy could not be found on your system" "$LINENO" 5
++ as_fn_error "libproxy could not be found on your system" "$LINENO" 5
+
fi
elif test $pkg_failed = untried; then
@@ -691,7 +2597,21 @@ Forwarded: not-needed
if test "x${enable_libproxy}" != "x"; then :
-@@ -27217,10 +27222,11 @@ pkg_failed=no
+- as_fn_error $? "libproxy could not be found on your system" "$LINENO" 5
++ as_fn_error "libproxy could not be found on your system" "$LINENO" 5
+
+ fi
+
+@@ -27444,7 +27133,7 @@
+
+ if test "${enable_sout}" = "no"; then :
+
+- as_fn_error $? "VLM requires the stream output. Do not use --disable-sout." "$LINENO" 5
++ as_fn_error "VLM requires the stream output. Do not use --disable-sout." "$LINENO" 5
+
+ fi
+
+@@ -27551,10 +27240,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY" >&5
$as_echo_n "checking for NOTIFY... " >&6; }
@@ -707,7 +2627,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5
($PKG_CONFIG --exists --print-errors "libnotify") 2>&5
ac_status=$?
-@@ -27230,13 +27236,15 @@ if test -n "$NOTIFY_CFLAGS"; then
+@@ -27564,13 +27254,15 @@
else
pkg_failed=yes
fi
@@ -729,7 +2649,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5
($PKG_CONFIG --exists --print-errors "libnotify") 2>&5
ac_status=$?
-@@ -27246,15 +27254,14 @@ if test -n "$NOTIFY_LIBS"; then
+@@ -27580,15 +27272,14 @@
else
pkg_failed=yes
fi
@@ -748,7 +2668,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -27262,14 +27269,16 @@ else
+@@ -27596,25 +27287,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -762,22 +2682,26 @@ Forwarded: not-needed
echo "$NOTIFY_PKG_ERRORS" >&5
- if test x"$enable_notify" = "xyes"; then :
+- as_fn_error $? "Library libnotify needed for notify was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_notify" = "xyes"; then :
- as_fn_error "Library libnotify needed for notify was not found" "$LINENO" 5
++ as_fn_error "Library libnotify needed for notify was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libnotify needed for notify was not found" >&5
-@@ -27277,8 +27286,6 @@ $as_echo "$as_me: WARNING: Library libno
+ $as_echo "$as_me: WARNING: Library libnotify needed for notify was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_notify" = "xyes"; then :
- as_fn_error "Library libnotify needed for notify was not found" "$LINENO" 5
+- as_fn_error $? "Library libnotify needed for notify was not found" "$LINENO" 5
++ as_fn_error "Library libnotify needed for notify was not found" "$LINENO" 5
else
-@@ -27316,10 +27323,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libnotify needed for notify was not found" >&5
+ $as_echo "$as_me: WARNING: Library libnotify needed for notify was not found" >&2;}
+@@ -27650,10 +27341,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY" >&5
$as_echo_n "checking for NOTIFY... " >&6; }
@@ -793,7 +2717,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5
($PKG_CONFIG --exists --print-errors "libnotify") 2>&5
ac_status=$?
-@@ -27329,13 +27337,15 @@ if test -n "$NOTIFY_CFLAGS"; then
+@@ -27663,13 +27355,15 @@
else
pkg_failed=yes
fi
@@ -815,7 +2739,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5
($PKG_CONFIG --exists --print-errors "libnotify") 2>&5
ac_status=$?
-@@ -27345,15 +27355,14 @@ if test -n "$NOTIFY_LIBS"; then
+@@ -27679,15 +27373,14 @@
else
pkg_failed=yes
fi
@@ -834,7 +2758,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -27361,14 +27370,16 @@ else
+@@ -27695,27 +27388,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -852,9 +2776,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_notify=no
if test x"$enable_notify" = "xyes"; then :
- as_fn_error "Library libnotify needed for notify was not found" "$LINENO" 5
+- as_fn_error $? "Library libnotify needed for notify was not found" "$LINENO" 5
++ as_fn_error "Library libnotify needed for notify was not found" "$LINENO" 5
else
-@@ -27377,8 +27388,6 @@ $as_echo "$as_me: WARNING: Library libno
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libnotify needed for notify was not found" >&5
+ $as_echo "$as_me: WARNING: Library libnotify needed for notify was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -862,8 +2788,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_notify=no
if test x"$enable_notify" = "xyes"; then :
- as_fn_error "Library libnotify needed for notify was not found" "$LINENO" 5
-@@ -27442,10 +27451,11 @@ pkg_failed=no
+- as_fn_error $? "Library libnotify needed for notify was not found" "$LINENO" 5
++ as_fn_error "Library libnotify needed for notify was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libnotify needed for notify was not found" >&5
+ $as_echo "$as_me: WARNING: Library libnotify needed for notify was not found" >&2;}
+@@ -27776,10 +27469,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TAGLIB" >&5
$as_echo_n "checking for TAGLIB... " >&6; }
@@ -879,7 +2809,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"taglib >= 1.5\""; } >&5
($PKG_CONFIG --exists --print-errors "taglib >= 1.5") 2>&5
ac_status=$?
-@@ -27455,13 +27465,15 @@ if test -n "$TAGLIB_CFLAGS"; then
+@@ -27789,13 +27483,15 @@
else
pkg_failed=yes
fi
@@ -901,7 +2831,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"taglib >= 1.5\""; } >&5
($PKG_CONFIG --exists --print-errors "taglib >= 1.5") 2>&5
ac_status=$?
-@@ -27471,15 +27483,14 @@ if test -n "$TAGLIB_LIBS"; then
+@@ -27805,15 +27501,14 @@
else
pkg_failed=yes
fi
@@ -920,7 +2850,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -27487,18 +27498,18 @@ else
+@@ -27821,18 +27516,18 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -944,7 +2874,53 @@ Forwarded: not-needed
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: TagLib library not found" >&5
$as_echo "$as_me: WARNING: TagLib library not found" >&2;}
else
-@@ -27936,10 +27947,11 @@ pkg_failed=no
+@@ -27945,7 +27640,7 @@
+ $EGREP "yes" >/dev/null 2>&1; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia.
++ as_fn_error "Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia.
+ lternatively you can use --disable-live555 to disable the liveMedia plugin." "$LINENO" 5
+
+ else
+@@ -28106,7 +27801,7 @@
+ if test -z "${real_live555_tree}"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "cannot cd to ${with_live555_tree}" "$LINENO" 5
++ as_fn_error "cannot cd to ${with_live555_tree}" "$LINENO" 5
+ fi
+ if test -f "${real_live555_tree}/liveMedia/libliveMedia.a"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${real_live555_tree}/liveMedia/libliveMedia.a" >&5
+@@ -28116,7 +27811,8 @@
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -28136,7 +27832,7 @@
+ $EGREP "yes" >/dev/null 2>&1; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia.
++ as_fn_error "Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia.
+ lternatively you can use --disable-live555 to disable the liveMedia plugin." "$LINENO" 5
+
+ else
+@@ -28232,7 +27928,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ if test "${enable_live555}" = "yes"; then
+- as_fn_error $? "cannot find ${real_live555_tree}/liveMedia/libliveMedia.a, make sure you compiled live555 in ${with_live555_tree}" "$LINENO" 5
++ as_fn_error "cannot find ${real_live555_tree}/liveMedia/libliveMedia.a, make sure you compiled live555 in ${with_live555_tree}" "$LINENO" 5
+ fi
+ fi
+ fi
+@@ -28269,10 +27965,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DC1394" >&5
$as_echo_n "checking for DC1394... " >&6; }
@@ -960,7 +2936,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0") 2>&5
ac_status=$?
-@@ -27949,13 +27961,15 @@ if test -n "$DC1394_CFLAGS"; then
+@@ -28282,13 +27979,15 @@
else
pkg_failed=yes
fi
@@ -982,7 +2958,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0") 2>&5
ac_status=$?
-@@ -27965,15 +27979,14 @@ if test -n "$DC1394_LIBS"; then
+@@ -28298,15 +27997,14 @@
else
pkg_failed=yes
fi
@@ -1001,7 +2977,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -27981,14 +27994,16 @@ else
+@@ -28314,25 +28012,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1015,22 +2991,26 @@ Forwarded: not-needed
echo "$DC1394_PKG_ERRORS" >&5
- if test x"$enable_dc1394" = "xyes"; then :
+- as_fn_error $? "Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_dc1394" = "xyes"; then :
- as_fn_error "Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" "$LINENO" 5
++ as_fn_error "Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&5
-@@ -27996,8 +28011,6 @@ $as_echo "$as_me: WARNING: Library libra
+ $as_echo "$as_me: WARNING: Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_dc1394" = "xyes"; then :
- as_fn_error "Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" "$LINENO" 5
+- as_fn_error $? "Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" "$LINENO" 5
++ as_fn_error "Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" "$LINENO" 5
else
-@@ -28035,10 +28048,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&5
+ $as_echo "$as_me: WARNING: Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&2;}
+@@ -28368,10 +28066,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DC1394" >&5
$as_echo_n "checking for DC1394... " >&6; }
@@ -1046,7 +3026,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0") 2>&5
ac_status=$?
-@@ -28048,13 +28062,15 @@ if test -n "$DC1394_CFLAGS"; then
+@@ -28381,13 +28080,15 @@
else
pkg_failed=yes
fi
@@ -1068,7 +3048,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0") 2>&5
ac_status=$?
-@@ -28064,15 +28080,14 @@ if test -n "$DC1394_LIBS"; then
+@@ -28397,15 +28098,14 @@
else
pkg_failed=yes
fi
@@ -1087,7 +3067,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -28080,14 +28095,16 @@ else
+@@ -28413,27 +28113,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1105,9 +3085,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_dc1394=no
if test x"$enable_dc1394" = "xyes"; then :
- as_fn_error "Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" "$LINENO" 5
+- as_fn_error $? "Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" "$LINENO" 5
++ as_fn_error "Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" "$LINENO" 5
else
-@@ -28096,8 +28113,6 @@ $as_echo "$as_me: WARNING: Library libra
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&5
+ $as_echo "$as_me: WARNING: Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -1115,8 +3097,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_dc1394=no
if test x"$enable_dc1394" = "xyes"; then :
- as_fn_error "Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" "$LINENO" 5
-@@ -28178,10 +28193,11 @@ pkg_failed=no
+- as_fn_error $? "Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" "$LINENO" 5
++ as_fn_error "Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&5
+ $as_echo "$as_me: WARNING: Library libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&2;}
+@@ -28511,10 +28211,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DV" >&5
$as_echo_n "checking for DV... " >&6; }
@@ -1132,7 +3118,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw1394 >= 2.0.1 libavc1394 >= 0.5.3\""; } >&5
($PKG_CONFIG --exists --print-errors "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3") 2>&5
ac_status=$?
-@@ -28191,13 +28207,15 @@ if test -n "$DV_CFLAGS"; then
+@@ -28524,13 +28225,15 @@
else
pkg_failed=yes
fi
@@ -1154,7 +3140,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw1394 >= 2.0.1 libavc1394 >= 0.5.3\""; } >&5
($PKG_CONFIG --exists --print-errors "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3") 2>&5
ac_status=$?
-@@ -28207,15 +28225,14 @@ if test -n "$DV_LIBS"; then
+@@ -28540,15 +28243,14 @@
else
pkg_failed=yes
fi
@@ -1173,7 +3159,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -28223,14 +28240,16 @@ else
+@@ -28556,25 +28258,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1187,22 +3173,26 @@ Forwarded: not-needed
echo "$DV_PKG_ERRORS" >&5
- if test x"$enable_dv" = "xyes"; then :
+- as_fn_error $? "Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_dv" = "xyes"; then :
- as_fn_error "Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" "$LINENO" 5
++ as_fn_error "Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" >&5
-@@ -28238,8 +28257,6 @@ $as_echo "$as_me: WARNING: Library libra
+ $as_echo "$as_me: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_dv" = "xyes"; then :
- as_fn_error "Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" "$LINENO" 5
+- as_fn_error $? "Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" "$LINENO" 5
++ as_fn_error "Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" "$LINENO" 5
else
-@@ -28277,10 +28294,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" >&5
+ $as_echo "$as_me: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" >&2;}
+@@ -28610,10 +28312,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DV" >&5
$as_echo_n "checking for DV... " >&6; }
@@ -1218,7 +3208,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw1394 >= 2.0.1 libavc1394 >= 0.5.3\""; } >&5
($PKG_CONFIG --exists --print-errors "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3") 2>&5
ac_status=$?
-@@ -28290,13 +28308,15 @@ if test -n "$DV_CFLAGS"; then
+@@ -28623,13 +28326,15 @@
else
pkg_failed=yes
fi
@@ -1240,7 +3230,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw1394 >= 2.0.1 libavc1394 >= 0.5.3\""; } >&5
($PKG_CONFIG --exists --print-errors "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3") 2>&5
ac_status=$?
-@@ -28306,15 +28326,14 @@ if test -n "$DV_LIBS"; then
+@@ -28639,15 +28344,14 @@
else
pkg_failed=yes
fi
@@ -1259,7 +3249,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -28322,14 +28341,16 @@ else
+@@ -28655,27 +28359,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1277,9 +3267,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_dv=no
if test x"$enable_dv" = "xyes"; then :
- as_fn_error "Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" "$LINENO" 5
+- as_fn_error $? "Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" "$LINENO" 5
++ as_fn_error "Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" "$LINENO" 5
else
-@@ -28338,8 +28359,6 @@ $as_echo "$as_me: WARNING: Library libra
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" >&5
+ $as_echo "$as_me: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -1287,8 +3279,48 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_dv=no
if test x"$enable_dv" = "xyes"; then :
- as_fn_error "Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" "$LINENO" 5
-@@ -28835,10 +28854,11 @@ pkg_failed=no
+- as_fn_error $? "Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" "$LINENO" 5
++ as_fn_error "Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" >&5
+ $as_echo "$as_me: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv was not found" >&2;}
+@@ -28807,7 +28511,7 @@
+
+ if test -n "${enable_dvdread}"
+ then
+- as_fn_error $? "cannot find libdvdread headers" "$LINENO" 5
++ as_fn_error "cannot find libdvdread headers" "$LINENO" 5
+ fi
+
+ fi
+@@ -28827,7 +28531,7 @@
+ then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "cannot cd to ${with_dvdread_tree}" "$LINENO" 5
++ as_fn_error "cannot cd to ${with_dvdread_tree}" "$LINENO" 5
+ fi
+ if test -f "${real_dvdread_tree}/dvdread/.libs/libdvdread.a"
+ then
+@@ -28855,7 +28559,7 @@
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "cannot find ${real_dvdread_tree}/dvdread/.libs/libdvdread.a, make sure you compiled libdvdread in ${with_dvdread_tree}" "$LINENO" 5
++ as_fn_error "cannot find ${real_dvdread_tree}/dvdread/.libs/libdvdread.a, make sure you compiled libdvdread in ${with_dvdread_tree}" "$LINENO" 5
+ fi
+ fi
+ else
+@@ -28887,7 +28591,7 @@
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "cannot find ${with_dvdread}/include/dvdread/dvd_reader.h" "$LINENO" 5
++ as_fn_error "cannot find ${with_dvdread}/include/dvdread/dvd_reader.h" "$LINENO" 5
+ fi
+ fi
+
+@@ -29168,10 +28872,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENCV" >&5
$as_echo_n "checking for OPENCV... " >&6; }
@@ -1304,7 +3336,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opencv\""; } >&5
($PKG_CONFIG --exists --print-errors "opencv") 2>&5
ac_status=$?
-@@ -28848,13 +28868,15 @@ if test -n "$OPENCV_CFLAGS"; then
+@@ -29181,13 +28886,15 @@
else
pkg_failed=yes
fi
@@ -1326,7 +3358,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opencv\""; } >&5
($PKG_CONFIG --exists --print-errors "opencv") 2>&5
ac_status=$?
-@@ -28864,15 +28886,14 @@ if test -n "$OPENCV_LIBS"; then
+@@ -29197,15 +28904,14 @@
else
pkg_failed=yes
fi
@@ -1345,7 +3377,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -28880,14 +28901,16 @@ else
+@@ -29213,25 +28919,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1359,22 +3391,26 @@ Forwarded: not-needed
echo "$OPENCV_PKG_ERRORS" >&5
- if test x"$enable_opencv" = "xyes"; then :
+- as_fn_error $? "Library opencv needed for opencv was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_opencv" = "xyes"; then :
- as_fn_error "Library opencv needed for opencv was not found" "$LINENO" 5
++ as_fn_error "Library opencv needed for opencv was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library opencv needed for opencv was not found" >&5
-@@ -28895,8 +28918,6 @@ $as_echo "$as_me: WARNING: Library openc
+ $as_echo "$as_me: WARNING: Library opencv needed for opencv was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_opencv" = "xyes"; then :
- as_fn_error "Library opencv needed for opencv was not found" "$LINENO" 5
+- as_fn_error $? "Library opencv needed for opencv was not found" "$LINENO" 5
++ as_fn_error "Library opencv needed for opencv was not found" "$LINENO" 5
else
-@@ -28944,10 +28965,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library opencv needed for opencv was not found" >&5
+ $as_echo "$as_me: WARNING: Library opencv needed for opencv was not found" >&2;}
+@@ -29277,10 +28983,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENCV" >&5
$as_echo_n "checking for OPENCV... " >&6; }
@@ -1390,7 +3426,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opencv\""; } >&5
($PKG_CONFIG --exists --print-errors "opencv") 2>&5
ac_status=$?
-@@ -28957,13 +28979,15 @@ if test -n "$OPENCV_CFLAGS"; then
+@@ -29290,13 +28997,15 @@
else
pkg_failed=yes
fi
@@ -1412,7 +3448,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opencv\""; } >&5
($PKG_CONFIG --exists --print-errors "opencv") 2>&5
ac_status=$?
-@@ -28973,15 +28997,14 @@ if test -n "$OPENCV_LIBS"; then
+@@ -29306,15 +29015,14 @@
else
pkg_failed=yes
fi
@@ -1431,7 +3467,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -28989,14 +29012,16 @@ else
+@@ -29322,27 +29030,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1449,9 +3485,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_opencv=no
if test x"$enable_opencv" = "xyes"; then :
- as_fn_error "Library opencv needed for opencv was not found" "$LINENO" 5
+- as_fn_error $? "Library opencv needed for opencv was not found" "$LINENO" 5
++ as_fn_error "Library opencv needed for opencv was not found" "$LINENO" 5
else
-@@ -29005,8 +29030,6 @@ $as_echo "$as_me: WARNING: Library openc
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library opencv needed for opencv was not found" >&5
+ $as_echo "$as_me: WARNING: Library opencv needed for opencv was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -1459,8 +3497,48 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_opencv=no
if test x"$enable_opencv" = "xyes"; then :
- as_fn_error "Library opencv needed for opencv was not found" "$LINENO" 5
-@@ -29509,10 +29532,11 @@ pkg_failed=no
+- as_fn_error $? "Library opencv needed for opencv was not found" "$LINENO" 5
++ as_fn_error "Library opencv needed for opencv was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library opencv needed for opencv was not found" >&5
+ $as_echo "$as_me: WARNING: Library opencv needed for opencv was not found" >&2;}
+@@ -29429,7 +29137,7 @@
+
+ else
+ if test -n "${enable_smb}"; then
+- as_fn_error $? "cannot find libsmbclient headers" "$LINENO" 5
++ as_fn_error "cannot find libsmbclient headers" "$LINENO" 5
+ fi
+ fi
+
+@@ -29556,7 +29264,7 @@
+ then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "cannot cd to ${with_dvbpsi_tree}" "$LINENO" 5
++ as_fn_error "cannot cd to ${with_dvbpsi_tree}" "$LINENO" 5
+ fi
+ if test -f "${real_dvbpsi_tree}/src/.libs/libdvbpsi.a"
+ then
+@@ -29606,7 +29314,7 @@
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "cannot find ${real_dvbpsi_tree}/src/.libs/libdvbpsi.a, make sure you compiled libdvbpsi in ${with_dvbpsi_tree}" "$LINENO" 5
++ as_fn_error "cannot find ${real_dvbpsi_tree}/src/.libs/libdvbpsi.a, make sure you compiled libdvbpsi in ${with_dvbpsi_tree}" "$LINENO" 5
+ fi
+ fi
+ ;;
+@@ -29726,7 +29434,7 @@
+
+ if test -n "${enable_dvbpsi}"
+ then
+- as_fn_error $? "Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.6" "$LINENO" 5
++ as_fn_error "Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.6" "$LINENO" 5
+ fi
+
+ fi
+@@ -29842,10 +29550,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBV4L" >&5
$as_echo_n "checking for LIBV4L... " >&6; }
@@ -1476,7 +3554,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4l1\""; } >&5
($PKG_CONFIG --exists --print-errors "libv4l1") 2>&5
ac_status=$?
-@@ -29522,13 +29546,15 @@ if test -n "$LIBV4L_CFLAGS"; then
+@@ -29855,13 +29564,15 @@
else
pkg_failed=yes
fi
@@ -1498,7 +3576,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4l1\""; } >&5
($PKG_CONFIG --exists --print-errors "libv4l1") 2>&5
ac_status=$?
-@@ -29538,15 +29564,14 @@ if test -n "$LIBV4L_LIBS"; then
+@@ -29871,15 +29582,14 @@
else
pkg_failed=yes
fi
@@ -1517,7 +3595,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -29554,19 +29579,19 @@ else
+@@ -29887,19 +29597,19 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1542,7 +3620,17 @@ Forwarded: not-needed
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: LibV4L support disabled because libv4l development headers were not found" >&5
$as_echo "$as_me: WARNING: LibV4L support disabled because libv4l development headers were not found" >&2;}
-@@ -29655,10 +29680,11 @@ pkg_failed=no
+@@ -29955,7 +29665,8 @@
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -29987,10 +29698,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBV4L2" >&5
$as_echo_n "checking for LIBV4L2... " >&6; }
@@ -1558,7 +3646,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4l2\""; } >&5
($PKG_CONFIG --exists --print-errors "libv4l2") 2>&5
ac_status=$?
-@@ -29668,13 +29694,15 @@ if test -n "$LIBV4L2_CFLAGS"; then
+@@ -30000,13 +29712,15 @@
else
pkg_failed=yes
fi
@@ -1580,7 +3668,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4l2\""; } >&5
($PKG_CONFIG --exists --print-errors "libv4l2") 2>&5
ac_status=$?
-@@ -29684,15 +29712,14 @@ if test -n "$LIBV4L2_LIBS"; then
+@@ -30016,15 +29730,14 @@
else
pkg_failed=yes
fi
@@ -1599,7 +3687,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -29700,19 +29727,19 @@ else
+@@ -30032,19 +29745,19 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1624,7 +3712,7 @@ Forwarded: not-needed
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: LibV4L2 support disabled because libv4l2 development headers were not found" >&5
$as_echo "$as_me: WARNING: LibV4L2 support disabled because libv4l2 development headers were not found" >&2;}
-@@ -29839,10 +29866,11 @@ pkg_failed=no
+@@ -30171,10 +29884,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOMEVFS" >&5
$as_echo_n "checking for GNOMEVFS... " >&6; }
@@ -1640,7 +3728,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0") 2>&5
ac_status=$?
-@@ -29852,13 +29880,15 @@ if test -n "$GNOMEVFS_CFLAGS"; then
+@@ -30184,13 +29898,15 @@
else
pkg_failed=yes
fi
@@ -1662,7 +3750,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0") 2>&5
ac_status=$?
-@@ -29868,15 +29898,14 @@ if test -n "$GNOMEVFS_LIBS"; then
+@@ -30200,15 +29916,14 @@
else
pkg_failed=yes
fi
@@ -1681,7 +3769,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -29884,14 +29913,16 @@ else
+@@ -30216,25 +29931,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1695,22 +3783,26 @@ Forwarded: not-needed
echo "$GNOMEVFS_PKG_ERRORS" >&5
- if test x"$enable_gnomevfs" = "xyes"; then :
+- as_fn_error $? "Library gnome-vfs-2.0 needed for gnomevfs was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_gnomevfs" = "xyes"; then :
- as_fn_error "Library gnome-vfs-2.0 needed for gnomevfs was not found" "$LINENO" 5
++ as_fn_error "Library gnome-vfs-2.0 needed for gnomevfs was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library gnome-vfs-2.0 needed for gnomevfs was not found" >&5
-@@ -29899,8 +29930,6 @@ $as_echo "$as_me: WARNING: Library gnome
+ $as_echo "$as_me: WARNING: Library gnome-vfs-2.0 needed for gnomevfs was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_gnomevfs" = "xyes"; then :
- as_fn_error "Library gnome-vfs-2.0 needed for gnomevfs was not found" "$LINENO" 5
+- as_fn_error $? "Library gnome-vfs-2.0 needed for gnomevfs was not found" "$LINENO" 5
++ as_fn_error "Library gnome-vfs-2.0 needed for gnomevfs was not found" "$LINENO" 5
else
-@@ -29938,10 +29967,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library gnome-vfs-2.0 needed for gnomevfs was not found" >&5
+ $as_echo "$as_me: WARNING: Library gnome-vfs-2.0 needed for gnomevfs was not found" >&2;}
+@@ -30270,10 +29985,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOMEVFS" >&5
$as_echo_n "checking for GNOMEVFS... " >&6; }
@@ -1726,7 +3818,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0") 2>&5
ac_status=$?
-@@ -29951,13 +29981,15 @@ if test -n "$GNOMEVFS_CFLAGS"; then
+@@ -30283,13 +29999,15 @@
else
pkg_failed=yes
fi
@@ -1748,7 +3840,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0") 2>&5
ac_status=$?
-@@ -29967,15 +29999,14 @@ if test -n "$GNOMEVFS_LIBS"; then
+@@ -30299,15 +30017,14 @@
else
pkg_failed=yes
fi
@@ -1767,7 +3859,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -29983,14 +30014,16 @@ else
+@@ -30315,27 +30032,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1785,9 +3877,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_gnomevfs=no
if test x"$enable_gnomevfs" = "xyes"; then :
- as_fn_error "Library gnome-vfs-2.0 needed for gnomevfs was not found" "$LINENO" 5
+- as_fn_error $? "Library gnome-vfs-2.0 needed for gnomevfs was not found" "$LINENO" 5
++ as_fn_error "Library gnome-vfs-2.0 needed for gnomevfs was not found" "$LINENO" 5
else
-@@ -29999,8 +30032,6 @@ $as_echo "$as_me: WARNING: Library gnome
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library gnome-vfs-2.0 needed for gnomevfs was not found" >&5
+ $as_echo "$as_me: WARNING: Library gnome-vfs-2.0 needed for gnomevfs was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -1795,8 +3889,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_gnomevfs=no
if test x"$enable_gnomevfs" = "xyes"; then :
- as_fn_error "Library gnome-vfs-2.0 needed for gnomevfs was not found" "$LINENO" 5
-@@ -30064,10 +30095,11 @@ pkg_failed=no
+- as_fn_error $? "Library gnome-vfs-2.0 needed for gnomevfs was not found" "$LINENO" 5
++ as_fn_error "Library gnome-vfs-2.0 needed for gnomevfs was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library gnome-vfs-2.0 needed for gnomevfs was not found" >&5
+ $as_echo "$as_me: WARNING: Library gnome-vfs-2.0 needed for gnomevfs was not found" >&2;}
+@@ -30396,10 +30113,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCDIO" >&5
$as_echo_n "checking for LIBCDIO... " >&6; }
@@ -1812,7 +3910,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio >= 0.78.2 libiso9660 >= 0.72\""; } >&5
($PKG_CONFIG --exists --print-errors "libcdio >= 0.78.2 libiso9660 >= 0.72") 2>&5
ac_status=$?
-@@ -30077,13 +30109,15 @@ if test -n "$LIBCDIO_CFLAGS"; then
+@@ -30409,13 +30127,15 @@
else
pkg_failed=yes
fi
@@ -1834,7 +3932,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio >= 0.78.2 libiso9660 >= 0.72\""; } >&5
($PKG_CONFIG --exists --print-errors "libcdio >= 0.78.2 libiso9660 >= 0.72") 2>&5
ac_status=$?
-@@ -30093,15 +30127,14 @@ if test -n "$LIBCDIO_LIBS"; then
+@@ -30425,15 +30145,14 @@
else
pkg_failed=yes
fi
@@ -1853,7 +3951,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -30109,17 +30142,17 @@ else
+@@ -30441,18 +30160,18 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1866,17 +3964,19 @@ Forwarded: not-needed
# Put the nasty error message in config.log where it belongs
echo "$LIBCDIO_PKG_ERRORS" >&5
-- as_fn_error "vcdx plugin requires libcdio >= 0.78.2 and libiso9660 >= 0.72" "$LINENO" 5
+- as_fn_error $? "vcdx plugin requires libcdio >= 0.78.2 and libiso9660 >= 0.72" "$LINENO" 5
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
+- as_fn_error $? "vcdx plugin requires libcdio >= 0.78.2 and libiso9660 >= 0.72" "$LINENO" 5
+ as_fn_error "vcdx plugin requires libcdio >= 0.78.2 and libiso9660 >= 0.72" "$LINENO" 5
+elif test $pkg_failed = untried; then
- as_fn_error "vcdx plugin requires libcdio >= 0.78.2 and libiso9660 >= 0.72" "$LINENO" 5
++ as_fn_error "vcdx plugin requires libcdio >= 0.78.2 and libiso9660 >= 0.72" "$LINENO" 5
else
LIBCDIO_CFLAGS=$pkg_cv_LIBCDIO_CFLAGS
-@@ -30144,10 +30177,11 @@ pkg_failed=no
+ LIBCDIO_LIBS=$pkg_cv_LIBCDIO_LIBS
+@@ -30476,10 +30195,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBVCDINFO" >&5
$as_echo_n "checking for LIBVCDINFO... " >&6; }
@@ -1892,7 +3992,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvcdinfo >= 0.7.22\""; } >&5
($PKG_CONFIG --exists --print-errors "libvcdinfo >= 0.7.22") 2>&5
ac_status=$?
-@@ -30157,13 +30191,15 @@ if test -n "$LIBVCDINFO_CFLAGS"; then
+@@ -30489,13 +30209,15 @@
else
pkg_failed=yes
fi
@@ -1914,7 +4014,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvcdinfo >= 0.7.22\""; } >&5
($PKG_CONFIG --exists --print-errors "libvcdinfo >= 0.7.22") 2>&5
ac_status=$?
-@@ -30173,15 +30209,14 @@ if test -n "$LIBVCDINFO_LIBS"; then
+@@ -30505,15 +30227,14 @@
else
pkg_failed=yes
fi
@@ -1933,7 +4033,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -30189,17 +30224,17 @@ else
+@@ -30521,18 +30242,18 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1946,17 +4046,19 @@ Forwarded: not-needed
# Put the nasty error message in config.log where it belongs
echo "$LIBVCDINFO_PKG_ERRORS" >&5
-- as_fn_error "vcdx plugin requires libvcdinfo library >= 0.7.22" "$LINENO" 5
+- as_fn_error $? "vcdx plugin requires libvcdinfo library >= 0.7.22" "$LINENO" 5
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
+- as_fn_error $? "vcdx plugin requires libvcdinfo library >= 0.7.22" "$LINENO" 5
+ as_fn_error "vcdx plugin requires libvcdinfo library >= 0.7.22" "$LINENO" 5
+elif test $pkg_failed = untried; then
- as_fn_error "vcdx plugin requires libvcdinfo library >= 0.7.22" "$LINENO" 5
++ as_fn_error "vcdx plugin requires libvcdinfo library >= 0.7.22" "$LINENO" 5
else
LIBVCDINFO_CFLAGS=$pkg_cv_LIBVCDINFO_CFLAGS
-@@ -30404,10 +30439,11 @@ pkg_failed=no
+ LIBVCDINFO_LIBS=$pkg_cv_LIBVCDINFO_LIBS
+@@ -30736,10 +30457,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCDDB" >&5
$as_echo_n "checking for LIBCDDB... " >&6; }
@@ -1972,7 +4074,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcddb >= 0.9.5\""; } >&5
($PKG_CONFIG --exists --print-errors "libcddb >= 0.9.5") 2>&5
ac_status=$?
-@@ -30417,13 +30453,15 @@ if test -n "$LIBCDDB_CFLAGS"; then
+@@ -30749,13 +30471,15 @@
else
pkg_failed=yes
fi
@@ -1994,7 +4096,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcddb >= 0.9.5\""; } >&5
($PKG_CONFIG --exists --print-errors "libcddb >= 0.9.5") 2>&5
ac_status=$?
-@@ -30433,15 +30471,14 @@ if test -n "$LIBCDDB_LIBS"; then
+@@ -30765,15 +30489,14 @@
else
pkg_failed=yes
fi
@@ -2013,7 +4115,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -30449,20 +30486,20 @@ else
+@@ -30781,20 +30504,20 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -2039,7 +4141,17 @@ Forwarded: not-needed
:
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: new enough libcddb not found. CDDB access disabled" >&5
$as_echo "$as_me: WARNING: new enough libcddb not found. CDDB access disabled" >&2;}
-@@ -30751,10 +30788,11 @@ pkg_failed=no
+@@ -30856,7 +30579,8 @@
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -31082,10 +30806,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OGG" >&5
$as_echo_n "checking for OGG... " >&6; }
@@ -2055,7 +4167,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5
ac_status=$?
-@@ -30764,13 +30802,15 @@ if test -n "$OGG_CFLAGS"; then
+@@ -31095,13 +30820,15 @@
else
pkg_failed=yes
fi
@@ -2077,7 +4189,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5
ac_status=$?
-@@ -30780,15 +30820,14 @@ if test -n "$OGG_LIBS"; then
+@@ -31111,15 +30838,14 @@
else
pkg_failed=yes
fi
@@ -2096,7 +4208,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -30796,14 +30835,16 @@ else
+@@ -31127,25 +30853,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -2110,22 +4222,26 @@ Forwarded: not-needed
echo "$OGG_PKG_ERRORS" >&5
- if test x"$enable_ogg" = "xyes"; then :
+- as_fn_error $? "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_ogg" = "xyes"; then :
- as_fn_error "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5
++ as_fn_error "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5
-@@ -30811,8 +30852,6 @@ $as_echo "$as_me: WARNING: Library ogg >
+ $as_echo "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_ogg" = "xyes"; then :
- as_fn_error "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5
+- as_fn_error $? "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5
++ as_fn_error "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5
else
-@@ -30850,10 +30889,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5
+ $as_echo "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;}
+@@ -31181,10 +30907,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OGG" >&5
$as_echo_n "checking for OGG... " >&6; }
@@ -2141,7 +4257,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5
ac_status=$?
-@@ -30863,13 +30903,15 @@ if test -n "$OGG_CFLAGS"; then
+@@ -31194,13 +30921,15 @@
else
pkg_failed=yes
fi
@@ -2163,7 +4279,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5
ac_status=$?
-@@ -30879,15 +30921,14 @@ if test -n "$OGG_LIBS"; then
+@@ -31210,15 +30939,14 @@
else
pkg_failed=yes
fi
@@ -2182,7 +4298,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -30895,14 +30936,16 @@ else
+@@ -31226,27 +30954,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -2200,9 +4316,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_ogg=no
if test x"$enable_ogg" = "xyes"; then :
- as_fn_error "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5
+- as_fn_error $? "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5
++ as_fn_error "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5
else
-@@ -30911,8 +30954,6 @@ $as_echo "$as_me: WARNING: Library ogg >
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5
+ $as_echo "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -2210,8 +4328,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_ogg=no
if test x"$enable_ogg" = "xyes"; then :
- as_fn_error "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5
-@@ -30994,10 +31035,11 @@ pkg_failed=no
+- as_fn_error $? "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5
++ as_fn_error "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5
+ $as_echo "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;}
+@@ -31325,10 +31053,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MUX_OGG" >&5
$as_echo_n "checking for MUX_OGG... " >&6; }
@@ -2227,7 +4349,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5
ac_status=$?
-@@ -31007,13 +31049,15 @@ if test -n "$MUX_OGG_CFLAGS"; then
+@@ -31338,13 +31067,15 @@
else
pkg_failed=yes
fi
@@ -2249,7 +4371,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5
ac_status=$?
-@@ -31023,15 +31067,14 @@ if test -n "$MUX_OGG_LIBS"; then
+@@ -31354,15 +31085,14 @@
else
pkg_failed=yes
fi
@@ -2268,7 +4390,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -31039,14 +31082,16 @@ else
+@@ -31370,25 +31100,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -2282,22 +4404,26 @@ Forwarded: not-needed
echo "$MUX_OGG_PKG_ERRORS" >&5
- if test x"$enable_mux_ogg" = "xyes"; then :
+- as_fn_error $? "Library ogg >= 1.0 needed for mux_ogg was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_mux_ogg" = "xyes"; then :
- as_fn_error "Library ogg >= 1.0 needed for mux_ogg was not found" "$LINENO" 5
++ as_fn_error "Library ogg >= 1.0 needed for mux_ogg was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for mux_ogg was not found" >&5
-@@ -31054,8 +31099,6 @@ $as_echo "$as_me: WARNING: Library ogg >
+ $as_echo "$as_me: WARNING: Library ogg >= 1.0 needed for mux_ogg was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_mux_ogg" = "xyes"; then :
- as_fn_error "Library ogg >= 1.0 needed for mux_ogg was not found" "$LINENO" 5
+- as_fn_error $? "Library ogg >= 1.0 needed for mux_ogg was not found" "$LINENO" 5
++ as_fn_error "Library ogg >= 1.0 needed for mux_ogg was not found" "$LINENO" 5
else
-@@ -31093,10 +31136,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for mux_ogg was not found" >&5
+ $as_echo "$as_me: WARNING: Library ogg >= 1.0 needed for mux_ogg was not found" >&2;}
+@@ -31424,10 +31154,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MUX_OGG" >&5
$as_echo_n "checking for MUX_OGG... " >&6; }
@@ -2313,7 +4439,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5
ac_status=$?
-@@ -31106,13 +31150,15 @@ if test -n "$MUX_OGG_CFLAGS"; then
+@@ -31437,13 +31168,15 @@
else
pkg_failed=yes
fi
@@ -2335,7 +4461,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5
ac_status=$?
-@@ -31122,15 +31168,14 @@ if test -n "$MUX_OGG_LIBS"; then
+@@ -31453,15 +31186,14 @@
else
pkg_failed=yes
fi
@@ -2354,7 +4480,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -31138,14 +31183,16 @@ else
+@@ -31469,27 +31201,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -2372,9 +4498,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_mux_ogg=no
if test x"$enable_mux_ogg" = "xyes"; then :
- as_fn_error "Library ogg >= 1.0 needed for mux_ogg was not found" "$LINENO" 5
+- as_fn_error $? "Library ogg >= 1.0 needed for mux_ogg was not found" "$LINENO" 5
++ as_fn_error "Library ogg >= 1.0 needed for mux_ogg was not found" "$LINENO" 5
else
-@@ -31154,8 +31201,6 @@ $as_echo "$as_me: WARNING: Library ogg >
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for mux_ogg was not found" >&5
+ $as_echo "$as_me: WARNING: Library ogg >= 1.0 needed for mux_ogg was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -2382,8 +4510,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_mux_ogg=no
if test x"$enable_mux_ogg" = "xyes"; then :
- as_fn_error "Library ogg >= 1.0 needed for mux_ogg was not found" "$LINENO" 5
-@@ -31239,10 +31284,11 @@ pkg_failed=no
+- as_fn_error $? "Library ogg >= 1.0 needed for mux_ogg was not found" "$LINENO" 5
++ as_fn_error "Library ogg >= 1.0 needed for mux_ogg was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for mux_ogg was not found" >&5
+ $as_echo "$as_me: WARNING: Library ogg >= 1.0 needed for mux_ogg was not found" >&2;}
+@@ -31570,10 +31302,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHOUT" >&5
$as_echo_n "checking for SHOUT... " >&6; }
@@ -2399,7 +4531,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shout >= 2.1\""; } >&5
($PKG_CONFIG --exists --print-errors "shout >= 2.1") 2>&5
ac_status=$?
-@@ -31252,13 +31298,15 @@ if test -n "$SHOUT_CFLAGS"; then
+@@ -31583,13 +31316,15 @@
else
pkg_failed=yes
fi
@@ -2421,7 +4553,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shout >= 2.1\""; } >&5
($PKG_CONFIG --exists --print-errors "shout >= 2.1") 2>&5
ac_status=$?
-@@ -31268,15 +31316,14 @@ if test -n "$SHOUT_LIBS"; then
+@@ -31599,15 +31334,14 @@
else
pkg_failed=yes
fi
@@ -2440,7 +4572,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -31284,14 +31331,16 @@ else
+@@ -31615,25 +31349,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -2454,22 +4586,26 @@ Forwarded: not-needed
echo "$SHOUT_PKG_ERRORS" >&5
- if test x"$enable_shout" = "xyes"; then :
+- as_fn_error $? "Library shout >= 2.1 needed for shout was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_shout" = "xyes"; then :
- as_fn_error "Library shout >= 2.1 needed for shout was not found" "$LINENO" 5
++ as_fn_error "Library shout >= 2.1 needed for shout was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library shout >= 2.1 needed for shout was not found" >&5
-@@ -31299,8 +31348,6 @@ $as_echo "$as_me: WARNING: Library shout
+ $as_echo "$as_me: WARNING: Library shout >= 2.1 needed for shout was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_shout" = "xyes"; then :
- as_fn_error "Library shout >= 2.1 needed for shout was not found" "$LINENO" 5
+- as_fn_error $? "Library shout >= 2.1 needed for shout was not found" "$LINENO" 5
++ as_fn_error "Library shout >= 2.1 needed for shout was not found" "$LINENO" 5
else
-@@ -31338,10 +31385,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library shout >= 2.1 needed for shout was not found" >&5
+ $as_echo "$as_me: WARNING: Library shout >= 2.1 needed for shout was not found" >&2;}
+@@ -31669,10 +31403,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHOUT" >&5
$as_echo_n "checking for SHOUT... " >&6; }
@@ -2485,7 +4621,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shout >= 2.1\""; } >&5
($PKG_CONFIG --exists --print-errors "shout >= 2.1") 2>&5
ac_status=$?
-@@ -31351,13 +31399,15 @@ if test -n "$SHOUT_CFLAGS"; then
+@@ -31682,13 +31417,15 @@
else
pkg_failed=yes
fi
@@ -2507,7 +4643,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shout >= 2.1\""; } >&5
($PKG_CONFIG --exists --print-errors "shout >= 2.1") 2>&5
ac_status=$?
-@@ -31367,15 +31417,14 @@ if test -n "$SHOUT_LIBS"; then
+@@ -31698,15 +31435,14 @@
else
pkg_failed=yes
fi
@@ -2526,7 +4662,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -31383,14 +31432,16 @@ else
+@@ -31714,27 +31450,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -2544,9 +4680,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_shout=no
if test x"$enable_shout" = "xyes"; then :
- as_fn_error "Library shout >= 2.1 needed for shout was not found" "$LINENO" 5
+- as_fn_error $? "Library shout >= 2.1 needed for shout was not found" "$LINENO" 5
++ as_fn_error "Library shout >= 2.1 needed for shout was not found" "$LINENO" 5
else
-@@ -31399,8 +31450,6 @@ $as_echo "$as_me: WARNING: Library shout
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library shout >= 2.1 needed for shout was not found" >&5
+ $as_echo "$as_me: WARNING: Library shout >= 2.1 needed for shout was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -2554,8 +4692,30 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_shout=no
if test x"$enable_shout" = "xyes"; then :
- as_fn_error "Library shout >= 2.1 needed for shout was not found" "$LINENO" 5
-@@ -31681,10 +31730,11 @@ pkg_failed=no
+- as_fn_error $? "Library shout >= 2.1 needed for shout was not found" "$LINENO" 5
++ as_fn_error "Library shout >= 2.1 needed for shout was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library shout >= 2.1 needed for shout was not found" >&5
+ $as_echo "$as_me: WARNING: Library shout >= 2.1 needed for shout was not found" >&2;}
+@@ -31969,7 +31705,7 @@
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "Your libmatroska is too old: you may get a more recent one from http://dl.matroska.org/downloads/libmatroska/. Alternatively you can use --disable-mkv to disable the matroska plugin." "$LINENO" 5
++ as_fn_error "Your libmatroska is too old: you may get a more recent one from http://dl.matroska.org/downloads/libmatroska/. Alternatively you can use --disable-mkv to disable the matroska plugin." "$LINENO" 5
+
+ fi
+ rm -f conftest*
+@@ -31983,7 +31719,7 @@
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "Your libebml is too old: you may get a more recent one from http://dl.matroska.org/downloads/libebml/. Alternatively you can use --disable-mkv to disable the matroska plugin." "$LINENO" 5
++ as_fn_error "Your libebml is too old: you may get a more recent one from http://dl.matroska.org/downloads/libebml/. Alternatively you can use --disable-mkv to disable the matroska plugin." "$LINENO" 5
+
+ fi
+ rm -f conftest*
+@@ -32012,10 +31748,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBMODPLUG" >&5
$as_echo_n "checking for LIBMODPLUG... " >&6; }
@@ -2571,7 +4731,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmodplug >= 0.8.4 libmodplug != 0.8.8\""; } >&5
($PKG_CONFIG --exists --print-errors "libmodplug >= 0.8.4 libmodplug != 0.8.8") 2>&5
ac_status=$?
-@@ -31694,13 +31744,15 @@ if test -n "$LIBMODPLUG_CFLAGS"; then
+@@ -32025,13 +31762,15 @@
else
pkg_failed=yes
fi
@@ -2593,7 +4753,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmodplug >= 0.8.4 libmodplug != 0.8.8\""; } >&5
($PKG_CONFIG --exists --print-errors "libmodplug >= 0.8.4 libmodplug != 0.8.8") 2>&5
ac_status=$?
-@@ -31710,15 +31762,14 @@ if test -n "$LIBMODPLUG_LIBS"; then
+@@ -32041,15 +31780,14 @@
else
pkg_failed=yes
fi
@@ -2612,7 +4772,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -31726,13 +31777,15 @@ else
+@@ -32057,27 +31795,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -2629,8 +4789,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
if test x"${enable_mod}" = "xyes"; then :
- as_fn_error "libmodplug not found or a broken version (0.8.8.0) was found!" "$LINENO" 5
-@@ -31742,8 +31795,6 @@ $as_echo "$as_me: WARNING: libmodplug no
+- as_fn_error $? "libmodplug not found or a broken version (0.8.8.0) was found!" "$LINENO" 5
++ as_fn_error "libmodplug not found or a broken version (0.8.8.0) was found!" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libmodplug not found or a broken version (0.8.8.0) was found!" >&5
+ $as_echo "$as_me: WARNING: libmodplug not found or a broken version (0.8.8.0) was found!" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -2638,8 +4801,75 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
if test x"${enable_mod}" = "xyes"; then :
- as_fn_error "libmodplug not found or a broken version (0.8.8.0) was found!" "$LINENO" 5
-@@ -32241,10 +32292,11 @@ pkg_failed=no
+- as_fn_error $? "libmodplug not found or a broken version (0.8.8.0) was found!" "$LINENO" 5
++ as_fn_error "libmodplug not found or a broken version (0.8.8.0) was found!" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libmodplug not found or a broken version (0.8.8.0) was found!" >&5
+ $as_echo "$as_me: WARNING: libmodplug not found or a broken version (0.8.8.0) was found!" >&2;}
+@@ -32200,7 +31938,7 @@
+ then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "cannot cd to ${with_gme_tree}" "$LINENO" 5
++ as_fn_error "cannot cd to ${with_gme_tree}" "$LINENO" 5
+ fi
+ if test -f "${real_gme_tree}/gme/libgme.a"
+ then
+@@ -32228,7 +31966,7 @@
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "cannot find ${real_mod_tree}/gme/libgme.a, make sure you compiled gme in ${with_gme_tree}" "$LINENO" 5
++ as_fn_error "cannot find ${real_mod_tree}/gme/libgme.a, make sure you compiled gme in ${with_gme_tree}" "$LINENO" 5
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: only static linking is available, you must provide a gme-tree" >&5
+@@ -32341,7 +32079,7 @@
+ then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "${with_mad_tree} directory doesn't exist" "$LINENO" 5
++ as_fn_error "${with_mad_tree} directory doesn't exist" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mad.h in ${real_mad_tree}" >&5
+ $as_echo_n "checking for mad.h in ${real_mad_tree}... " >&6; }
+@@ -32415,7 +32153,7 @@
+
+
+ else
+- as_fn_error $? "the specified tree hasn't been compiled " "$LINENO" 5
++ as_fn_error "the specified tree hasn't been compiled " "$LINENO" 5
+
+ fi
+
+@@ -32423,7 +32161,7 @@
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "the specified tree doesn't have mad.h" "$LINENO" 5
++ as_fn_error "the specified tree doesn't have mad.h" "$LINENO" 5
+ fi
+ else
+ CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mpgatofixed32}"
+@@ -32437,7 +32175,7 @@
+ _ACEOF
+
+ else
+- as_fn_error $? "Could not find libmad on your system: you may get it from http://www.underbit.com/products/mad/. Alternatively you can use --disable-mad to disable the mad plugin." "$LINENO" 5
++ as_fn_error "Could not find libmad on your system: you may get it from http://www.underbit.com/products/mad/. Alternatively you can use --disable-mad to disable the mad plugin." "$LINENO" 5
+ fi
+
+ done
+@@ -32494,7 +32232,7 @@
+
+
+ else
+- as_fn_error $? "Cannot find libmad library..." "$LINENO" 5
++ as_fn_error "Cannot find libmad library..." "$LINENO" 5
+ fi
+
+ CPPFLAGS="${CPPFLAGS_save}"
+@@ -32572,10 +32310,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVCODEC" >&5
$as_echo_n "checking for AVCODEC... " >&6; }
@@ -2655,7 +4885,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 51.48.0 libavutil\""; } >&5
($PKG_CONFIG --exists --print-errors "libavcodec >= 51.48.0 libavutil") 2>&5
ac_status=$?
-@@ -32254,13 +32306,15 @@ if test -n "$AVCODEC_CFLAGS"; then
+@@ -32585,13 +32324,15 @@
else
pkg_failed=yes
fi
@@ -2677,7 +4907,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 51.48.0 libavutil\""; } >&5
($PKG_CONFIG --exists --print-errors "libavcodec >= 51.48.0 libavutil") 2>&5
ac_status=$?
-@@ -32270,15 +32324,14 @@ if test -n "$AVCODEC_LIBS"; then
+@@ -32601,15 +32342,14 @@
else
pkg_failed=yes
fi
@@ -2696,7 +4926,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -32286,19 +32339,19 @@ else
+@@ -32617,21 +32357,21 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -2712,15 +4942,39 @@ Forwarded: not-needed
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
- as_fn_error "Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error." "$LINENO" 5
+- as_fn_error $? "Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error." "$LINENO" 5
++ as_fn_error "Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error." "$LINENO" 5
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error "Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error." "$LINENO" 5
+- as_fn_error $? "Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error." "$LINENO" 5
++ as_fn_error "Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error." "$LINENO" 5
-@@ -32398,10 +32451,11 @@ pkg_failed=no
+ else
+ AVCODEC_CFLAGS=$pkg_cv_AVCODEC_CFLAGS
+@@ -32653,7 +32393,8 @@
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -32666,7 +32407,8 @@
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -32727,10 +32469,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBVA" >&5
$as_echo_n "checking for LIBVA... " >&6; }
@@ -2736,7 +4990,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva libva-x11\""; } >&5
($PKG_CONFIG --exists --print-errors "libva libva-x11") 2>&5
ac_status=$?
-@@ -32411,13 +32465,15 @@ if test -n "$LIBVA_CFLAGS"; then
+@@ -32740,13 +32483,15 @@
else
pkg_failed=yes
fi
@@ -2758,7 +5012,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva libva-x11\""; } >&5
($PKG_CONFIG --exists --print-errors "libva libva-x11") 2>&5
ac_status=$?
-@@ -32427,15 +32483,14 @@ if test -n "$LIBVA_LIBS"; then
+@@ -32756,15 +32501,14 @@
else
pkg_failed=yes
fi
@@ -2777,7 +5031,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -32443,13 +32498,15 @@ else
+@@ -32772,27 +32516,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -2794,8 +5048,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
if test "${enable_libva}" == "yes"; then :
- as_fn_error "Could not find required libva." "$LINENO" 5
-@@ -32459,8 +32516,6 @@ $as_echo "$as_me: WARNING: libva not fou
+- as_fn_error $? "Could not find required libva." "$LINENO" 5
++ as_fn_error "Could not find required libva." "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libva not found " >&5
+ $as_echo "$as_me: WARNING: libva not found " >&2;}
fi
elif test $pkg_failed = untried; then
@@ -2803,8 +5060,66 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
if test "${enable_libva}" == "yes"; then :
- as_fn_error "Could not find required libva." "$LINENO" 5
-@@ -32680,10 +32735,11 @@ pkg_failed=no
+- as_fn_error $? "Could not find required libva." "$LINENO" 5
++ as_fn_error "Could not find required libva." "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libva not found " >&5
+ $as_echo "$as_me: WARNING: libva not found " >&2;}
+@@ -32842,7 +32586,7 @@
+ else
+
+ if test "${enable_libva}" == "yes"; then :
+- as_fn_error $? "libva is present but libavcodec/vaapi.h is missing" "$LINENO" 5
++ as_fn_error "libva is present but libavcodec/vaapi.h is missing" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libva is present but libavcodec/vaapi.h is missing " >&5
+ $as_echo "$as_me: WARNING: libva is present but libavcodec/vaapi.h is missing " >&2;}
+@@ -32867,7 +32611,7 @@
+
+ if test "x${enable_libva}" != "x"; then :
+
+- as_fn_error $? "--enable-libva and --disable-avcodec options are mutually exclusive." "$LINENO" 5
++ as_fn_error "--enable-libva and --disable-avcodec options are mutually exclusive." "$LINENO" 5
+
+ fi
+
+@@ -32916,7 +32660,7 @@
+ else
+
+ if test "${enable_dxva2}" == "yes"; then :
+- as_fn_error $? "dxva2 is present but libavcodec/dxva2.h is missing" "$LINENO" 5
++ as_fn_error "dxva2 is present but libavcodec/dxva2.h is missing" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dxva2 is present but libavcodec/dxva2.h is missing " >&5
+ $as_echo "$as_me: WARNING: dxva2 is present but libavcodec/dxva2.h is missing " >&2;}
+@@ -32930,7 +32674,7 @@
+ else
+
+ if test "${enable_dxva2}" == "yes"; then :
+- as_fn_error $? "Could not find required dxva2api.h" "$LINENO" 5
++ as_fn_error "Could not find required dxva2api.h" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dxva2api.h not found" >&5
+ $as_echo "$as_me: WARNING: dxva2api.h not found" >&2;}
+@@ -32945,7 +32689,7 @@
+
+ if test "x${enable_dxva2}" != "x"; then :
+
+- as_fn_error $? "--enable-dxva2 and --disable-avcodec options are mutually exclusive." "$LINENO" 5
++ as_fn_error "--enable-dxva2 and --disable-avcodec options are mutually exclusive." "$LINENO" 5
+
+ fi
+
+@@ -32985,7 +32729,7 @@
+
+
+ else
+- as_fn_error $? "Stream_out switcher depends on avcodec" "$LINENO" 5
++ as_fn_error "Stream_out switcher depends on avcodec" "$LINENO" 5
+
+ fi
+
+@@ -33009,10 +32753,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVFORMAT" >&5
$as_echo_n "checking for AVFORMAT... " >&6; }
@@ -2820,7 +5135,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat libavcodec libavutil\""; } >&5
($PKG_CONFIG --exists --print-errors "libavformat libavcodec libavutil") 2>&5
ac_status=$?
-@@ -32693,13 +32749,15 @@ if test -n "$AVFORMAT_CFLAGS"; then
+@@ -33022,13 +32767,15 @@
else
pkg_failed=yes
fi
@@ -2842,7 +5157,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat libavcodec libavutil\""; } >&5
($PKG_CONFIG --exists --print-errors "libavformat libavcodec libavutil") 2>&5
ac_status=$?
-@@ -32709,15 +32767,14 @@ if test -n "$AVFORMAT_LIBS"; then
+@@ -33038,15 +32785,14 @@
else
pkg_failed=yes
fi
@@ -2861,7 +5176,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -32725,19 +32782,19 @@ else
+@@ -33054,21 +32800,21 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -2877,15 +5192,39 @@ Forwarded: not-needed
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
- as_fn_error "Could not find libavformat or libavutil. Use --disable-avformat to ignore this error." "$LINENO" 5
+- as_fn_error $? "Could not find libavformat or libavutil. Use --disable-avformat to ignore this error." "$LINENO" 5
++ as_fn_error "Could not find libavformat or libavutil. Use --disable-avformat to ignore this error." "$LINENO" 5
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error "Could not find libavformat or libavutil. Use --disable-avformat to ignore this error." "$LINENO" 5
+- as_fn_error $? "Could not find libavformat or libavutil. Use --disable-avformat to ignore this error." "$LINENO" 5
++ as_fn_error "Could not find libavformat or libavutil. Use --disable-avformat to ignore this error." "$LINENO" 5
-@@ -32862,10 +32919,11 @@ pkg_failed=no
+ else
+ AVFORMAT_CFLAGS=$pkg_cv_AVFORMAT_CFLAGS
+@@ -33090,7 +32836,8 @@
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -33103,7 +32850,8 @@
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -33189,10 +32937,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SWSCALE" >&5
$as_echo_n "checking for SWSCALE... " >&6; }
@@ -2901,7 +5240,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libswscale\""; } >&5
($PKG_CONFIG --exists --print-errors "libswscale") 2>&5
ac_status=$?
-@@ -32875,13 +32933,15 @@ if test -n "$SWSCALE_CFLAGS"; then
+@@ -33202,13 +32951,15 @@
else
pkg_failed=yes
fi
@@ -2923,7 +5262,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libswscale\""; } >&5
($PKG_CONFIG --exists --print-errors "libswscale") 2>&5
ac_status=$?
-@@ -32891,15 +32951,14 @@ if test -n "$SWSCALE_LIBS"; then
+@@ -33218,15 +32969,14 @@
else
pkg_failed=yes
fi
@@ -2942,7 +5281,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -32907,19 +32966,19 @@ else
+@@ -33234,21 +32984,21 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -2958,15 +5297,29 @@ Forwarded: not-needed
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
- as_fn_error "Could not find libswscale. Use --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing." "$LINENO" 5
+- as_fn_error $? "Could not find libswscale. Use --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing." "$LINENO" 5
++ as_fn_error "Could not find libswscale. Use --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing." "$LINENO" 5
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error "Could not find libswscale. Use --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing." "$LINENO" 5
+- as_fn_error $? "Could not find libswscale. Use --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing." "$LINENO" 5
++ as_fn_error "Could not find libswscale. Use --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing." "$LINENO" 5
-@@ -32997,10 +33056,11 @@ pkg_failed=no
+ else
+ SWSCALE_CFLAGS=$pkg_cv_SWSCALE_CFLAGS
+@@ -33270,7 +33020,8 @@
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -33323,10 +33074,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSTPROC" >&5
$as_echo_n "checking for POSTPROC... " >&6; }
@@ -2982,7 +5335,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpostproc libavutil\""; } >&5
($PKG_CONFIG --exists --print-errors "libpostproc libavutil") 2>&5
ac_status=$?
-@@ -33010,13 +33070,15 @@ if test -n "$POSTPROC_CFLAGS"; then
+@@ -33336,13 +33088,15 @@
else
pkg_failed=yes
fi
@@ -3004,7 +5357,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpostproc libavutil\""; } >&5
($PKG_CONFIG --exists --print-errors "libpostproc libavutil") 2>&5
ac_status=$?
-@@ -33026,15 +33088,14 @@ if test -n "$POSTPROC_LIBS"; then
+@@ -33352,15 +33106,14 @@
else
pkg_failed=yes
fi
@@ -3023,7 +5376,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -33042,19 +33103,19 @@ else
+@@ -33368,21 +33121,21 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -3039,15 +5392,55 @@ Forwarded: not-needed
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
- as_fn_error "Could not find libpostproc. Use --disable-postproc to ignore this error." "$LINENO" 5
+- as_fn_error $? "Could not find libpostproc. Use --disable-postproc to ignore this error." "$LINENO" 5
++ as_fn_error "Could not find libpostproc. Use --disable-postproc to ignore this error." "$LINENO" 5
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error "Could not find libpostproc. Use --disable-postproc to ignore this error." "$LINENO" 5
+- as_fn_error $? "Could not find libpostproc. Use --disable-postproc to ignore this error." "$LINENO" 5
++ as_fn_error "Could not find libpostproc. Use --disable-postproc to ignore this error." "$LINENO" 5
+
+ else
+ POSTPROC_CFLAGS=$pkg_cv_POSTPROC_CFLAGS
+@@ -33465,7 +33218,7 @@
+ then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "cannot cd to ${with_faad_tree}" "$LINENO" 5
++ as_fn_error "cannot cd to ${with_faad_tree}" "$LINENO" 5
+ fi
+ if test -f "${real_faad_tree}/libfaad/.libs/libfaad.a"
+ then
+@@ -33493,7 +33246,7 @@
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "cannot find ${real_faad_tree}/libfaad/.libs/libfaad.a, make sure you compiled libfaad in ${with_faad_tree}" "$LINENO" 5
++ as_fn_error "cannot find ${real_faad_tree}/libfaad/.libs/libfaad.a, make sure you compiled libfaad in ${with_faad_tree}" "$LINENO" 5
+ fi
+ else
+ CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_faad}"
+@@ -33507,7 +33260,7 @@
+ _ACEOF
-@@ -33331,10 +33392,11 @@ pkg_failed=no
+ else
+- as_fn_error $? "Cannot find development headers for libfaad..." "$LINENO" 5
++ as_fn_error "Cannot find development headers for libfaad..." "$LINENO" 5
+ fi
+
+ done
+@@ -33616,7 +33369,7 @@
+
+
+ else
+- as_fn_error $? "Cannot find libfaad library..." "$LINENO" 5
++ as_fn_error "Cannot find libfaad library..." "$LINENO" 5
+ fi
+
+ fi
+@@ -33657,10 +33410,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TWOLAME" >&5
$as_echo_n "checking for TWOLAME... " >&6; }
@@ -3063,7 +5456,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"twolame\""; } >&5
($PKG_CONFIG --exists --print-errors "twolame") 2>&5
ac_status=$?
-@@ -33344,13 +33406,15 @@ if test -n "$TWOLAME_CFLAGS"; then
+@@ -33670,13 +33424,15 @@
else
pkg_failed=yes
fi
@@ -3085,7 +5478,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"twolame\""; } >&5
($PKG_CONFIG --exists --print-errors "twolame") 2>&5
ac_status=$?
-@@ -33360,15 +33424,14 @@ if test -n "$TWOLAME_LIBS"; then
+@@ -33686,15 +33442,14 @@
else
pkg_failed=yes
fi
@@ -3104,7 +5497,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -33376,14 +33439,16 @@ else
+@@ -33702,25 +33457,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -3118,22 +5511,26 @@ Forwarded: not-needed
echo "$TWOLAME_PKG_ERRORS" >&5
- if test x"$enable_twolame" = "xyes"; then :
+- as_fn_error $? "Library twolame needed for twolame was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_twolame" = "xyes"; then :
- as_fn_error "Library twolame needed for twolame was not found" "$LINENO" 5
++ as_fn_error "Library twolame needed for twolame was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library twolame needed for twolame was not found" >&5
-@@ -33391,8 +33456,6 @@ $as_echo "$as_me: WARNING: Library twola
+ $as_echo "$as_me: WARNING: Library twolame needed for twolame was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_twolame" = "xyes"; then :
- as_fn_error "Library twolame needed for twolame was not found" "$LINENO" 5
+- as_fn_error $? "Library twolame needed for twolame was not found" "$LINENO" 5
++ as_fn_error "Library twolame needed for twolame was not found" "$LINENO" 5
else
-@@ -33435,10 +33498,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library twolame needed for twolame was not found" >&5
+ $as_echo "$as_me: WARNING: Library twolame needed for twolame was not found" >&2;}
+@@ -33761,10 +33516,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TWOLAME" >&5
$as_echo_n "checking for TWOLAME... " >&6; }
@@ -3149,7 +5546,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"twolame\""; } >&5
($PKG_CONFIG --exists --print-errors "twolame") 2>&5
ac_status=$?
-@@ -33448,13 +33512,15 @@ if test -n "$TWOLAME_CFLAGS"; then
+@@ -33774,13 +33530,15 @@
else
pkg_failed=yes
fi
@@ -3171,7 +5568,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"twolame\""; } >&5
($PKG_CONFIG --exists --print-errors "twolame") 2>&5
ac_status=$?
-@@ -33464,15 +33530,14 @@ if test -n "$TWOLAME_LIBS"; then
+@@ -33790,15 +33548,14 @@
else
pkg_failed=yes
fi
@@ -3190,7 +5587,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -33480,14 +33545,16 @@ else
+@@ -33806,27 +33563,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -3208,9 +5605,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_twolame=no
if test x"$enable_twolame" = "xyes"; then :
- as_fn_error "Library twolame needed for twolame was not found" "$LINENO" 5
+- as_fn_error $? "Library twolame needed for twolame was not found" "$LINENO" 5
++ as_fn_error "Library twolame needed for twolame was not found" "$LINENO" 5
else
-@@ -33496,8 +33563,6 @@ $as_echo "$as_me: WARNING: Library twola
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library twolame needed for twolame was not found" >&5
+ $as_echo "$as_me: WARNING: Library twolame needed for twolame was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -3218,8 +5617,68 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_twolame=no
if test x"$enable_twolame" = "xyes"; then :
- as_fn_error "Library twolame needed for twolame was not found" "$LINENO" 5
-@@ -33921,10 +33986,11 @@ pkg_failed=no
+- as_fn_error $? "Library twolame needed for twolame was not found" "$LINENO" 5
++ as_fn_error "Library twolame needed for twolame was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library twolame needed for twolame was not found" >&5
+ $as_echo "$as_me: WARNING: Library twolame needed for twolame was not found" >&2;}
+@@ -33916,7 +33673,7 @@
+
+
+ else
+- as_fn_error $? "cannot find QuickTime headers" "$LINENO" 5
++ as_fn_error "cannot find QuickTime headers" "$LINENO" 5
+ fi
+
+ done
+@@ -34010,7 +33767,7 @@
+ then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "${with_a52_tree} directory doesn't exist" "$LINENO" 5
++ as_fn_error "${with_a52_tree} directory doesn't exist" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a52.h in ${real_a52_tree}/include" >&5
+ $as_echo_n "checking for a52.h in ${real_a52_tree}/include... " >&6; }
+@@ -34093,9 +33850,9 @@
+
+ if test -f ${real_a52_tree}/liba52/.libs/liba52.a
+ then
+- as_fn_error $? "make sure you have at least a52dec-0.7.3 ($real_a52_tree)" "$LINENO" 5
++ as_fn_error "make sure you have at least a52dec-0.7.3 ($real_a52_tree)" "$LINENO" 5
+ else
+- as_fn_error $? "the specified tree hasn't been compiled" "$LINENO" 5
++ as_fn_error "the specified tree hasn't been compiled" "$LINENO" 5
+ fi
+
+ fi
+@@ -34104,7 +33861,7 @@
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "the specified tree doesn't have a52.h" "$LINENO" 5
++ as_fn_error "the specified tree doesn't have a52.h" "$LINENO" 5
+ fi
+ else
+ if test -z "${with_a52}"
+@@ -34185,14 +33942,14 @@
+
+ else
+
+- as_fn_error $? "Could not find liba52 on your system: you may get it from http://liba52.sf.net/. Alternatively you can use --disable-a52 to disable the a52 plugin." "$LINENO" 5
++ as_fn_error "Could not find liba52 on your system: you may get it from http://liba52.sf.net/. Alternatively you can use --disable-a52 to disable the a52 plugin." "$LINENO" 5
+
+ fi
+
+
+ else
+
+- as_fn_error $? "Could not find liba52 on your system: you may get it from http://liba52.sf.net/. Alternatively you can use --disable-a52 to disable the a52 plugin." "$LINENO" 5
++ as_fn_error "Could not find liba52 on your system: you may get it from http://liba52.sf.net/. Alternatively you can use --disable-a52 to disable the a52 plugin." "$LINENO" 5
+
+ fi
+
+@@ -34247,10 +34004,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DCA" >&5
$as_echo_n "checking for DCA... " >&6; }
@@ -3235,7 +5694,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdca >= 0.0.5\""; } >&5
($PKG_CONFIG --exists --print-errors "libdca >= 0.0.5") 2>&5
ac_status=$?
-@@ -33934,13 +34000,15 @@ if test -n "$DCA_CFLAGS"; then
+@@ -34260,13 +34018,15 @@
else
pkg_failed=yes
fi
@@ -3257,7 +5716,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdca >= 0.0.5\""; } >&5
($PKG_CONFIG --exists --print-errors "libdca >= 0.0.5") 2>&5
ac_status=$?
-@@ -33950,15 +34018,14 @@ if test -n "$DCA_LIBS"; then
+@@ -34276,15 +34036,14 @@
else
pkg_failed=yes
fi
@@ -3276,7 +5735,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -33966,14 +34033,16 @@ else
+@@ -34292,25 +34051,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -3290,22 +5749,26 @@ Forwarded: not-needed
echo "$DCA_PKG_ERRORS" >&5
- if test x"$enable_dca" = "xyes"; then :
+- as_fn_error $? "Library libdca >= 0.0.5 needed for dca was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_dca" = "xyes"; then :
- as_fn_error "Library libdca >= 0.0.5 needed for dca was not found" "$LINENO" 5
++ as_fn_error "Library libdca >= 0.0.5 needed for dca was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&5
-@@ -33981,8 +34050,6 @@ $as_echo "$as_me: WARNING: Library libdc
+ $as_echo "$as_me: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_dca" = "xyes"; then :
- as_fn_error "Library libdca >= 0.0.5 needed for dca was not found" "$LINENO" 5
+- as_fn_error $? "Library libdca >= 0.0.5 needed for dca was not found" "$LINENO" 5
++ as_fn_error "Library libdca >= 0.0.5 needed for dca was not found" "$LINENO" 5
else
-@@ -34020,10 +34087,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&5
+ $as_echo "$as_me: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&2;}
+@@ -34346,10 +34105,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DCA" >&5
$as_echo_n "checking for DCA... " >&6; }
@@ -3321,7 +5784,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdca >= 0.0.5\""; } >&5
($PKG_CONFIG --exists --print-errors "libdca >= 0.0.5") 2>&5
ac_status=$?
-@@ -34033,13 +34101,15 @@ if test -n "$DCA_CFLAGS"; then
+@@ -34359,13 +34119,15 @@
else
pkg_failed=yes
fi
@@ -3343,7 +5806,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdca >= 0.0.5\""; } >&5
($PKG_CONFIG --exists --print-errors "libdca >= 0.0.5") 2>&5
ac_status=$?
-@@ -34049,15 +34119,14 @@ if test -n "$DCA_LIBS"; then
+@@ -34375,15 +34137,14 @@
else
pkg_failed=yes
fi
@@ -3362,7 +5825,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -34065,14 +34134,16 @@ else
+@@ -34391,27 +34152,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -3380,9 +5843,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_dca=no
if test x"$enable_dca" = "xyes"; then :
- as_fn_error "Library libdca >= 0.0.5 needed for dca was not found" "$LINENO" 5
+- as_fn_error $? "Library libdca >= 0.0.5 needed for dca was not found" "$LINENO" 5
++ as_fn_error "Library libdca >= 0.0.5 needed for dca was not found" "$LINENO" 5
else
-@@ -34081,8 +34152,6 @@ $as_echo "$as_me: WARNING: Library libdc
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&5
+ $as_echo "$as_me: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -3390,8 +5855,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_dca=no
if test x"$enable_dca" = "xyes"; then :
- as_fn_error "Library libdca >= 0.0.5 needed for dca was not found" "$LINENO" 5
-@@ -34164,10 +34233,11 @@ pkg_failed=no
+- as_fn_error $? "Library libdca >= 0.0.5 needed for dca was not found" "$LINENO" 5
++ as_fn_error "Library libdca >= 0.0.5 needed for dca was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&5
+ $as_echo "$as_me: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&2;}
+@@ -34490,10 +34251,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLAC" >&5
$as_echo_n "checking for FLAC... " >&6; }
@@ -3407,7 +5876,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac\""; } >&5
($PKG_CONFIG --exists --print-errors "flac") 2>&5
ac_status=$?
-@@ -34177,13 +34247,15 @@ if test -n "$FLAC_CFLAGS"; then
+@@ -34503,13 +34265,15 @@
else
pkg_failed=yes
fi
@@ -3429,7 +5898,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac\""; } >&5
($PKG_CONFIG --exists --print-errors "flac") 2>&5
ac_status=$?
-@@ -34193,15 +34265,14 @@ if test -n "$FLAC_LIBS"; then
+@@ -34519,15 +34283,14 @@
else
pkg_failed=yes
fi
@@ -3448,7 +5917,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -34209,14 +34280,16 @@ else
+@@ -34535,25 +34298,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -3462,22 +5931,26 @@ Forwarded: not-needed
echo "$FLAC_PKG_ERRORS" >&5
- if test x"$enable_flac" = "xyes"; then :
+- as_fn_error $? "Library flac needed for flac was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_flac" = "xyes"; then :
- as_fn_error "Library flac needed for flac was not found" "$LINENO" 5
++ as_fn_error "Library flac needed for flac was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library flac needed for flac was not found" >&5
-@@ -34224,8 +34297,6 @@ $as_echo "$as_me: WARNING: Library flac
+ $as_echo "$as_me: WARNING: Library flac needed for flac was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_flac" = "xyes"; then :
- as_fn_error "Library flac needed for flac was not found" "$LINENO" 5
+- as_fn_error $? "Library flac needed for flac was not found" "$LINENO" 5
++ as_fn_error "Library flac needed for flac was not found" "$LINENO" 5
else
-@@ -34263,10 +34334,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library flac needed for flac was not found" >&5
+ $as_echo "$as_me: WARNING: Library flac needed for flac was not found" >&2;}
+@@ -34589,10 +34352,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLAC" >&5
$as_echo_n "checking for FLAC... " >&6; }
@@ -3493,7 +5966,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac\""; } >&5
($PKG_CONFIG --exists --print-errors "flac") 2>&5
ac_status=$?
-@@ -34276,13 +34348,15 @@ if test -n "$FLAC_CFLAGS"; then
+@@ -34602,13 +34366,15 @@
else
pkg_failed=yes
fi
@@ -3515,7 +5988,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac\""; } >&5
($PKG_CONFIG --exists --print-errors "flac") 2>&5
ac_status=$?
-@@ -34292,15 +34366,14 @@ if test -n "$FLAC_LIBS"; then
+@@ -34618,15 +34384,14 @@
else
pkg_failed=yes
fi
@@ -3534,7 +6007,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -34308,14 +34381,16 @@ else
+@@ -34634,27 +34399,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -3552,9 +6025,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_flac=no
if test x"$enable_flac" = "xyes"; then :
- as_fn_error "Library flac needed for flac was not found" "$LINENO" 5
+- as_fn_error $? "Library flac needed for flac was not found" "$LINENO" 5
++ as_fn_error "Library flac needed for flac was not found" "$LINENO" 5
else
-@@ -34324,8 +34399,6 @@ $as_echo "$as_me: WARNING: Library flac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library flac needed for flac was not found" >&5
+ $as_echo "$as_me: WARNING: Library flac needed for flac was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -3562,8 +6037,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_flac=no
if test x"$enable_flac" = "xyes"; then :
- as_fn_error "Library flac needed for flac was not found" "$LINENO" 5
-@@ -34407,10 +34480,11 @@ pkg_failed=no
+- as_fn_error $? "Library flac needed for flac was not found" "$LINENO" 5
++ as_fn_error "Library flac needed for flac was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library flac needed for flac was not found" >&5
+ $as_echo "$as_me: WARNING: Library flac needed for flac was not found" >&2;}
+@@ -34733,10 +34498,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBMPEG2" >&5
$as_echo_n "checking for LIBMPEG2... " >&6; }
@@ -3579,7 +6058,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpeg2 > 0.3.2\""; } >&5
($PKG_CONFIG --exists --print-errors "libmpeg2 > 0.3.2") 2>&5
ac_status=$?
-@@ -34420,13 +34494,15 @@ if test -n "$LIBMPEG2_CFLAGS"; then
+@@ -34746,13 +34512,15 @@
else
pkg_failed=yes
fi
@@ -3601,7 +6080,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpeg2 > 0.3.2\""; } >&5
($PKG_CONFIG --exists --print-errors "libmpeg2 > 0.3.2") 2>&5
ac_status=$?
-@@ -34436,15 +34512,14 @@ if test -n "$LIBMPEG2_LIBS"; then
+@@ -34762,15 +34530,14 @@
else
pkg_failed=yes
fi
@@ -3620,7 +6099,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -34452,14 +34527,16 @@ else
+@@ -34778,25 +34545,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -3634,22 +6113,26 @@ Forwarded: not-needed
echo "$LIBMPEG2_PKG_ERRORS" >&5
- if test x"$enable_libmpeg2" = "xyes"; then :
+- as_fn_error $? "Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_libmpeg2" = "xyes"; then :
- as_fn_error "Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" "$LINENO" 5
++ as_fn_error "Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&5
-@@ -34467,8 +34544,6 @@ $as_echo "$as_me: WARNING: Library libmp
+ $as_echo "$as_me: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_libmpeg2" = "xyes"; then :
- as_fn_error "Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" "$LINENO" 5
+- as_fn_error $? "Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" "$LINENO" 5
++ as_fn_error "Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" "$LINENO" 5
else
-@@ -34506,10 +34581,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&5
+ $as_echo "$as_me: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&2;}
+@@ -34832,10 +34599,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBMPEG2" >&5
$as_echo_n "checking for LIBMPEG2... " >&6; }
@@ -3665,7 +6148,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpeg2 > 0.3.2\""; } >&5
($PKG_CONFIG --exists --print-errors "libmpeg2 > 0.3.2") 2>&5
ac_status=$?
-@@ -34519,13 +34595,15 @@ if test -n "$LIBMPEG2_CFLAGS"; then
+@@ -34845,13 +34613,15 @@
else
pkg_failed=yes
fi
@@ -3687,7 +6170,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpeg2 > 0.3.2\""; } >&5
($PKG_CONFIG --exists --print-errors "libmpeg2 > 0.3.2") 2>&5
ac_status=$?
-@@ -34535,15 +34613,14 @@ if test -n "$LIBMPEG2_LIBS"; then
+@@ -34861,15 +34631,14 @@
else
pkg_failed=yes
fi
@@ -3706,7 +6189,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -34551,14 +34628,16 @@ else
+@@ -34877,27 +34646,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -3724,9 +6207,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_libmpeg2=no
if test x"$enable_libmpeg2" = "xyes"; then :
- as_fn_error "Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" "$LINENO" 5
+- as_fn_error $? "Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" "$LINENO" 5
++ as_fn_error "Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" "$LINENO" 5
else
-@@ -34567,8 +34646,6 @@ $as_echo "$as_me: WARNING: Library libmp
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&5
+ $as_echo "$as_me: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -3734,8 +6219,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_libmpeg2=no
if test x"$enable_libmpeg2" = "xyes"; then :
- as_fn_error "Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" "$LINENO" 5
-@@ -34650,10 +34727,11 @@ pkg_failed=no
+- as_fn_error $? "Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" "$LINENO" 5
++ as_fn_error "Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&5
+ $as_echo "$as_me: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&2;}
+@@ -34976,10 +34745,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VORBIS" >&5
$as_echo_n "checking for VORBIS... " >&6; }
@@ -3751,7 +6240,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg vorbis >= 1.1 vorbisenc >= 1.1\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg vorbis >= 1.1 vorbisenc >= 1.1") 2>&5
ac_status=$?
-@@ -34663,13 +34741,15 @@ if test -n "$VORBIS_CFLAGS"; then
+@@ -34989,13 +34759,15 @@
else
pkg_failed=yes
fi
@@ -3773,7 +6262,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg vorbis >= 1.1 vorbisenc >= 1.1\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg vorbis >= 1.1 vorbisenc >= 1.1") 2>&5
ac_status=$?
-@@ -34679,15 +34759,14 @@ if test -n "$VORBIS_LIBS"; then
+@@ -35005,15 +34777,14 @@
else
pkg_failed=yes
fi
@@ -3792,7 +6281,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -34695,14 +34774,16 @@ else
+@@ -35021,25 +34792,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -3806,22 +6295,26 @@ Forwarded: not-needed
echo "$VORBIS_PKG_ERRORS" >&5
- if test x"$enable_vorbis" = "xyes"; then :
+- as_fn_error $? "Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_vorbis" = "xyes"; then :
- as_fn_error "Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" "$LINENO" 5
++ as_fn_error "Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&5
-@@ -34710,8 +34791,6 @@ $as_echo "$as_me: WARNING: Library ogg v
+ $as_echo "$as_me: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_vorbis" = "xyes"; then :
- as_fn_error "Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" "$LINENO" 5
+- as_fn_error $? "Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" "$LINENO" 5
++ as_fn_error "Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" "$LINENO" 5
else
-@@ -34749,10 +34828,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&5
+ $as_echo "$as_me: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&2;}
+@@ -35075,10 +34846,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VORBIS" >&5
$as_echo_n "checking for VORBIS... " >&6; }
@@ -3837,7 +6330,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg vorbis >= 1.1 vorbisenc >= 1.1\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg vorbis >= 1.1 vorbisenc >= 1.1") 2>&5
ac_status=$?
-@@ -34762,13 +34842,15 @@ if test -n "$VORBIS_CFLAGS"; then
+@@ -35088,13 +34860,15 @@
else
pkg_failed=yes
fi
@@ -3859,7 +6352,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg vorbis >= 1.1 vorbisenc >= 1.1\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg vorbis >= 1.1 vorbisenc >= 1.1") 2>&5
ac_status=$?
-@@ -34778,15 +34860,14 @@ if test -n "$VORBIS_LIBS"; then
+@@ -35104,15 +34878,14 @@
else
pkg_failed=yes
fi
@@ -3878,7 +6371,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -34794,14 +34875,16 @@ else
+@@ -35120,27 +34893,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -3896,9 +6389,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_vorbis=no
if test x"$enable_vorbis" = "xyes"; then :
- as_fn_error "Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" "$LINENO" 5
+- as_fn_error $? "Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" "$LINENO" 5
++ as_fn_error "Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" "$LINENO" 5
else
-@@ -34810,8 +34893,6 @@ $as_echo "$as_me: WARNING: Library ogg v
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&5
+ $as_echo "$as_me: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -3906,8 +6401,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_vorbis=no
if test x"$enable_vorbis" = "xyes"; then :
- as_fn_error "Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" "$LINENO" 5
-@@ -34928,10 +35009,11 @@ pkg_failed=no
+- as_fn_error $? "Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" "$LINENO" 5
++ as_fn_error "Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&5
+ $as_echo "$as_me: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&2;}
+@@ -35254,10 +35027,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPEEX" >&5
$as_echo_n "checking for SPEEX... " >&6; }
@@ -3923,7 +6422,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg speex >= 1.0.5\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg speex >= 1.0.5") 2>&5
ac_status=$?
-@@ -34941,13 +35023,15 @@ if test -n "$SPEEX_CFLAGS"; then
+@@ -35267,13 +35041,15 @@
else
pkg_failed=yes
fi
@@ -3945,7 +6444,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg speex >= 1.0.5\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg speex >= 1.0.5") 2>&5
ac_status=$?
-@@ -34957,15 +35041,14 @@ if test -n "$SPEEX_LIBS"; then
+@@ -35283,15 +35059,14 @@
else
pkg_failed=yes
fi
@@ -3964,7 +6463,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -34973,14 +35056,16 @@ else
+@@ -35299,25 +35074,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -3978,22 +6477,26 @@ Forwarded: not-needed
echo "$SPEEX_PKG_ERRORS" >&5
- if test x"$enable_speex" = "xyes"; then :
+- as_fn_error $? "Library ogg speex >= 1.0.5 needed for speex was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_speex" = "xyes"; then :
- as_fn_error "Library ogg speex >= 1.0.5 needed for speex was not found" "$LINENO" 5
++ as_fn_error "Library ogg speex >= 1.0.5 needed for speex was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&5
-@@ -34988,8 +35073,6 @@ $as_echo "$as_me: WARNING: Library ogg s
+ $as_echo "$as_me: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_speex" = "xyes"; then :
- as_fn_error "Library ogg speex >= 1.0.5 needed for speex was not found" "$LINENO" 5
+- as_fn_error $? "Library ogg speex >= 1.0.5 needed for speex was not found" "$LINENO" 5
++ as_fn_error "Library ogg speex >= 1.0.5 needed for speex was not found" "$LINENO" 5
else
-@@ -35027,10 +35110,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&5
+ $as_echo "$as_me: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&2;}
+@@ -35353,10 +35128,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPEEX" >&5
$as_echo_n "checking for SPEEX... " >&6; }
@@ -4009,7 +6512,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg speex >= 1.0.5\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg speex >= 1.0.5") 2>&5
ac_status=$?
-@@ -35040,13 +35124,15 @@ if test -n "$SPEEX_CFLAGS"; then
+@@ -35366,13 +35142,15 @@
else
pkg_failed=yes
fi
@@ -4031,7 +6534,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg speex >= 1.0.5\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg speex >= 1.0.5") 2>&5
ac_status=$?
-@@ -35056,15 +35142,14 @@ if test -n "$SPEEX_LIBS"; then
+@@ -35382,15 +35160,14 @@
else
pkg_failed=yes
fi
@@ -4050,7 +6553,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -35072,14 +35157,16 @@ else
+@@ -35398,27 +35175,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -4068,9 +6571,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_speex=no
if test x"$enable_speex" = "xyes"; then :
- as_fn_error "Library ogg speex >= 1.0.5 needed for speex was not found" "$LINENO" 5
+- as_fn_error $? "Library ogg speex >= 1.0.5 needed for speex was not found" "$LINENO" 5
++ as_fn_error "Library ogg speex >= 1.0.5 needed for speex was not found" "$LINENO" 5
else
-@@ -35088,8 +35175,6 @@ $as_echo "$as_me: WARNING: Library ogg s
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&5
+ $as_echo "$as_me: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -4078,8 +6583,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_speex=no
if test x"$enable_speex" = "xyes"; then :
- as_fn_error "Library ogg speex >= 1.0.5 needed for speex was not found" "$LINENO" 5
-@@ -35171,10 +35256,11 @@ pkg_failed=no
+- as_fn_error $? "Library ogg speex >= 1.0.5 needed for speex was not found" "$LINENO" 5
++ as_fn_error "Library ogg speex >= 1.0.5 needed for speex was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&5
+ $as_echo "$as_me: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&2;}
+@@ -35497,10 +35274,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for THEORA" >&5
$as_echo_n "checking for THEORA... " >&6; }
@@ -4095,7 +6604,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg theora >= 1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg theora >= 1.0") 2>&5
ac_status=$?
-@@ -35184,13 +35270,15 @@ if test -n "$THEORA_CFLAGS"; then
+@@ -35510,13 +35288,15 @@
else
pkg_failed=yes
fi
@@ -4117,7 +6626,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg theora >= 1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg theora >= 1.0") 2>&5
ac_status=$?
-@@ -35200,15 +35288,14 @@ if test -n "$THEORA_LIBS"; then
+@@ -35526,15 +35306,14 @@
else
pkg_failed=yes
fi
@@ -4136,7 +6645,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -35216,14 +35303,16 @@ else
+@@ -35542,25 +35321,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -4150,22 +6659,26 @@ Forwarded: not-needed
echo "$THEORA_PKG_ERRORS" >&5
- if test x"$enable_theora" = "xyes"; then :
+- as_fn_error $? "Library ogg theora >= 1.0 needed for theora was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_theora" = "xyes"; then :
- as_fn_error "Library ogg theora >= 1.0 needed for theora was not found" "$LINENO" 5
++ as_fn_error "Library ogg theora >= 1.0 needed for theora was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg theora >= 1.0 needed for theora was not found" >&5
-@@ -35231,8 +35320,6 @@ $as_echo "$as_me: WARNING: Library ogg t
+ $as_echo "$as_me: WARNING: Library ogg theora >= 1.0 needed for theora was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_theora" = "xyes"; then :
- as_fn_error "Library ogg theora >= 1.0 needed for theora was not found" "$LINENO" 5
+- as_fn_error $? "Library ogg theora >= 1.0 needed for theora was not found" "$LINENO" 5
++ as_fn_error "Library ogg theora >= 1.0 needed for theora was not found" "$LINENO" 5
else
-@@ -35270,10 +35357,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg theora >= 1.0 needed for theora was not found" >&5
+ $as_echo "$as_me: WARNING: Library ogg theora >= 1.0 needed for theora was not found" >&2;}
+@@ -35596,10 +35375,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for THEORA" >&5
$as_echo_n "checking for THEORA... " >&6; }
@@ -4181,7 +6694,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg theora >= 1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg theora >= 1.0") 2>&5
ac_status=$?
-@@ -35283,13 +35371,15 @@ if test -n "$THEORA_CFLAGS"; then
+@@ -35609,13 +35389,15 @@
else
pkg_failed=yes
fi
@@ -4203,7 +6716,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg theora >= 1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "ogg theora >= 1.0") 2>&5
ac_status=$?
-@@ -35299,15 +35389,14 @@ if test -n "$THEORA_LIBS"; then
+@@ -35625,15 +35407,14 @@
else
pkg_failed=yes
fi
@@ -4222,7 +6735,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -35315,14 +35404,16 @@ else
+@@ -35641,27 +35422,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -4240,9 +6753,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_theora=no
if test x"$enable_theora" = "xyes"; then :
- as_fn_error "Library ogg theora >= 1.0 needed for theora was not found" "$LINENO" 5
+- as_fn_error $? "Library ogg theora >= 1.0 needed for theora was not found" "$LINENO" 5
++ as_fn_error "Library ogg theora >= 1.0 needed for theora was not found" "$LINENO" 5
else
-@@ -35331,8 +35422,6 @@ $as_echo "$as_me: WARNING: Library ogg t
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg theora >= 1.0 needed for theora was not found" >&5
+ $as_echo "$as_me: WARNING: Library ogg theora >= 1.0 needed for theora was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -4250,8 +6765,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_theora=no
if test x"$enable_theora" = "xyes"; then :
- as_fn_error "Library ogg theora >= 1.0 needed for theora was not found" "$LINENO" 5
-@@ -35414,10 +35503,11 @@ pkg_failed=no
+- as_fn_error $? "Library ogg theora >= 1.0 needed for theora was not found" "$LINENO" 5
++ as_fn_error "Library ogg theora >= 1.0 needed for theora was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg theora >= 1.0 needed for theora was not found" >&5
+ $as_echo "$as_me: WARNING: Library ogg theora >= 1.0 needed for theora was not found" >&2;}
+@@ -35740,10 +35521,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIRAC" >&5
$as_echo_n "checking for DIRAC... " >&6; }
@@ -4267,7 +6786,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dirac >= 0.10.0\""; } >&5
($PKG_CONFIG --exists --print-errors "dirac >= 0.10.0") 2>&5
ac_status=$?
-@@ -35427,13 +35517,15 @@ if test -n "$DIRAC_CFLAGS"; then
+@@ -35753,13 +35535,15 @@
else
pkg_failed=yes
fi
@@ -4289,7 +6808,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dirac >= 0.10.0\""; } >&5
($PKG_CONFIG --exists --print-errors "dirac >= 0.10.0") 2>&5
ac_status=$?
-@@ -35443,15 +35535,14 @@ if test -n "$DIRAC_LIBS"; then
+@@ -35769,15 +35553,14 @@
else
pkg_failed=yes
fi
@@ -4308,7 +6827,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -35459,14 +35550,16 @@ else
+@@ -35785,25 +35568,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -4322,22 +6841,26 @@ Forwarded: not-needed
echo "$DIRAC_PKG_ERRORS" >&5
- if test x"$enable_dirac" = "xyes"; then :
+- as_fn_error $? "Library dirac >= 0.10.0 needed for dirac was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_dirac" = "xyes"; then :
- as_fn_error "Library dirac >= 0.10.0 needed for dirac was not found" "$LINENO" 5
++ as_fn_error "Library dirac >= 0.10.0 needed for dirac was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library dirac >= 0.10.0 needed for dirac was not found" >&5
-@@ -35474,8 +35567,6 @@ $as_echo "$as_me: WARNING: Library dirac
+ $as_echo "$as_me: WARNING: Library dirac >= 0.10.0 needed for dirac was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_dirac" = "xyes"; then :
- as_fn_error "Library dirac >= 0.10.0 needed for dirac was not found" "$LINENO" 5
+- as_fn_error $? "Library dirac >= 0.10.0 needed for dirac was not found" "$LINENO" 5
++ as_fn_error "Library dirac >= 0.10.0 needed for dirac was not found" "$LINENO" 5
else
-@@ -35513,10 +35604,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library dirac >= 0.10.0 needed for dirac was not found" >&5
+ $as_echo "$as_me: WARNING: Library dirac >= 0.10.0 needed for dirac was not found" >&2;}
+@@ -35839,10 +35622,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIRAC" >&5
$as_echo_n "checking for DIRAC... " >&6; }
@@ -4353,7 +6876,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dirac >= 0.10.0\""; } >&5
($PKG_CONFIG --exists --print-errors "dirac >= 0.10.0") 2>&5
ac_status=$?
-@@ -35526,13 +35618,15 @@ if test -n "$DIRAC_CFLAGS"; then
+@@ -35852,13 +35636,15 @@
else
pkg_failed=yes
fi
@@ -4375,7 +6898,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dirac >= 0.10.0\""; } >&5
($PKG_CONFIG --exists --print-errors "dirac >= 0.10.0") 2>&5
ac_status=$?
-@@ -35542,15 +35636,14 @@ if test -n "$DIRAC_LIBS"; then
+@@ -35868,15 +35654,14 @@
else
pkg_failed=yes
fi
@@ -4394,7 +6917,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -35558,14 +35651,16 @@ else
+@@ -35884,27 +35669,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -4412,9 +6935,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_dirac=no
if test x"$enable_dirac" = "xyes"; then :
- as_fn_error "Library dirac >= 0.10.0 needed for dirac was not found" "$LINENO" 5
+- as_fn_error $? "Library dirac >= 0.10.0 needed for dirac was not found" "$LINENO" 5
++ as_fn_error "Library dirac >= 0.10.0 needed for dirac was not found" "$LINENO" 5
else
-@@ -35574,8 +35669,6 @@ $as_echo "$as_me: WARNING: Library dirac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library dirac >= 0.10.0 needed for dirac was not found" >&5
+ $as_echo "$as_me: WARNING: Library dirac >= 0.10.0 needed for dirac was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -4422,8 +6947,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_dirac=no
if test x"$enable_dirac" = "xyes"; then :
- as_fn_error "Library dirac >= 0.10.0 needed for dirac was not found" "$LINENO" 5
-@@ -35657,10 +35750,11 @@ pkg_failed=no
+- as_fn_error $? "Library dirac >= 0.10.0 needed for dirac was not found" "$LINENO" 5
++ as_fn_error "Library dirac >= 0.10.0 needed for dirac was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library dirac >= 0.10.0 needed for dirac was not found" >&5
+ $as_echo "$as_me: WARNING: Library dirac >= 0.10.0 needed for dirac was not found" >&2;}
+@@ -35983,10 +35768,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCHROEDINGER" >&5
$as_echo_n "checking for SCHROEDINGER... " >&6; }
@@ -4439,7 +6968,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"schroedinger-1.0 >= 1.0.6\""; } >&5
($PKG_CONFIG --exists --print-errors "schroedinger-1.0 >= 1.0.6") 2>&5
ac_status=$?
-@@ -35670,13 +35764,15 @@ if test -n "$SCHROEDINGER_CFLAGS"; then
+@@ -35996,13 +35782,15 @@
else
pkg_failed=yes
fi
@@ -4461,7 +6990,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"schroedinger-1.0 >= 1.0.6\""; } >&5
($PKG_CONFIG --exists --print-errors "schroedinger-1.0 >= 1.0.6") 2>&5
ac_status=$?
-@@ -35686,15 +35782,14 @@ if test -n "$SCHROEDINGER_LIBS"; then
+@@ -36012,15 +35800,14 @@
else
pkg_failed=yes
fi
@@ -4480,7 +7009,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -35702,14 +35797,16 @@ else
+@@ -36028,25 +35815,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -4494,22 +7023,26 @@ Forwarded: not-needed
echo "$SCHROEDINGER_PKG_ERRORS" >&5
- if test x"$enable_schroedinger" = "xyes"; then :
+- as_fn_error $? "Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_schroedinger" = "xyes"; then :
- as_fn_error "Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" "$LINENO" 5
++ as_fn_error "Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" >&5
-@@ -35717,8 +35814,6 @@ $as_echo "$as_me: WARNING: Library schro
+ $as_echo "$as_me: WARNING: Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_schroedinger" = "xyes"; then :
- as_fn_error "Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" "$LINENO" 5
+- as_fn_error $? "Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" "$LINENO" 5
++ as_fn_error "Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" "$LINENO" 5
else
-@@ -35756,10 +35851,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" >&5
+ $as_echo "$as_me: WARNING: Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" >&2;}
+@@ -36082,10 +35869,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCHROEDINGER" >&5
$as_echo_n "checking for SCHROEDINGER... " >&6; }
@@ -4525,7 +7058,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"schroedinger-1.0 >= 1.0.6\""; } >&5
($PKG_CONFIG --exists --print-errors "schroedinger-1.0 >= 1.0.6") 2>&5
ac_status=$?
-@@ -35769,13 +35865,15 @@ if test -n "$SCHROEDINGER_CFLAGS"; then
+@@ -36095,13 +35883,15 @@
else
pkg_failed=yes
fi
@@ -4547,7 +7080,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"schroedinger-1.0 >= 1.0.6\""; } >&5
($PKG_CONFIG --exists --print-errors "schroedinger-1.0 >= 1.0.6") 2>&5
ac_status=$?
-@@ -35785,15 +35883,14 @@ if test -n "$SCHROEDINGER_LIBS"; then
+@@ -36111,15 +35901,14 @@
else
pkg_failed=yes
fi
@@ -4566,7 +7099,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -35801,14 +35898,16 @@ else
+@@ -36127,27 +35916,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -4584,9 +7117,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_schroedinger=no
if test x"$enable_schroedinger" = "xyes"; then :
- as_fn_error "Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" "$LINENO" 5
+- as_fn_error $? "Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" "$LINENO" 5
++ as_fn_error "Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" "$LINENO" 5
else
-@@ -35817,8 +35916,6 @@ $as_echo "$as_me: WARNING: Library schro
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" >&5
+ $as_echo "$as_me: WARNING: Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -4594,8 +7129,21 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_schroedinger=no
if test x"$enable_schroedinger" = "xyes"; then :
- as_fn_error "Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" "$LINENO" 5
-@@ -36005,10 +36102,11 @@ pkg_failed=no
+- as_fn_error $? "Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" "$LINENO" 5
++ as_fn_error "Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" >&5
+ $as_echo "$as_me: WARNING: Library schroedinger-1.0 >= 1.0.6 needed for schroedinger was not found" >&2;}
+@@ -36306,7 +36095,7 @@
+ then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "${with_x264_tree} directory doesn't exist" "$LINENO" 5
++ as_fn_error "${with_x264_tree} directory doesn't exist" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for x264.h in ${real_x264_tree}" >&5
+ $as_echo_n "checking for x264.h in ${real_x264_tree}... " >&6; }
+@@ -36331,10 +36120,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X264" >&5
$as_echo_n "checking for X264... " >&6; }
@@ -4611,7 +7159,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264\""; } >&5
($PKG_CONFIG --exists --print-errors "x264") 2>&5
ac_status=$?
-@@ -36018,13 +36116,15 @@ if test -n "$X264_CFLAGS"; then
+@@ -36344,13 +36134,15 @@
else
pkg_failed=yes
fi
@@ -4633,7 +7181,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264\""; } >&5
($PKG_CONFIG --exists --print-errors "x264") 2>&5
ac_status=$?
-@@ -36034,15 +36134,14 @@ if test -n "$X264_LIBS"; then
+@@ -36360,15 +36152,14 @@
else
pkg_failed=yes
fi
@@ -4652,7 +7200,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -36050,19 +36149,19 @@ else
+@@ -36376,21 +36167,21 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -4668,15 +7216,28 @@ Forwarded: not-needed
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
- as_fn_error "the specified tree hasn't been compiled" "$LINENO" 5
+- as_fn_error $? "the specified tree hasn't been compiled" "$LINENO" 5
++ as_fn_error "the specified tree hasn't been compiled" "$LINENO" 5
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error "the specified tree hasn't been compiled" "$LINENO" 5
+- as_fn_error $? "the specified tree hasn't been compiled" "$LINENO" 5
++ as_fn_error "the specified tree hasn't been compiled" "$LINENO" 5
+
+ else
+ X264_CFLAGS=$pkg_cv_X264_CFLAGS
+@@ -36431,7 +36222,7 @@
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "the specified tree doesn't have x264.h" "$LINENO" 5
++ as_fn_error "the specified tree doesn't have x264.h" "$LINENO" 5
+ fi
+ else
-@@ -36113,10 +36212,11 @@ pkg_failed=no
+@@ -36439,10 +36230,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X264" >&5
$as_echo_n "checking for X264... " >&6; }
@@ -4692,7 +7253,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.76\""; } >&5
($PKG_CONFIG --exists --print-errors "x264 >= 0.76") 2>&5
ac_status=$?
-@@ -36126,13 +36226,15 @@ if test -n "$X264_CFLAGS"; then
+@@ -36452,13 +36244,15 @@
else
pkg_failed=yes
fi
@@ -4714,7 +7275,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.76\""; } >&5
($PKG_CONFIG --exists --print-errors "x264 >= 0.76") 2>&5
ac_status=$?
-@@ -36142,15 +36244,14 @@ if test -n "$X264_LIBS"; then
+@@ -36468,15 +36262,14 @@
else
pkg_failed=yes
fi
@@ -4733,7 +7294,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -36158,21 +36259,21 @@ else
+@@ -36484,24 +36277,24 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -4750,7 +7311,8 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
if test "${enable_x264}" = "yes"; then
- as_fn_error "Could not find libx264 >= 0.76 on your system: you may get it from http://www.videolan.org/x264.html" "$LINENO" 5
+- as_fn_error $? "Could not find libx264 >= 0.76 on your system: you may get it from http://www.videolan.org/x264.html" "$LINENO" 5
++ as_fn_error "Could not find libx264 >= 0.76 on your system: you may get it from http://www.videolan.org/x264.html" "$LINENO" 5
fi
elif test $pkg_failed = untried; then
@@ -4758,8 +7320,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
if test "${enable_x264}" = "yes"; then
- as_fn_error "Could not find libx264 >= 0.76 on your system: you may get it from http://www.videolan.org/x264.html" "$LINENO" 5
-@@ -36289,10 +36390,11 @@ pkg_failed=no
+- as_fn_error $? "Could not find libx264 >= 0.76 on your system: you may get it from http://www.videolan.org/x264.html" "$LINENO" 5
++ as_fn_error "Could not find libx264 >= 0.76 on your system: you may get it from http://www.videolan.org/x264.html" "$LINENO" 5
+ fi
+
+ else
+@@ -36615,10 +36408,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLUIDSYNTH" >&5
$as_echo_n "checking for FLUIDSYNTH... " >&6; }
@@ -4775,7 +7341,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth\""; } >&5
($PKG_CONFIG --exists --print-errors "fluidsynth") 2>&5
ac_status=$?
-@@ -36302,13 +36404,15 @@ if test -n "$FLUIDSYNTH_CFLAGS"; then
+@@ -36628,13 +36422,15 @@
else
pkg_failed=yes
fi
@@ -4797,7 +7363,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth\""; } >&5
($PKG_CONFIG --exists --print-errors "fluidsynth") 2>&5
ac_status=$?
-@@ -36318,15 +36422,14 @@ if test -n "$FLUIDSYNTH_LIBS"; then
+@@ -36644,15 +36440,14 @@
else
pkg_failed=yes
fi
@@ -4816,7 +7382,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -36334,14 +36437,16 @@ else
+@@ -36660,25 +36455,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -4830,22 +7396,26 @@ Forwarded: not-needed
echo "$FLUIDSYNTH_PKG_ERRORS" >&5
- if test x"$enable_fluidsynth" = "xyes"; then :
+- as_fn_error $? "Library fluidsynth needed for fluidsynth was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_fluidsynth" = "xyes"; then :
- as_fn_error "Library fluidsynth needed for fluidsynth was not found" "$LINENO" 5
++ as_fn_error "Library fluidsynth needed for fluidsynth was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidsynth needed for fluidsynth was not found" >&5
-@@ -36349,8 +36454,6 @@ $as_echo "$as_me: WARNING: Library fluid
+ $as_echo "$as_me: WARNING: Library fluidsynth needed for fluidsynth was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_fluidsynth" = "xyes"; then :
- as_fn_error "Library fluidsynth needed for fluidsynth was not found" "$LINENO" 5
+- as_fn_error $? "Library fluidsynth needed for fluidsynth was not found" "$LINENO" 5
++ as_fn_error "Library fluidsynth needed for fluidsynth was not found" "$LINENO" 5
else
-@@ -36388,10 +36491,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidsynth needed for fluidsynth was not found" >&5
+ $as_echo "$as_me: WARNING: Library fluidsynth needed for fluidsynth was not found" >&2;}
+@@ -36714,10 +36509,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLUIDSYNTH" >&5
$as_echo_n "checking for FLUIDSYNTH... " >&6; }
@@ -4861,7 +7431,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth\""; } >&5
($PKG_CONFIG --exists --print-errors "fluidsynth") 2>&5
ac_status=$?
-@@ -36401,13 +36505,15 @@ if test -n "$FLUIDSYNTH_CFLAGS"; then
+@@ -36727,13 +36523,15 @@
else
pkg_failed=yes
fi
@@ -4883,7 +7453,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth\""; } >&5
($PKG_CONFIG --exists --print-errors "fluidsynth") 2>&5
ac_status=$?
-@@ -36417,15 +36523,14 @@ if test -n "$FLUIDSYNTH_LIBS"; then
+@@ -36743,15 +36541,14 @@
else
pkg_failed=yes
fi
@@ -4902,7 +7472,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -36433,14 +36538,16 @@ else
+@@ -36759,27 +36556,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -4920,9 +7490,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_fluidsynth=no
if test x"$enable_fluidsynth" = "xyes"; then :
- as_fn_error "Library fluidsynth needed for fluidsynth was not found" "$LINENO" 5
+- as_fn_error $? "Library fluidsynth needed for fluidsynth was not found" "$LINENO" 5
++ as_fn_error "Library fluidsynth needed for fluidsynth was not found" "$LINENO" 5
else
-@@ -36449,8 +36556,6 @@ $as_echo "$as_me: WARNING: Library fluid
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidsynth needed for fluidsynth was not found" >&5
+ $as_echo "$as_me: WARNING: Library fluidsynth needed for fluidsynth was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -4930,8 +7502,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_fluidsynth=no
if test x"$enable_fluidsynth" = "xyes"; then :
- as_fn_error "Library fluidsynth needed for fluidsynth was not found" "$LINENO" 5
-@@ -36519,10 +36624,11 @@ pkg_failed=no
+- as_fn_error $? "Library fluidsynth needed for fluidsynth was not found" "$LINENO" 5
++ as_fn_error "Library fluidsynth needed for fluidsynth was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidsynth needed for fluidsynth was not found" >&5
+ $as_echo "$as_me: WARNING: Library fluidsynth needed for fluidsynth was not found" >&2;}
+@@ -36845,10 +36642,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZVBI" >&5
$as_echo_n "checking for ZVBI... " >&6; }
@@ -4947,7 +7523,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zvbi-0.2 >= 0.2.28\""; } >&5
($PKG_CONFIG --exists --print-errors "zvbi-0.2 >= 0.2.28") 2>&5
ac_status=$?
-@@ -36532,13 +36638,15 @@ if test -n "$ZVBI_CFLAGS"; then
+@@ -36858,13 +36656,15 @@
else
pkg_failed=yes
fi
@@ -4969,7 +7545,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zvbi-0.2 >= 0.2.28\""; } >&5
($PKG_CONFIG --exists --print-errors "zvbi-0.2 >= 0.2.28") 2>&5
ac_status=$?
-@@ -36548,15 +36656,14 @@ if test -n "$ZVBI_LIBS"; then
+@@ -36874,15 +36674,14 @@
else
pkg_failed=yes
fi
@@ -4988,7 +7564,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -36564,20 +36671,20 @@ else
+@@ -36890,20 +36689,20 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -5013,7 +7589,7 @@ Forwarded: not-needed
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ZVBI library not found. Enabling the telx module instead" >&5
$as_echo "$as_me: WARNING: ZVBI library not found. Enabling the telx module instead" >&2;}
-@@ -36654,10 +36761,11 @@ pkg_failed=no
+@@ -36980,10 +36779,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBASS" >&5
$as_echo_n "checking for LIBASS... " >&6; }
@@ -5029,7 +7605,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libass >= 0.9.6\""; } >&5
($PKG_CONFIG --exists --print-errors "libass >= 0.9.6") 2>&5
ac_status=$?
-@@ -36667,13 +36775,15 @@ if test -n "$LIBASS_CFLAGS"; then
+@@ -36993,13 +36793,15 @@
else
pkg_failed=yes
fi
@@ -5051,7 +7627,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libass >= 0.9.6\""; } >&5
($PKG_CONFIG --exists --print-errors "libass >= 0.9.6") 2>&5
ac_status=$?
-@@ -36683,15 +36793,14 @@ if test -n "$LIBASS_LIBS"; then
+@@ -37009,15 +36811,14 @@
else
pkg_failed=yes
fi
@@ -5070,7 +7646,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -36699,20 +36808,20 @@ else
+@@ -37025,20 +36826,20 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -5095,7 +7671,7 @@ Forwarded: not-needed
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: LIBASS library not found" >&5
$as_echo "$as_me: WARNING: LIBASS library not found" >&2;}
-@@ -36784,10 +36893,11 @@ pkg_failed=no
+@@ -37110,10 +36911,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCRE" >&5
$as_echo_n "checking for PCRE... " >&6; }
@@ -5111,7 +7687,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre >= 6.5\""; } >&5
($PKG_CONFIG --exists --print-errors "libpcre >= 6.5") 2>&5
ac_status=$?
-@@ -36797,13 +36907,15 @@ if test -n "$PCRE_CFLAGS"; then
+@@ -37123,13 +36925,15 @@
else
pkg_failed=yes
fi
@@ -5133,7 +7709,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre >= 6.5\""; } >&5
($PKG_CONFIG --exists --print-errors "libpcre >= 6.5") 2>&5
ac_status=$?
-@@ -36813,15 +36925,14 @@ if test -n "$PCRE_LIBS"; then
+@@ -37139,15 +36943,14 @@
else
pkg_failed=yes
fi
@@ -5152,7 +7728,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -36829,20 +36940,20 @@ else
+@@ -37155,20 +36958,20 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -5177,7 +7753,7 @@ Forwarded: not-needed
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PCRE library not found (required for asademux)" >&5
$as_echo "$as_me: WARNING: PCRE library not found (required for asademux)" >&2;}
-@@ -36897,10 +37008,11 @@ pkg_failed=no
+@@ -37223,10 +37026,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for KATE" >&5
$as_echo_n "checking for KATE... " >&6; }
@@ -5193,7 +7769,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"kate >= 0.1.5\""; } >&5
($PKG_CONFIG --exists --print-errors "kate >= 0.1.5") 2>&5
ac_status=$?
-@@ -36910,13 +37022,15 @@ if test -n "$KATE_CFLAGS"; then
+@@ -37236,13 +37040,15 @@
else
pkg_failed=yes
fi
@@ -5215,7 +7791,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"kate >= 0.1.5\""; } >&5
($PKG_CONFIG --exists --print-errors "kate >= 0.1.5") 2>&5
ac_status=$?
-@@ -36926,15 +37040,14 @@ if test -n "$KATE_LIBS"; then
+@@ -37252,15 +37058,14 @@
else
pkg_failed=yes
fi
@@ -5234,7 +7810,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -36942,13 +37055,15 @@ else
+@@ -37268,13 +37073,15 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -5252,7 +7828,25 @@ Forwarded: not-needed
for ac_header in kate/kate.h
do :
-@@ -37037,8 +37152,6 @@ done
+@@ -37340,7 +37147,7 @@
+
+ if test "x${enable_kate}" != "x"; then :
+
+- as_fn_error $? "libkate doesn't appear to be installed on your system.
++ as_fn_error "libkate doesn't appear to be installed on your system.
+ You also need to check that you have a libogg posterior to the 1.0 release." "$LINENO" 5
+
+ fi
+@@ -37352,7 +37159,7 @@
+
+ if test "x${enable_kate}" != "x"; then :
+
+- as_fn_error $? "libkate headers do not appear to be installed on your system.
++ as_fn_error "libkate headers do not appear to be installed on your system.
+ You also need to check that you have a libogg posterior to the 1.0 release." "$LINENO" 5
+
+ fi
+@@ -37363,8 +37170,6 @@
elif test $pkg_failed = untried; then
@@ -5261,7 +7855,25 @@ Forwarded: not-needed
for ac_header in kate/kate.h
do :
-@@ -37168,10 +37281,11 @@ pkg_failed=no
+@@ -37430,7 +37235,7 @@
+
+ if test "x${enable_kate}" != "x"; then :
+
+- as_fn_error $? "libkate doesn't appear to be installed on your system.
++ as_fn_error "libkate doesn't appear to be installed on your system.
+ You also need to check that you have a libogg posterior to the 1.0 release." "$LINENO" 5
+
+ fi
+@@ -37442,7 +37247,7 @@
+
+ if test "x${enable_kate}" != "x"; then :
+
+- as_fn_error $? "libkate headers do not appear to be installed on your system.
++ as_fn_error "libkate headers do not appear to be installed on your system.
+ You also need to check that you have a libogg posterior to the 1.0 release." "$LINENO" 5
+
+ fi
+@@ -37494,10 +37299,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIGER" >&5
$as_echo_n "checking for TIGER... " >&6; }
@@ -5277,7 +7889,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tiger >= 0.3.1\""; } >&5
($PKG_CONFIG --exists --print-errors "tiger >= 0.3.1") 2>&5
ac_status=$?
-@@ -37181,13 +37295,15 @@ if test -n "$TIGER_CFLAGS"; then
+@@ -37507,13 +37313,15 @@
else
pkg_failed=yes
fi
@@ -5299,7 +7911,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tiger >= 0.3.1\""; } >&5
($PKG_CONFIG --exists --print-errors "tiger >= 0.3.1") 2>&5
ac_status=$?
-@@ -37197,15 +37313,14 @@ if test -n "$TIGER_LIBS"; then
+@@ -37523,15 +37331,14 @@
else
pkg_failed=yes
fi
@@ -5318,7 +7930,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -37213,13 +37328,15 @@ else
+@@ -37539,27 +37346,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -5336,7 +7948,9 @@ Forwarded: not-needed
if test "x${enable_tiger}" != "x"; then :
-@@ -37228,8 +37345,6 @@ fi
+- as_fn_error $? "libtiger does not appear to be installed on your system." "$LINENO" 5
++ as_fn_error "libtiger does not appear to be installed on your system." "$LINENO" 5
+
fi
elif test $pkg_failed = untried; then
@@ -5345,7 +7959,39 @@ Forwarded: not-needed
if test "x${enable_tiger}" != "x"; then :
-@@ -38006,10 +38121,11 @@ pkg_failed=no
+- as_fn_error $? "libtiger does not appear to be installed on your system." "$LINENO" 5
++ as_fn_error "libtiger does not appear to be installed on your system." "$LINENO" 5
+
+ fi
+
+@@ -37609,7 +37416,7 @@
+ have_x=disabled
+ else
+ case $x_includes,$x_libraries in #(
+- *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
++ *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+@@ -37627,7 +37434,7 @@
+ @echo libdir='${LIBDIR}'
+ _ACEOF
+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
+- # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
++ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ for ac_var in incroot usrlibdir libdir; do
+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
+ done
+@@ -37713,7 +37520,7 @@
+ fi
+ done
+ fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
+ fi # $ac_x_includes = no
+
+ if test "$ac_x_libraries" = no; then
+@@ -38332,10 +38139,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB" >&5
$as_echo_n "checking for XCB... " >&6; }
@@ -5361,7 +8007,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb\""; } >&5
($PKG_CONFIG --exists --print-errors "xcb") 2>&5
ac_status=$?
-@@ -38019,13 +38135,15 @@ if test -n "$XCB_CFLAGS"; then
+@@ -38345,13 +38153,15 @@
else
pkg_failed=yes
fi
@@ -5383,7 +8029,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb\""; } >&5
($PKG_CONFIG --exists --print-errors "xcb") 2>&5
ac_status=$?
-@@ -38035,15 +38153,14 @@ if test -n "$XCB_LIBS"; then
+@@ -38361,15 +38171,14 @@
else
pkg_failed=yes
fi
@@ -5402,7 +8048,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -38051,9 +38168,9 @@ else
+@@ -38377,14 +38186,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -5414,7 +8060,13 @@ Forwarded: not-needed
fi
# Put the nasty error message in config.log where it belongs
echo "$XCB_PKG_ERRORS" >&5
-@@ -38067,10 +38184,9 @@ installed software in a non-standard pre
+
+- as_fn_error $? "Package requirements (xcb) were not met:
++ as_fn_error "Package requirements (xcb) were not met:
+
+ $XCB_PKG_ERRORS
+
+@@ -38393,13 +38202,12 @@
Alternatively, you may set the environment variables XCB_CFLAGS
and XCB_LIBS to avoid the need to call pkg-config.
@@ -5426,8 +8078,19 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "The pkg-config script could not be found or is too old. Make sure it
-@@ -38088,17 +38204,18 @@ else
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -38408,23 +38216,24 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5 ; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ XCB_CFLAGS=$pkg_cv_XCB_CFLAGS
XCB_LIBS=$pkg_cv_XCB_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -5451,7 +8114,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-shm\""; } >&5
($PKG_CONFIG --exists --print-errors "xcb-shm") 2>&5
ac_status=$?
-@@ -38108,13 +38225,15 @@ if test -n "$XCB_SHM_CFLAGS"; then
+@@ -38434,13 +38243,15 @@
else
pkg_failed=yes
fi
@@ -5473,7 +8136,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-shm\""; } >&5
($PKG_CONFIG --exists --print-errors "xcb-shm") 2>&5
ac_status=$?
-@@ -38124,15 +38243,14 @@ if test -n "$XCB_SHM_LIBS"; then
+@@ -38450,15 +38261,14 @@
else
pkg_failed=yes
fi
@@ -5492,7 +8155,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -38140,9 +38258,9 @@ else
+@@ -38466,14 +38276,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -5504,7 +8167,13 @@ Forwarded: not-needed
fi
# Put the nasty error message in config.log where it belongs
echo "$XCB_SHM_PKG_ERRORS" >&5
-@@ -38156,10 +38274,9 @@ installed software in a non-standard pre
+
+- as_fn_error $? "Package requirements (xcb-shm) were not met:
++ as_fn_error "Package requirements (xcb-shm) were not met:
+
+ $XCB_SHM_PKG_ERRORS
+
+@@ -38482,13 +38292,12 @@
Alternatively, you may set the environment variables XCB_SHM_CFLAGS
and XCB_SHM_LIBS to avoid the need to call pkg-config.
@@ -5516,8 +8185,19 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "The pkg-config script could not be found or is too old. Make sure it
-@@ -38177,7 +38294,7 @@ else
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -38497,13 +38306,13 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5 ; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ XCB_SHM_CFLAGS=$pkg_cv_XCB_SHM_CFLAGS
XCB_SHM_LIBS=$pkg_cv_XCB_SHM_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -5526,7 +8206,7 @@ Forwarded: not-needed
fi
-@@ -38210,10 +38327,11 @@ pkg_failed=no
+@@ -38536,10 +38345,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XV" >&5
$as_echo_n "checking for XCB_XV... " >&6; }
@@ -5542,7 +8222,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xv >= 1.1.90.1\""; } >&5
($PKG_CONFIG --exists --print-errors "xcb-xv >= 1.1.90.1") 2>&5
ac_status=$?
-@@ -38223,13 +38341,15 @@ if test -n "$XCB_XV_CFLAGS"; then
+@@ -38549,13 +38359,15 @@
else
pkg_failed=yes
fi
@@ -5564,7 +8244,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xv >= 1.1.90.1\""; } >&5
($PKG_CONFIG --exists --print-errors "xcb-xv >= 1.1.90.1") 2>&5
ac_status=$?
-@@ -38239,15 +38359,14 @@ if test -n "$XCB_XV_LIBS"; then
+@@ -38565,15 +38377,14 @@
else
pkg_failed=yes
fi
@@ -5583,7 +8263,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -38255,23 +38374,26 @@ else
+@@ -38581,23 +38392,26 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -5616,7 +8296,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xv\""; } >&5
($PKG_CONFIG --exists --print-errors "xcb-xv") 2>&5
ac_status=$?
-@@ -38281,13 +38403,15 @@ if test -n "$XCB_XV_CFLAGS"; then
+@@ -38607,13 +38421,15 @@
else
pkg_failed=yes
fi
@@ -5638,7 +8318,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xv\""; } >&5
($PKG_CONFIG --exists --print-errors "xcb-xv") 2>&5
ac_status=$?
-@@ -38297,15 +38421,14 @@ if test -n "$XCB_XV_LIBS"; then
+@@ -38623,15 +38439,14 @@
else
pkg_failed=yes
fi
@@ -5657,7 +8337,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -38313,9 +38436,9 @@ else
+@@ -38639,14 +38454,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -5669,7 +8349,13 @@ Forwarded: not-needed
fi
# Put the nasty error message in config.log where it belongs
echo "$XCB_XV_PKG_ERRORS" >&5
-@@ -38329,10 +38452,9 @@ installed software in a non-standard pre
+
+- as_fn_error $? "Package requirements (xcb-xv) were not met:
++ as_fn_error "Package requirements (xcb-xv) were not met:
+
+ $XCB_XV_PKG_ERRORS
+
+@@ -38655,13 +38470,12 @@
Alternatively, you may set the environment variables XCB_XV_CFLAGS
and XCB_XV_LIBS to avoid the need to call pkg-config.
@@ -5681,8 +8367,21 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "The pkg-config script could not be found or is too old. Make sure it
-@@ -38368,18 +38490,17 @@ $as_echo "yes" >&6; }
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -38670,7 +38484,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5 ; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ XCB_XV_CFLAGS=$pkg_cv_XCB_XV_CFLAGS
+ XCB_XV_LIBS=$pkg_cv_XCB_XV_LIBS
+@@ -38694,18 +38508,17 @@
fi
elif test $pkg_failed = untried; then
@@ -5706,7 +8405,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xv\""; } >&5
($PKG_CONFIG --exists --print-errors "xcb-xv") 2>&5
ac_status=$?
-@@ -38389,13 +38510,15 @@ if test -n "$XCB_XV_CFLAGS"; then
+@@ -38715,13 +38528,15 @@
else
pkg_failed=yes
fi
@@ -5728,7 +8427,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xv\""; } >&5
($PKG_CONFIG --exists --print-errors "xcb-xv") 2>&5
ac_status=$?
-@@ -38405,15 +38528,14 @@ if test -n "$XCB_XV_LIBS"; then
+@@ -38731,15 +38546,14 @@
else
pkg_failed=yes
fi
@@ -5747,7 +8446,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -38421,9 +38543,9 @@ else
+@@ -38747,14 +38561,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -5759,7 +8458,13 @@ Forwarded: not-needed
fi
# Put the nasty error message in config.log where it belongs
echo "$XCB_XV_PKG_ERRORS" >&5
-@@ -38437,10 +38559,9 @@ installed software in a non-standard pre
+
+- as_fn_error $? "Package requirements (xcb-xv) were not met:
++ as_fn_error "Package requirements (xcb-xv) were not met:
+
+ $XCB_XV_PKG_ERRORS
+
+@@ -38763,13 +38577,12 @@
Alternatively, you may set the environment variables XCB_XV_CFLAGS
and XCB_XV_LIBS to avoid the need to call pkg-config.
@@ -5771,8 +8476,21 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "The pkg-config script could not be found or is too old. Make sure it
-@@ -38498,10 +38619,11 @@ pkg_failed=no
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -38778,7 +38591,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5 ; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ XCB_XV_CFLAGS=$pkg_cv_XCB_XV_CFLAGS
+ XCB_XV_LIBS=$pkg_cv_XCB_XV_LIBS
+@@ -38824,10 +38637,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_RANDR" >&5
$as_echo_n "checking for XCB_RANDR... " >&6; }
@@ -5788,7 +8506,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-randr >= 1.3\""; } >&5
($PKG_CONFIG --exists --print-errors "xcb-randr >= 1.3") 2>&5
ac_status=$?
-@@ -38511,13 +38633,15 @@ if test -n "$XCB_RANDR_CFLAGS"; then
+@@ -38837,13 +38651,15 @@
else
pkg_failed=yes
fi
@@ -5810,7 +8528,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-randr >= 1.3\""; } >&5
($PKG_CONFIG --exists --print-errors "xcb-randr >= 1.3") 2>&5
ac_status=$?
-@@ -38527,15 +38651,14 @@ if test -n "$XCB_RANDR_LIBS"; then
+@@ -38853,15 +38669,14 @@
else
pkg_failed=yes
fi
@@ -5829,7 +8547,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -38543,17 +38666,17 @@ else
+@@ -38869,17 +38684,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -5852,7 +8570,7 @@ Forwarded: not-needed
true
else
XCB_RANDR_CFLAGS=$pkg_cv_XCB_RANDR_CFLAGS
-@@ -38588,10 +38711,11 @@ pkg_failed=no
+@@ -38914,10 +38729,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_KEYSYMS" >&5
$as_echo_n "checking for XCB_KEYSYMS... " >&6; }
@@ -5868,7 +8586,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-keysyms >= 0.3.4\""; } >&5
($PKG_CONFIG --exists --print-errors "xcb-keysyms >= 0.3.4") 2>&5
ac_status=$?
-@@ -38601,13 +38725,15 @@ if test -n "$XCB_KEYSYMS_CFLAGS"; then
+@@ -38927,13 +38743,15 @@
else
pkg_failed=yes
fi
@@ -5890,7 +8608,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-keysyms >= 0.3.4\""; } >&5
($PKG_CONFIG --exists --print-errors "xcb-keysyms >= 0.3.4") 2>&5
ac_status=$?
-@@ -38617,15 +38743,14 @@ if test -n "$XCB_KEYSYMS_LIBS"; then
+@@ -38943,15 +38761,14 @@
else
pkg_failed=yes
fi
@@ -5909,7 +8627,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -38633,23 +38758,26 @@ else
+@@ -38959,23 +38776,26 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -5942,7 +8660,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-keysyms\""; } >&5
($PKG_CONFIG --exists --print-errors "xcb-keysyms") 2>&5
ac_status=$?
-@@ -38659,13 +38787,15 @@ if test -n "$XCB_KEYSYMS_CFLAGS"; then
+@@ -38985,13 +38805,15 @@
else
pkg_failed=yes
fi
@@ -5964,7 +8682,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-keysyms\""; } >&5
($PKG_CONFIG --exists --print-errors "xcb-keysyms") 2>&5
ac_status=$?
-@@ -38675,15 +38805,14 @@ if test -n "$XCB_KEYSYMS_LIBS"; then
+@@ -39001,15 +38823,14 @@
else
pkg_failed=yes
fi
@@ -5983,7 +8701,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -38691,13 +38820,15 @@ else
+@@ -39017,13 +38838,15 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -6001,7 +8719,7 @@ Forwarded: not-needed
have_xcb_keysyms="no"
need_xid_provider="yes"
-@@ -38705,8 +38836,6 @@ fi
+@@ -39031,8 +38854,6 @@
$as_echo "$as_me: WARNING: libxcb-keysyms not found. Hotkeys will not be supported." >&2;}
elif test $pkg_failed = untried; then
@@ -6010,7 +8728,7 @@ Forwarded: not-needed
have_xcb_keysyms="no"
need_xid_provider="yes"
-@@ -38730,18 +38859,17 @@ $as_echo "yes" >&6; }
+@@ -39056,18 +38877,17 @@
fi
elif test $pkg_failed = untried; then
@@ -6034,7 +8752,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-keysyms\""; } >&5
($PKG_CONFIG --exists --print-errors "xcb-keysyms") 2>&5
ac_status=$?
-@@ -38751,13 +38879,15 @@ if test -n "$XCB_KEYSYMS_CFLAGS"; then
+@@ -39077,13 +38897,15 @@
else
pkg_failed=yes
fi
@@ -6056,7 +8774,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-keysyms\""; } >&5
($PKG_CONFIG --exists --print-errors "xcb-keysyms") 2>&5
ac_status=$?
-@@ -38767,15 +38897,14 @@ if test -n "$XCB_KEYSYMS_LIBS"; then
+@@ -39093,15 +38915,14 @@
else
pkg_failed=yes
fi
@@ -6075,7 +8793,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -38783,13 +38912,15 @@ else
+@@ -39109,13 +38930,15 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -6093,7 +8811,7 @@ Forwarded: not-needed
have_xcb_keysyms="no"
need_xid_provider="yes"
-@@ -38797,8 +38928,6 @@ fi
+@@ -39123,8 +38946,6 @@
$as_echo "$as_me: WARNING: libxcb-keysyms not found. Hotkeys will not be supported." >&2;}
elif test $pkg_failed = untried; then
@@ -6102,7 +8820,7 @@ Forwarded: not-needed
have_xcb_keysyms="no"
need_xid_provider="yes"
-@@ -38838,10 +38967,11 @@ pkg_failed=no
+@@ -39164,10 +38985,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPROTO" >&5
$as_echo_n "checking for XPROTO... " >&6; }
@@ -6118,7 +8836,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xproto\""; } >&5
($PKG_CONFIG --exists --print-errors "xproto") 2>&5
ac_status=$?
-@@ -38851,13 +38981,15 @@ if test -n "$XPROTO_CFLAGS"; then
+@@ -39177,13 +38999,15 @@
else
pkg_failed=yes
fi
@@ -6140,7 +8858,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xproto\""; } >&5
($PKG_CONFIG --exists --print-errors "xproto") 2>&5
ac_status=$?
-@@ -38867,15 +38999,14 @@ if test -n "$XPROTO_LIBS"; then
+@@ -39193,15 +39017,14 @@
else
pkg_failed=yes
fi
@@ -6159,7 +8877,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -38883,9 +39014,9 @@ else
+@@ -39209,14 +39032,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -6171,7 +8889,13 @@ Forwarded: not-needed
fi
# Put the nasty error message in config.log where it belongs
echo "$XPROTO_PKG_ERRORS" >&5
-@@ -38899,10 +39030,9 @@ installed software in a non-standard pre
+
+- as_fn_error $? "Package requirements (xproto) were not met:
++ as_fn_error "Package requirements (xproto) were not met:
+
+ $XPROTO_PKG_ERRORS
+
+@@ -39225,13 +39048,12 @@
Alternatively, you may set the environment variables XPROTO_CFLAGS
and XPROTO_LIBS to avoid the need to call pkg-config.
@@ -6183,8 +8907,19 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "The pkg-config script could not be found or is too old. Make sure it
-@@ -38920,7 +39050,7 @@ else
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -39240,13 +39062,13 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5 ; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ XPROTO_CFLAGS=$pkg_cv_XPROTO_CFLAGS
XPROTO_LIBS=$pkg_cv_XPROTO_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -6193,7 +8928,7 @@ Forwarded: not-needed
fi
-@@ -38975,10 +39105,11 @@ pkg_failed=no
+@@ -39301,10 +39123,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XLIB_XCB" >&5
$as_echo_n "checking for XLIB_XCB... " >&6; }
@@ -6209,7 +8944,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb\""; } >&5
($PKG_CONFIG --exists --print-errors "x11-xcb") 2>&5
ac_status=$?
-@@ -38988,13 +39119,15 @@ if test -n "$XLIB_XCB_CFLAGS"; then
+@@ -39314,13 +39137,15 @@
else
pkg_failed=yes
fi
@@ -6231,7 +8966,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb\""; } >&5
($PKG_CONFIG --exists --print-errors "x11-xcb") 2>&5
ac_status=$?
-@@ -39004,15 +39137,14 @@ if test -n "$XLIB_XCB_LIBS"; then
+@@ -39330,15 +39155,14 @@
else
pkg_failed=yes
fi
@@ -6250,7 +8985,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -39020,9 +39152,9 @@ else
+@@ -39346,14 +39170,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -6262,7 +8997,13 @@ Forwarded: not-needed
fi
# Put the nasty error message in config.log where it belongs
echo "$XLIB_XCB_PKG_ERRORS" >&5
-@@ -39036,10 +39168,9 @@ installed software in a non-standard pre
+
+- as_fn_error $? "Package requirements (x11-xcb) were not met:
++ as_fn_error "Package requirements (x11-xcb) were not met:
+
+ $XLIB_XCB_PKG_ERRORS
+
+@@ -39362,13 +39186,12 @@
Alternatively, you may set the environment variables XLIB_XCB_CFLAGS
and XLIB_XCB_LIBS to avoid the need to call pkg-config.
@@ -6274,8 +9015,19 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "The pkg-config script could not be found or is too old. Make sure it
-@@ -39057,17 +39188,18 @@ else
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -39377,23 +39200,24 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5 ; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ XLIB_XCB_CFLAGS=$pkg_cv_XLIB_XCB_CFLAGS
XLIB_XCB_LIBS=$pkg_cv_XLIB_XCB_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -6299,7 +9051,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gl\""; } >&5
($PKG_CONFIG --exists --print-errors "gl") 2>&5
ac_status=$?
-@@ -39077,13 +39209,15 @@ if test -n "$GL_CFLAGS"; then
+@@ -39403,13 +39227,15 @@
else
pkg_failed=yes
fi
@@ -6321,7 +9073,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gl\""; } >&5
($PKG_CONFIG --exists --print-errors "gl") 2>&5
ac_status=$?
-@@ -39093,15 +39227,14 @@ if test -n "$GL_LIBS"; then
+@@ -39419,15 +39245,14 @@
else
pkg_failed=yes
fi
@@ -6340,7 +9092,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -39109,13 +39242,15 @@ else
+@@ -39435,13 +39260,15 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -6358,7 +9110,15 @@ Forwarded: not-needed
ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
if test "x$ac_cv_header_GL_gl_h" = x""yes; then :
-@@ -39132,8 +39267,6 @@ fi
+@@ -39451,15 +39278,13 @@
+
+ else
+
+- as_fn_error $? "GLX (libGL) cannot be found. If you do not need OpenGL with X11, use --disable-glx." "$LINENO" 5
++ as_fn_error "GLX (libGL) cannot be found. If you do not need OpenGL with X11, use --disable-glx." "$LINENO" 5
+
+ fi
+
elif test $pkg_failed = untried; then
@@ -6367,7 +9127,16 @@ Forwarded: not-needed
ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
if test "x$ac_cv_header_GL_gl_h" = x""yes; then :
-@@ -39154,7 +39287,7 @@ else
+@@ -39469,7 +39294,7 @@
+
+ else
+
+- as_fn_error $? "GLX (libGL) cannot be found. If you do not need OpenGL with X11, use --disable-glx." "$LINENO" 5
++ as_fn_error "GLX (libGL) cannot be found. If you do not need OpenGL with X11, use --disable-glx." "$LINENO" 5
+
+ fi
+
+@@ -39480,7 +39305,7 @@
GL_LIBS=$pkg_cv_GL_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -6376,7 +9145,7 @@ Forwarded: not-needed
fi
-@@ -39208,10 +39341,11 @@ pkg_failed=no
+@@ -39534,10 +39359,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
$as_echo_n "checking for SDL... " >&6; }
@@ -6392,7 +9161,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.10\""; } >&5
($PKG_CONFIG --exists --print-errors "sdl >= 1.2.10") 2>&5
ac_status=$?
-@@ -39221,13 +39355,15 @@ if test -n "$SDL_CFLAGS"; then
+@@ -39547,13 +39373,15 @@
else
pkg_failed=yes
fi
@@ -6414,7 +9183,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.10\""; } >&5
($PKG_CONFIG --exists --print-errors "sdl >= 1.2.10") 2>&5
ac_status=$?
-@@ -39237,15 +39373,14 @@ if test -n "$SDL_LIBS"; then
+@@ -39563,15 +39391,14 @@
else
pkg_failed=yes
fi
@@ -6433,7 +9202,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -39253,13 +39388,15 @@ else
+@@ -39579,13 +39406,15 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -6451,7 +9220,7 @@ Forwarded: not-needed
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The development package for SDL is not present or too old.
You need 1.2.10. Alternatively you can also configure with
-@@ -39269,8 +39406,6 @@ $as_echo "$as_me: WARNING: The developme
+@@ -39595,8 +39424,6 @@
--disable-sdl." >&2;}
elif test $pkg_failed = untried; then
@@ -6460,7 +9229,7 @@ Forwarded: not-needed
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The development package for SDL is not present or too old.
You need 1.2.10. Alternatively you can also configure with
-@@ -39334,10 +39469,11 @@ pkg_failed=no
+@@ -39660,10 +39487,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL_IMAGE" >&5
$as_echo_n "checking for SDL_IMAGE... " >&6; }
@@ -6476,7 +9245,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"SDL_image >= 1.2.10\""; } >&5
($PKG_CONFIG --exists --print-errors "SDL_image >= 1.2.10") 2>&5
ac_status=$?
-@@ -39347,13 +39483,15 @@ if test -n "$SDL_IMAGE_CFLAGS"; then
+@@ -39673,13 +39501,15 @@
else
pkg_failed=yes
fi
@@ -6498,7 +9267,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"SDL_image >= 1.2.10\""; } >&5
($PKG_CONFIG --exists --print-errors "SDL_image >= 1.2.10") 2>&5
ac_status=$?
-@@ -39363,15 +39501,14 @@ if test -n "$SDL_IMAGE_LIBS"; then
+@@ -39689,15 +39519,14 @@
else
pkg_failed=yes
fi
@@ -6517,7 +9286,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -39379,21 +39516,21 @@ else
+@@ -39705,21 +39534,21 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -6544,7 +9313,7 @@ Forwarded: not-needed
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The development package for SDL_image is not installed.
You should install it alongside your SDL package." >&5
$as_echo "$as_me: WARNING: The development package for SDL_image is not installed.
-@@ -39453,10 +39590,11 @@ pkg_failed=no
+@@ -39779,10 +39608,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREETYPE" >&5
$as_echo_n "checking for FREETYPE... " >&6; }
@@ -6560,7 +9329,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
ac_status=$?
-@@ -39466,13 +39604,15 @@ if test -n "$FREETYPE_CFLAGS"; then
+@@ -39792,13 +39622,15 @@
else
pkg_failed=yes
fi
@@ -6582,7 +9351,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
ac_status=$?
-@@ -39482,15 +39622,14 @@ if test -n "$FREETYPE_LIBS"; then
+@@ -39808,15 +39640,14 @@
else
pkg_failed=yes
fi
@@ -6601,7 +9370,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -39498,13 +39637,15 @@ else
+@@ -39824,31 +39655,31 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -6619,7 +9388,12 @@ Forwarded: not-needed
have_freetype=no
if test "${enable_freetype}" = "yes"; then :
-@@ -39516,8 +39657,6 @@ from http://www.freetype.org/, or config
+
+- as_fn_error $? "I couldn't find the freetype package. You can download libfreetype2
++ as_fn_error "I couldn't find the freetype package. You can download libfreetype2
+ from http://www.freetype.org/, or configure with --disable-freetype. Have a nice day.
+ " "$LINENO" 5
+
fi
elif test $pkg_failed = untried; then
@@ -6628,7 +9402,13 @@ Forwarded: not-needed
have_freetype=no
if test "${enable_freetype}" = "yes"; then :
-@@ -39619,10 +39758,11 @@ pkg_failed=no
+
+- as_fn_error $? "I couldn't find the freetype package. You can download libfreetype2
++ as_fn_error "I couldn't find the freetype package. You can download libfreetype2
+ from http://www.freetype.org/, or configure with --disable-freetype. Have a nice day.
+ " "$LINENO" 5
+
+@@ -39945,10 +39776,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FRIBIDI" >&5
$as_echo_n "checking for FRIBIDI... " >&6; }
@@ -6644,7 +9424,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fribidi\""; } >&5
($PKG_CONFIG --exists --print-errors "fribidi") 2>&5
ac_status=$?
-@@ -39632,13 +39772,15 @@ if test -n "$FRIBIDI_CFLAGS"; then
+@@ -39958,13 +39790,15 @@
else
pkg_failed=yes
fi
@@ -6666,7 +9446,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fribidi\""; } >&5
($PKG_CONFIG --exists --print-errors "fribidi") 2>&5
ac_status=$?
-@@ -39648,15 +39790,14 @@ if test -n "$FRIBIDI_LIBS"; then
+@@ -39974,15 +39808,14 @@
else
pkg_failed=yes
fi
@@ -6685,7 +9465,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -39664,9 +39805,9 @@ else
+@@ -39990,14 +39823,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -6697,7 +9477,13 @@ Forwarded: not-needed
fi
# Put the nasty error message in config.log where it belongs
echo "$FRIBIDI_PKG_ERRORS" >&5
-@@ -39680,10 +39821,9 @@ installed software in a non-standard pre
+
+- as_fn_error $? "Package requirements (fribidi) were not met:
++ as_fn_error "Package requirements (fribidi) were not met:
+
+ $FRIBIDI_PKG_ERRORS
+
+@@ -40006,13 +39839,12 @@
Alternatively, you may set the environment variables FRIBIDI_CFLAGS
and FRIBIDI_LIBS to avoid the need to call pkg-config.
@@ -6709,8 +9495,21 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "The pkg-config script could not be found or is too old. Make sure it
-@@ -39760,10 +39900,11 @@ pkg_failed=no
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -40021,7 +39853,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5 ; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ FRIBIDI_CFLAGS=$pkg_cv_FRIBIDI_CFLAGS
+ FRIBIDI_LIBS=$pkg_cv_FRIBIDI_LIBS
+@@ -40086,10 +39918,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML2" >&5
$as_echo_n "checking for LIBXML2... " >&6; }
@@ -6726,7 +9525,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.5\""; } >&5
($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.5") 2>&5
ac_status=$?
-@@ -39773,13 +39914,15 @@ if test -n "$LIBXML2_CFLAGS"; then
+@@ -40099,13 +39932,15 @@
else
pkg_failed=yes
fi
@@ -6748,7 +9547,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.5\""; } >&5
($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.5") 2>&5
ac_status=$?
-@@ -39789,15 +39932,14 @@ if test -n "$LIBXML2_LIBS"; then
+@@ -40115,15 +39950,14 @@
else
pkg_failed=yes
fi
@@ -6767,7 +9566,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -39805,14 +39947,16 @@ else
+@@ -40131,25 +39965,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -6781,22 +9580,26 @@ Forwarded: not-needed
echo "$LIBXML2_PKG_ERRORS" >&5
- if test x"$enable_libxml2" = "xyes"; then :
+- as_fn_error $? "Library libxml-2.0 >= 2.5 needed for libxml2 was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_libxml2" = "xyes"; then :
- as_fn_error "Library libxml-2.0 >= 2.5 needed for libxml2 was not found" "$LINENO" 5
++ as_fn_error "Library libxml-2.0 >= 2.5 needed for libxml2 was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&5
-@@ -39820,8 +39964,6 @@ $as_echo "$as_me: WARNING: Library libxm
+ $as_echo "$as_me: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_libxml2" = "xyes"; then :
- as_fn_error "Library libxml-2.0 >= 2.5 needed for libxml2 was not found" "$LINENO" 5
+- as_fn_error $? "Library libxml-2.0 >= 2.5 needed for libxml2 was not found" "$LINENO" 5
++ as_fn_error "Library libxml-2.0 >= 2.5 needed for libxml2 was not found" "$LINENO" 5
else
-@@ -39859,10 +40001,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&5
+ $as_echo "$as_me: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&2;}
+@@ -40185,10 +40019,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML2" >&5
$as_echo_n "checking for LIBXML2... " >&6; }
@@ -6812,7 +9615,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.5\""; } >&5
($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.5") 2>&5
ac_status=$?
-@@ -39872,13 +40015,15 @@ if test -n "$LIBXML2_CFLAGS"; then
+@@ -40198,13 +40033,15 @@
else
pkg_failed=yes
fi
@@ -6834,7 +9637,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.5\""; } >&5
($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.5") 2>&5
ac_status=$?
-@@ -39888,15 +40033,14 @@ if test -n "$LIBXML2_LIBS"; then
+@@ -40214,15 +40051,14 @@
else
pkg_failed=yes
fi
@@ -6853,7 +9656,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -39904,14 +40048,16 @@ else
+@@ -40230,27 +40066,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -6871,9 +9674,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_libxml2=no
if test x"$enable_libxml2" = "xyes"; then :
- as_fn_error "Library libxml-2.0 >= 2.5 needed for libxml2 was not found" "$LINENO" 5
+- as_fn_error $? "Library libxml-2.0 >= 2.5 needed for libxml2 was not found" "$LINENO" 5
++ as_fn_error "Library libxml-2.0 >= 2.5 needed for libxml2 was not found" "$LINENO" 5
else
-@@ -39920,8 +40066,6 @@ $as_echo "$as_me: WARNING: Library libxm
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&5
+ $as_echo "$as_me: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -6881,8 +9686,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_libxml2=no
if test x"$enable_libxml2" = "xyes"; then :
- as_fn_error "Library libxml-2.0 >= 2.5 needed for libxml2 was not found" "$LINENO" 5
-@@ -40003,10 +40147,11 @@ pkg_failed=no
+- as_fn_error $? "Library libxml-2.0 >= 2.5 needed for libxml2 was not found" "$LINENO" 5
++ as_fn_error "Library libxml-2.0 >= 2.5 needed for libxml2 was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&5
+ $as_echo "$as_me: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&2;}
+@@ -40329,10 +40165,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVG" >&5
$as_echo_n "checking for SVG... " >&6; }
@@ -6898,7 +9707,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0\""; } >&5
($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.9.0") 2>&5
ac_status=$?
-@@ -40016,13 +40161,15 @@ if test -n "$SVG_CFLAGS"; then
+@@ -40342,13 +40179,15 @@
else
pkg_failed=yes
fi
@@ -6920,7 +9729,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0\""; } >&5
($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.9.0") 2>&5
ac_status=$?
-@@ -40032,15 +40179,14 @@ if test -n "$SVG_LIBS"; then
+@@ -40358,15 +40197,14 @@
else
pkg_failed=yes
fi
@@ -6939,7 +9748,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -40048,14 +40194,16 @@ else
+@@ -40374,25 +40212,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -6953,22 +9762,26 @@ Forwarded: not-needed
echo "$SVG_PKG_ERRORS" >&5
- if test x"$enable_svg" = "xyes"; then :
+- as_fn_error $? "Library librsvg-2.0 >= 2.9.0 needed for svg was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_svg" = "xyes"; then :
- as_fn_error "Library librsvg-2.0 >= 2.9.0 needed for svg was not found" "$LINENO" 5
++ as_fn_error "Library librsvg-2.0 >= 2.9.0 needed for svg was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&5
-@@ -40063,8 +40211,6 @@ $as_echo "$as_me: WARNING: Library librs
+ $as_echo "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_svg" = "xyes"; then :
- as_fn_error "Library librsvg-2.0 >= 2.9.0 needed for svg was not found" "$LINENO" 5
+- as_fn_error $? "Library librsvg-2.0 >= 2.9.0 needed for svg was not found" "$LINENO" 5
++ as_fn_error "Library librsvg-2.0 >= 2.9.0 needed for svg was not found" "$LINENO" 5
else
-@@ -40102,10 +40248,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&5
+ $as_echo "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&2;}
+@@ -40428,10 +40266,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVG" >&5
$as_echo_n "checking for SVG... " >&6; }
@@ -6984,7 +9797,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0\""; } >&5
($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.9.0") 2>&5
ac_status=$?
-@@ -40115,13 +40262,15 @@ if test -n "$SVG_CFLAGS"; then
+@@ -40441,13 +40280,15 @@
else
pkg_failed=yes
fi
@@ -7006,7 +9819,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0\""; } >&5
($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.9.0") 2>&5
ac_status=$?
-@@ -40131,15 +40280,14 @@ if test -n "$SVG_LIBS"; then
+@@ -40457,15 +40298,14 @@
else
pkg_failed=yes
fi
@@ -7025,7 +9838,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -40147,14 +40295,16 @@ else
+@@ -40473,27 +40313,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -7043,9 +9856,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_svg=no
if test x"$enable_svg" = "xyes"; then :
- as_fn_error "Library librsvg-2.0 >= 2.9.0 needed for svg was not found" "$LINENO" 5
+- as_fn_error $? "Library librsvg-2.0 >= 2.9.0 needed for svg was not found" "$LINENO" 5
++ as_fn_error "Library librsvg-2.0 >= 2.9.0 needed for svg was not found" "$LINENO" 5
else
-@@ -40163,8 +40313,6 @@ $as_echo "$as_me: WARNING: Library librs
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&5
+ $as_echo "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -7053,8 +9868,31 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_svg=no
if test x"$enable_svg" = "xyes"; then :
- as_fn_error "Library librsvg-2.0 >= 2.9.0 needed for svg was not found" "$LINENO" 5
-@@ -40769,10 +40917,11 @@ pkg_failed=no
+- as_fn_error $? "Library librsvg-2.0 >= 2.9.0 needed for svg was not found" "$LINENO" 5
++ as_fn_error "Library librsvg-2.0 >= 2.9.0 needed for svg was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&5
+ $as_echo "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&2;}
+@@ -40575,7 +40415,8 @@
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -40663,7 +40504,7 @@
+
+
+ else
+- as_fn_error $? "Cannot find DirectX headers!" "$LINENO" 5
++ as_fn_error "Cannot find DirectX headers!" "$LINENO" 5
+
+ fi
+
+@@ -41094,10 +40935,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIRECTFB" >&5
$as_echo_n "checking for DIRECTFB... " >&6; }
@@ -7070,7 +9908,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb\""; } >&5
($PKG_CONFIG --exists --print-errors "directfb") 2>&5
ac_status=$?
-@@ -40782,13 +40931,15 @@ if test -n "$DIRECTFB_CFLAGS"; then
+@@ -41107,13 +40949,15 @@
else
pkg_failed=yes
fi
@@ -7092,7 +9930,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb\""; } >&5
($PKG_CONFIG --exists --print-errors "directfb") 2>&5
ac_status=$?
-@@ -40798,15 +40949,14 @@ if test -n "$DIRECTFB_LIBS"; then
+@@ -41123,15 +40967,14 @@
else
pkg_failed=yes
fi
@@ -7111,7 +9949,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -40814,17 +40964,17 @@ else
+@@ -41139,17 +40982,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -7134,7 +9972,25 @@ Forwarded: not-needed
have_directfb="false"
else
DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS
-@@ -40991,10 +41141,11 @@ pkg_failed=no
+@@ -41185,7 +41028,7 @@
+
+
+ else
+- as_fn_error $? "cannot find directfb headers and/or libraries " "$LINENO" 5
++ as_fn_error "cannot find directfb headers and/or libraries " "$LINENO" 5
+ fi
+ fi
+
+@@ -41237,7 +41080,7 @@
+
+ else
+
+- as_fn_error $? "LibGGI development files can't be found" "$LINENO" 5
++ as_fn_error "LibGGI development files can't be found" "$LINENO" 5
+
+ fi
+
+@@ -41316,10 +41159,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CACA" >&5
$as_echo_n "checking for CACA... " >&6; }
@@ -7150,7 +10006,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"caca >= 0.99.beta14\""; } >&5
($PKG_CONFIG --exists --print-errors "caca >= 0.99.beta14") 2>&5
ac_status=$?
-@@ -41004,13 +41155,15 @@ if test -n "$CACA_CFLAGS"; then
+@@ -41329,13 +41173,15 @@
else
pkg_failed=yes
fi
@@ -7172,7 +10028,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"caca >= 0.99.beta14\""; } >&5
($PKG_CONFIG --exists --print-errors "caca >= 0.99.beta14") 2>&5
ac_status=$?
-@@ -41020,15 +41173,14 @@ if test -n "$CACA_LIBS"; then
+@@ -41345,15 +41191,14 @@
else
pkg_failed=yes
fi
@@ -7191,7 +10047,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -41036,14 +41188,16 @@ else
+@@ -41361,25 +41206,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -7205,22 +10061,26 @@ Forwarded: not-needed
echo "$CACA_PKG_ERRORS" >&5
- if test x"$enable_caca" = "xyes"; then :
+- as_fn_error $? "Library caca >= 0.99.beta14 needed for caca was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_caca" = "xyes"; then :
- as_fn_error "Library caca >= 0.99.beta14 needed for caca was not found" "$LINENO" 5
++ as_fn_error "Library caca >= 0.99.beta14 needed for caca was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&5
-@@ -41051,8 +41205,6 @@ $as_echo "$as_me: WARNING: Library caca
+ $as_echo "$as_me: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_caca" = "xyes"; then :
- as_fn_error "Library caca >= 0.99.beta14 needed for caca was not found" "$LINENO" 5
+- as_fn_error $? "Library caca >= 0.99.beta14 needed for caca was not found" "$LINENO" 5
++ as_fn_error "Library caca >= 0.99.beta14 needed for caca was not found" "$LINENO" 5
else
-@@ -41090,10 +41242,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&5
+ $as_echo "$as_me: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&2;}
+@@ -41415,10 +41260,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CACA" >&5
$as_echo_n "checking for CACA... " >&6; }
@@ -7236,7 +10096,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"caca >= 0.99.beta14\""; } >&5
($PKG_CONFIG --exists --print-errors "caca >= 0.99.beta14") 2>&5
ac_status=$?
-@@ -41103,13 +41256,15 @@ if test -n "$CACA_CFLAGS"; then
+@@ -41428,13 +41274,15 @@
else
pkg_failed=yes
fi
@@ -7258,7 +10118,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"caca >= 0.99.beta14\""; } >&5
($PKG_CONFIG --exists --print-errors "caca >= 0.99.beta14") 2>&5
ac_status=$?
-@@ -41119,15 +41274,14 @@ if test -n "$CACA_LIBS"; then
+@@ -41444,15 +41292,14 @@
else
pkg_failed=yes
fi
@@ -7277,7 +10137,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -41135,14 +41289,16 @@ else
+@@ -41460,27 +41307,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -7295,9 +10155,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_caca=no
if test x"$enable_caca" = "xyes"; then :
- as_fn_error "Library caca >= 0.99.beta14 needed for caca was not found" "$LINENO" 5
+- as_fn_error $? "Library caca >= 0.99.beta14 needed for caca was not found" "$LINENO" 5
++ as_fn_error "Library caca >= 0.99.beta14 needed for caca was not found" "$LINENO" 5
else
-@@ -41151,8 +41307,6 @@ $as_echo "$as_me: WARNING: Library caca
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&5
+ $as_echo "$as_me: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -7305,8 +10167,31 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_caca=no
if test x"$enable_caca" = "xyes"; then :
- as_fn_error "Library caca >= 0.99.beta14 needed for caca was not found" "$LINENO" 5
-@@ -41328,10 +41482,11 @@ pkg_failed=no
+- as_fn_error $? "Library caca >= 0.99.beta14 needed for caca was not found" "$LINENO" 5
++ as_fn_error "Library caca >= 0.99.beta14 needed for caca was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&5
+ $as_echo "$as_me: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&2;}
+@@ -41545,7 +41392,8 @@
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -41614,7 +41462,7 @@
+
+ if test "${enable_pulse}" = "yes"; then :
+
+- as_fn_error $? "Xlib is required for VLC PulseAudio support
++ as_fn_error "Xlib is required for VLC PulseAudio support
+ (see http://www.pulseaudio.org/ticket/799 for further reference)." "$LINENO" 5
+
+ fi
+@@ -41652,10 +41500,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PULSE" >&5
$as_echo_n "checking for PULSE... " >&6; }
@@ -7322,7 +10207,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= 0.9.11\""; } >&5
($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.11") 2>&5
ac_status=$?
-@@ -41341,13 +41496,15 @@ if test -n "$PULSE_CFLAGS"; then
+@@ -41665,13 +41514,15 @@
else
pkg_failed=yes
fi
@@ -7344,7 +10229,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= 0.9.11\""; } >&5
($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.11") 2>&5
ac_status=$?
-@@ -41357,15 +41514,14 @@ if test -n "$PULSE_LIBS"; then
+@@ -41681,15 +41532,14 @@
else
pkg_failed=yes
fi
@@ -7363,7 +10248,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -41373,14 +41529,16 @@ else
+@@ -41697,25 +41547,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -7377,22 +10262,26 @@ Forwarded: not-needed
echo "$PULSE_PKG_ERRORS" >&5
- if test x"$enable_pulse" = "xyes"; then :
+- as_fn_error $? "Library libpulse >= 0.9.11 needed for pulse was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_pulse" = "xyes"; then :
- as_fn_error "Library libpulse >= 0.9.11 needed for pulse was not found" "$LINENO" 5
++ as_fn_error "Library libpulse >= 0.9.11 needed for pulse was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libpulse >= 0.9.11 needed for pulse was not found" >&5
-@@ -41388,8 +41546,6 @@ $as_echo "$as_me: WARNING: Library libpu
+ $as_echo "$as_me: WARNING: Library libpulse >= 0.9.11 needed for pulse was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_pulse" = "xyes"; then :
- as_fn_error "Library libpulse >= 0.9.11 needed for pulse was not found" "$LINENO" 5
+- as_fn_error $? "Library libpulse >= 0.9.11 needed for pulse was not found" "$LINENO" 5
++ as_fn_error "Library libpulse >= 0.9.11 needed for pulse was not found" "$LINENO" 5
else
-@@ -41427,10 +41583,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libpulse >= 0.9.11 needed for pulse was not found" >&5
+ $as_echo "$as_me: WARNING: Library libpulse >= 0.9.11 needed for pulse was not found" >&2;}
+@@ -41751,10 +41601,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PULSE" >&5
$as_echo_n "checking for PULSE... " >&6; }
@@ -7408,7 +10297,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= 0.9.11\""; } >&5
($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.11") 2>&5
ac_status=$?
-@@ -41440,13 +41597,15 @@ if test -n "$PULSE_CFLAGS"; then
+@@ -41764,13 +41615,15 @@
else
pkg_failed=yes
fi
@@ -7430,7 +10319,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= 0.9.11\""; } >&5
($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.11") 2>&5
ac_status=$?
-@@ -41456,15 +41615,14 @@ if test -n "$PULSE_LIBS"; then
+@@ -41780,15 +41633,14 @@
else
pkg_failed=yes
fi
@@ -7449,7 +10338,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -41472,14 +41630,16 @@ else
+@@ -41796,27 +41648,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -7467,9 +10356,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_pulse=no
if test x"$enable_pulse" = "xyes"; then :
- as_fn_error "Library libpulse >= 0.9.11 needed for pulse was not found" "$LINENO" 5
+- as_fn_error $? "Library libpulse >= 0.9.11 needed for pulse was not found" "$LINENO" 5
++ as_fn_error "Library libpulse >= 0.9.11 needed for pulse was not found" "$LINENO" 5
else
-@@ -41488,8 +41648,6 @@ $as_echo "$as_me: WARNING: Library libpu
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libpulse >= 0.9.11 needed for pulse was not found" >&5
+ $as_echo "$as_me: WARNING: Library libpulse >= 0.9.11 needed for pulse was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -7477,8 +10368,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_pulse=no
if test x"$enable_pulse" = "xyes"; then :
- as_fn_error "Library libpulse >= 0.9.11 needed for pulse was not found" "$LINENO" 5
-@@ -41579,10 +41737,11 @@ pkg_failed=no
+- as_fn_error $? "Library libpulse >= 0.9.11 needed for pulse was not found" "$LINENO" 5
++ as_fn_error "Library libpulse >= 0.9.11 needed for pulse was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libpulse >= 0.9.11 needed for pulse was not found" >&5
+ $as_echo "$as_me: WARNING: Library libpulse >= 0.9.11 needed for pulse was not found" >&2;}
+@@ -41903,10 +41755,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PORTAUDIO" >&5
$as_echo_n "checking for PORTAUDIO... " >&6; }
@@ -7494,7 +10389,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "portaudio-2.0") 2>&5
ac_status=$?
-@@ -41592,13 +41751,15 @@ if test -n "$PORTAUDIO_CFLAGS"; then
+@@ -41916,13 +41769,15 @@
else
pkg_failed=yes
fi
@@ -7516,7 +10411,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "portaudio-2.0") 2>&5
ac_status=$?
-@@ -41608,15 +41769,14 @@ if test -n "$PORTAUDIO_LIBS"; then
+@@ -41932,15 +41787,14 @@
else
pkg_failed=yes
fi
@@ -7535,7 +10430,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -41624,14 +41784,16 @@ else
+@@ -41948,25 +41802,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -7549,22 +10444,26 @@ Forwarded: not-needed
echo "$PORTAUDIO_PKG_ERRORS" >&5
- if test x"$enable_portaudio" = "xyes"; then :
+- as_fn_error $? "Library portaudio-2.0 needed for portaudio was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_portaudio" = "xyes"; then :
- as_fn_error "Library portaudio-2.0 needed for portaudio was not found" "$LINENO" 5
++ as_fn_error "Library portaudio-2.0 needed for portaudio was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library portaudio-2.0 needed for portaudio was not found" >&5
-@@ -41639,8 +41801,6 @@ $as_echo "$as_me: WARNING: Library porta
+ $as_echo "$as_me: WARNING: Library portaudio-2.0 needed for portaudio was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_portaudio" = "xyes"; then :
- as_fn_error "Library portaudio-2.0 needed for portaudio was not found" "$LINENO" 5
+- as_fn_error $? "Library portaudio-2.0 needed for portaudio was not found" "$LINENO" 5
++ as_fn_error "Library portaudio-2.0 needed for portaudio was not found" "$LINENO" 5
else
-@@ -41678,10 +41838,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library portaudio-2.0 needed for portaudio was not found" >&5
+ $as_echo "$as_me: WARNING: Library portaudio-2.0 needed for portaudio was not found" >&2;}
+@@ -42002,10 +41856,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PORTAUDIO" >&5
$as_echo_n "checking for PORTAUDIO... " >&6; }
@@ -7580,7 +10479,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "portaudio-2.0") 2>&5
ac_status=$?
-@@ -41691,13 +41852,15 @@ if test -n "$PORTAUDIO_CFLAGS"; then
+@@ -42015,13 +41870,15 @@
else
pkg_failed=yes
fi
@@ -7602,7 +10501,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "portaudio-2.0") 2>&5
ac_status=$?
-@@ -41707,15 +41870,14 @@ if test -n "$PORTAUDIO_LIBS"; then
+@@ -42031,15 +41888,14 @@
else
pkg_failed=yes
fi
@@ -7621,7 +10520,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -41723,14 +41885,16 @@ else
+@@ -42047,27 +41903,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -7639,9 +10538,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_portaudio=no
if test x"$enable_portaudio" = "xyes"; then :
- as_fn_error "Library portaudio-2.0 needed for portaudio was not found" "$LINENO" 5
+- as_fn_error $? "Library portaudio-2.0 needed for portaudio was not found" "$LINENO" 5
++ as_fn_error "Library portaudio-2.0 needed for portaudio was not found" "$LINENO" 5
else
-@@ -41739,8 +41903,6 @@ $as_echo "$as_me: WARNING: Library porta
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library portaudio-2.0 needed for portaudio was not found" >&5
+ $as_echo "$as_me: WARNING: Library portaudio-2.0 needed for portaudio was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -7649,8 +10550,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_portaudio=no
if test x"$enable_portaudio" = "xyes"; then :
- as_fn_error "Library portaudio-2.0 needed for portaudio was not found" "$LINENO" 5
-@@ -41822,10 +41984,11 @@ pkg_failed=no
+- as_fn_error $? "Library portaudio-2.0 needed for portaudio was not found" "$LINENO" 5
++ as_fn_error "Library portaudio-2.0 needed for portaudio was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library portaudio-2.0 needed for portaudio was not found" >&5
+ $as_echo "$as_me: WARNING: Library portaudio-2.0 needed for portaudio was not found" >&2;}
+@@ -42146,10 +42002,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
$as_echo_n "checking for ALSA... " >&6; }
@@ -7666,7 +10571,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.0\""; } >&5
($PKG_CONFIG --exists --print-errors "alsa >= 1.0.0") 2>&5
ac_status=$?
-@@ -41835,13 +41998,15 @@ if test -n "$ALSA_CFLAGS"; then
+@@ -42159,13 +42016,15 @@
else
pkg_failed=yes
fi
@@ -7688,7 +10593,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.0\""; } >&5
($PKG_CONFIG --exists --print-errors "alsa >= 1.0.0") 2>&5
ac_status=$?
-@@ -41851,15 +42016,14 @@ if test -n "$ALSA_LIBS"; then
+@@ -42175,15 +42034,14 @@
else
pkg_failed=yes
fi
@@ -7707,7 +10612,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -41867,14 +42031,16 @@ else
+@@ -42191,25 +42049,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -7721,22 +10626,26 @@ Forwarded: not-needed
echo "$ALSA_PKG_ERRORS" >&5
- if test x"$enable_alsa" = "xyes"; then :
+- as_fn_error $? "Library alsa >= 1.0.0 needed for alsa was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_alsa" = "xyes"; then :
- as_fn_error "Library alsa >= 1.0.0 needed for alsa was not found" "$LINENO" 5
++ as_fn_error "Library alsa >= 1.0.0 needed for alsa was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library alsa >= 1.0.0 needed for alsa was not found" >&5
-@@ -41882,8 +42048,6 @@ $as_echo "$as_me: WARNING: Library alsa
+ $as_echo "$as_me: WARNING: Library alsa >= 1.0.0 needed for alsa was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_alsa" = "xyes"; then :
- as_fn_error "Library alsa >= 1.0.0 needed for alsa was not found" "$LINENO" 5
+- as_fn_error $? "Library alsa >= 1.0.0 needed for alsa was not found" "$LINENO" 5
++ as_fn_error "Library alsa >= 1.0.0 needed for alsa was not found" "$LINENO" 5
else
-@@ -41931,10 +42095,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library alsa >= 1.0.0 needed for alsa was not found" >&5
+ $as_echo "$as_me: WARNING: Library alsa >= 1.0.0 needed for alsa was not found" >&2;}
+@@ -42255,10 +42113,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
$as_echo_n "checking for ALSA... " >&6; }
@@ -7752,7 +10661,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.0\""; } >&5
($PKG_CONFIG --exists --print-errors "alsa >= 1.0.0") 2>&5
ac_status=$?
-@@ -41944,13 +42109,15 @@ if test -n "$ALSA_CFLAGS"; then
+@@ -42268,13 +42127,15 @@
else
pkg_failed=yes
fi
@@ -7774,7 +10683,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.0\""; } >&5
($PKG_CONFIG --exists --print-errors "alsa >= 1.0.0") 2>&5
ac_status=$?
-@@ -41960,15 +42127,14 @@ if test -n "$ALSA_LIBS"; then
+@@ -42284,15 +42145,14 @@
else
pkg_failed=yes
fi
@@ -7793,7 +10702,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -41976,14 +42142,16 @@ else
+@@ -42300,27 +42160,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -7811,9 +10720,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_alsa=no
if test x"$enable_alsa" = "xyes"; then :
- as_fn_error "Library alsa >= 1.0.0 needed for alsa was not found" "$LINENO" 5
+- as_fn_error $? "Library alsa >= 1.0.0 needed for alsa was not found" "$LINENO" 5
++ as_fn_error "Library alsa >= 1.0.0 needed for alsa was not found" "$LINENO" 5
else
-@@ -41992,8 +42160,6 @@ $as_echo "$as_me: WARNING: Library alsa
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library alsa >= 1.0.0 needed for alsa was not found" >&5
+ $as_echo "$as_me: WARNING: Library alsa >= 1.0.0 needed for alsa was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -7821,8 +10732,21 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_alsa=no
if test x"$enable_alsa" = "xyes"; then :
- as_fn_error "Library alsa >= 1.0.0 needed for alsa was not found" "$LINENO" 5
-@@ -42235,10 +42401,11 @@ pkg_failed=no
+- as_fn_error $? "Library alsa >= 1.0.0 needed for alsa was not found" "$LINENO" 5
++ as_fn_error "Library alsa >= 1.0.0 needed for alsa was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library alsa >= 1.0.0 needed for alsa was not found" >&5
+ $as_echo "$as_me: WARNING: Library alsa >= 1.0.0 needed for alsa was not found" >&2;}
+@@ -42440,7 +42300,7 @@
+
+
+ else
+- as_fn_error $? "cannot find CoreAudio headers" "$LINENO" 5
++ as_fn_error "cannot find CoreAudio headers" "$LINENO" 5
+ fi
+
+ done
+@@ -42559,10 +42419,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
$as_echo_n "checking for JACK... " >&6; }
@@ -7838,7 +10762,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack\""; } >&5
($PKG_CONFIG --exists --print-errors "jack") 2>&5
ac_status=$?
-@@ -42248,13 +42415,15 @@ if test -n "$JACK_CFLAGS"; then
+@@ -42572,13 +42433,15 @@
else
pkg_failed=yes
fi
@@ -7860,7 +10784,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack\""; } >&5
($PKG_CONFIG --exists --print-errors "jack") 2>&5
ac_status=$?
-@@ -42264,15 +42433,14 @@ if test -n "$JACK_LIBS"; then
+@@ -42588,15 +42451,14 @@
else
pkg_failed=yes
fi
@@ -7879,7 +10803,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -42280,14 +42448,16 @@ else
+@@ -42604,25 +42466,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -7893,22 +10817,26 @@ Forwarded: not-needed
echo "$JACK_PKG_ERRORS" >&5
- if test x"$enable_jack" = "xyes"; then :
+- as_fn_error $? "Library jack needed for jack was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_jack" = "xyes"; then :
- as_fn_error "Library jack needed for jack was not found" "$LINENO" 5
++ as_fn_error "Library jack needed for jack was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library jack needed for jack was not found" >&5
-@@ -42295,8 +42465,6 @@ $as_echo "$as_me: WARNING: Library jack
+ $as_echo "$as_me: WARNING: Library jack needed for jack was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_jack" = "xyes"; then :
- as_fn_error "Library jack needed for jack was not found" "$LINENO" 5
+- as_fn_error $? "Library jack needed for jack was not found" "$LINENO" 5
++ as_fn_error "Library jack needed for jack was not found" "$LINENO" 5
else
-@@ -42344,10 +42512,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library jack needed for jack was not found" >&5
+ $as_echo "$as_me: WARNING: Library jack needed for jack was not found" >&2;}
+@@ -42668,10 +42530,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
$as_echo_n "checking for JACK... " >&6; }
@@ -7924,7 +10852,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack\""; } >&5
($PKG_CONFIG --exists --print-errors "jack") 2>&5
ac_status=$?
-@@ -42357,13 +42526,15 @@ if test -n "$JACK_CFLAGS"; then
+@@ -42681,13 +42544,15 @@
else
pkg_failed=yes
fi
@@ -7946,7 +10874,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack\""; } >&5
($PKG_CONFIG --exists --print-errors "jack") 2>&5
ac_status=$?
-@@ -42373,15 +42544,14 @@ if test -n "$JACK_LIBS"; then
+@@ -42697,15 +42562,14 @@
else
pkg_failed=yes
fi
@@ -7965,7 +10893,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -42389,14 +42559,16 @@ else
+@@ -42713,27 +42577,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -7983,9 +10911,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_jack=no
if test x"$enable_jack" = "xyes"; then :
- as_fn_error "Library jack needed for jack was not found" "$LINENO" 5
+- as_fn_error $? "Library jack needed for jack was not found" "$LINENO" 5
++ as_fn_error "Library jack needed for jack was not found" "$LINENO" 5
else
-@@ -42405,8 +42577,6 @@ $as_echo "$as_me: WARNING: Library jack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library jack needed for jack was not found" >&5
+ $as_echo "$as_me: WARNING: Library jack needed for jack was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -7993,8 +10923,50 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_jack=no
if test x"$enable_jack" = "xyes"; then :
- as_fn_error "Library jack needed for jack was not found" "$LINENO" 5
-@@ -42642,10 +42812,11 @@ pkg_failed=no
+- as_fn_error $? "Library jack needed for jack was not found" "$LINENO" 5
++ as_fn_error "Library jack needed for jack was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library jack needed for jack was not found" >&5
+ $as_echo "$as_me: WARNING: Library jack needed for jack was not found" >&2;}
+@@ -42819,7 +42683,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "cannot cd to ${with_cyberlink_tree}" "$LINENO" 5
++ as_fn_error "cannot cd to ${with_cyberlink_tree}" "$LINENO" 5
+
+ fi
+ CPPFLAGS_save="${CPPFLAGS}"
+@@ -42848,7 +42712,7 @@
+
+ else
+
+- as_fn_error $? "cannot find CyberLink for C++ headers" "$LINENO" 5
++ as_fn_error "cannot find CyberLink for C++ headers" "$LINENO" 5
+
+ fi
+
+@@ -42904,8 +42768,8 @@
+ if test "${LIBS_cclink}" = "no"; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot find XML parser for CyberLink
+-See \`config.log' for more details" "$LINENO" 5 ; }
++as_fn_error "cannot find XML parser for CyberLink
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LIBS_cclink}" >&5
+ $as_echo "${LIBS_cclink}" >&6; }
+@@ -42920,7 +42784,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "cannot find ${real_cyberlink_tree}/lib/unix/libclink.a, make sure you compiled CyberLink for C++ in ${with_cyberlink_tree}" "$LINENO" 5
++ as_fn_error "cannot find ${real_cyberlink_tree}/lib/unix/libclink.a, make sure you compiled CyberLink for C++ in ${with_cyberlink_tree}" "$LINENO" 5
+
+ fi
+ CPPFLAGS="${CPPFLAGS_save}"
+@@ -42966,10 +42830,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UPNP" >&5
$as_echo_n "checking for UPNP... " >&6; }
@@ -8010,7 +10982,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libupnp\""; } >&5
($PKG_CONFIG --exists --print-errors "libupnp") 2>&5
ac_status=$?
-@@ -42655,13 +42826,15 @@ if test -n "$UPNP_CFLAGS"; then
+@@ -42979,13 +42844,15 @@
else
pkg_failed=yes
fi
@@ -8032,7 +11004,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libupnp\""; } >&5
($PKG_CONFIG --exists --print-errors "libupnp") 2>&5
ac_status=$?
-@@ -42671,15 +42844,14 @@ if test -n "$UPNP_LIBS"; then
+@@ -42995,15 +42862,14 @@
else
pkg_failed=yes
fi
@@ -8051,7 +11023,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -42687,14 +42859,16 @@ else
+@@ -43011,25 +42877,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -8065,22 +11037,26 @@ Forwarded: not-needed
echo "$UPNP_PKG_ERRORS" >&5
- if test x"$enable_upnp" = "xyes"; then :
+- as_fn_error $? "Library libupnp needed for upnp was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_upnp" = "xyes"; then :
- as_fn_error "Library libupnp needed for upnp was not found" "$LINENO" 5
++ as_fn_error "Library libupnp needed for upnp was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libupnp needed for upnp was not found" >&5
-@@ -42702,8 +42876,6 @@ $as_echo "$as_me: WARNING: Library libup
+ $as_echo "$as_me: WARNING: Library libupnp needed for upnp was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_upnp" = "xyes"; then :
- as_fn_error "Library libupnp needed for upnp was not found" "$LINENO" 5
+- as_fn_error $? "Library libupnp needed for upnp was not found" "$LINENO" 5
++ as_fn_error "Library libupnp needed for upnp was not found" "$LINENO" 5
else
-@@ -42741,10 +42913,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libupnp needed for upnp was not found" >&5
+ $as_echo "$as_me: WARNING: Library libupnp needed for upnp was not found" >&2;}
+@@ -43065,10 +42931,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UPNP" >&5
$as_echo_n "checking for UPNP... " >&6; }
@@ -8096,7 +11072,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libupnp\""; } >&5
($PKG_CONFIG --exists --print-errors "libupnp") 2>&5
ac_status=$?
-@@ -42754,13 +42927,15 @@ if test -n "$UPNP_CFLAGS"; then
+@@ -43078,13 +42945,15 @@
else
pkg_failed=yes
fi
@@ -8118,7 +11094,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libupnp\""; } >&5
($PKG_CONFIG --exists --print-errors "libupnp") 2>&5
ac_status=$?
-@@ -42770,15 +42945,14 @@ if test -n "$UPNP_LIBS"; then
+@@ -43094,15 +42963,14 @@
else
pkg_failed=yes
fi
@@ -8137,7 +11113,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -42786,14 +42960,16 @@ else
+@@ -43110,27 +42978,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -8155,9 +11131,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_upnp=no
if test x"$enable_upnp" = "xyes"; then :
- as_fn_error "Library libupnp needed for upnp was not found" "$LINENO" 5
+- as_fn_error $? "Library libupnp needed for upnp was not found" "$LINENO" 5
++ as_fn_error "Library libupnp needed for upnp was not found" "$LINENO" 5
else
-@@ -42802,8 +42978,6 @@ $as_echo "$as_me: WARNING: Library libup
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libupnp needed for upnp was not found" >&5
+ $as_echo "$as_me: WARNING: Library libupnp needed for upnp was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -8165,8 +11143,21 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_upnp=no
if test x"$enable_upnp" = "xyes"; then :
- as_fn_error "Library libupnp needed for upnp was not found" "$LINENO" 5
-@@ -42985,10 +43159,11 @@ pkg_failed=no
+- as_fn_error $? "Library libupnp needed for upnp was not found" "$LINENO" 5
++ as_fn_error "Library libupnp needed for upnp was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libupnp needed for upnp was not found" >&5
+ $as_echo "$as_me: WARNING: Library libupnp needed for upnp was not found" >&2;}
+@@ -43196,7 +43064,7 @@
+ if test "${have_freetype}" != "yes"; then
+ skins2_missing_lib="yes"
+ if test "${enable_skins2}" = "yes"; then
+- as_fn_error $? "Could not find freetype (required for skins2)" "$LINENO" 5
++ as_fn_error "Could not find freetype (required for skins2)" "$LINENO" 5
+ fi
+ fi
+
+@@ -43309,10 +43177,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HILDON" >&5
$as_echo_n "checking for HILDON... " >&6; }
@@ -8182,7 +11173,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-1\""; } >&5
($PKG_CONFIG --exists --print-errors "hildon-1") 2>&5
ac_status=$?
-@@ -42998,13 +43173,15 @@ if test -n "$HILDON_CFLAGS"; then
+@@ -43322,13 +43191,15 @@
else
pkg_failed=yes
fi
@@ -8204,7 +11195,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-1\""; } >&5
($PKG_CONFIG --exists --print-errors "hildon-1") 2>&5
ac_status=$?
-@@ -43014,15 +43191,14 @@ if test -n "$HILDON_LIBS"; then
+@@ -43338,15 +43209,14 @@
else
pkg_failed=yes
fi
@@ -8223,7 +11214,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -43030,13 +43206,15 @@ else
+@@ -43354,28 +43224,28 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -8241,7 +11232,10 @@ Forwarded: not-needed
if test "${enable_hildon}" = "yes"; then :
-@@ -43046,8 +43224,6 @@ fi
+- as_fn_error $? "Hildon libraries not found" "$LINENO" 5
++ as_fn_error "Hildon libraries not found" "$LINENO" 5
+
+ fi
enable_hildon="no"
elif test $pkg_failed = untried; then
@@ -8250,7 +11244,12 @@ Forwarded: not-needed
if test "${enable_hildon}" = "yes"; then :
-@@ -43067,10 +43243,11 @@ pkg_failed=no
+- as_fn_error $? "Hildon libraries not found" "$LINENO" 5
++ as_fn_error "Hildon libraries not found" "$LINENO" 5
+
+ fi
+ enable_hildon="no"
+@@ -43391,10 +43261,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HILDON_FM" >&5
$as_echo_n "checking for HILDON_FM... " >&6; }
@@ -8266,7 +11265,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-fm-2\""; } >&5
($PKG_CONFIG --exists --print-errors "hildon-fm-2") 2>&5
ac_status=$?
-@@ -43080,13 +43257,15 @@ if test -n "$HILDON_FM_CFLAGS"; then
+@@ -43404,13 +43275,15 @@
else
pkg_failed=yes
fi
@@ -8288,7 +11287,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-fm-2\""; } >&5
($PKG_CONFIG --exists --print-errors "hildon-fm-2") 2>&5
ac_status=$?
-@@ -43096,15 +43275,14 @@ if test -n "$HILDON_FM_LIBS"; then
+@@ -43420,15 +43293,14 @@
else
pkg_failed=yes
fi
@@ -8307,7 +11306,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -43112,20 +43290,20 @@ else
+@@ -43436,20 +43308,20 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -8332,7 +11331,7 @@ Forwarded: not-needed
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: hildon-fm-2 not found" >&5
$as_echo "$as_me: WARNING: hildon-fm-2 not found" >&2;}
-@@ -43202,10 +43380,11 @@ pkg_failed=no
+@@ -43526,10 +43398,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT4" >&5
$as_echo_n "checking for QT4... " >&6; }
@@ -8348,7 +11347,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore QtGui >= 4.4.0\""; } >&5
($PKG_CONFIG --exists --print-errors "QtCore QtGui >= 4.4.0") 2>&5
ac_status=$?
-@@ -43215,13 +43394,15 @@ if test -n "$QT4_CFLAGS"; then
+@@ -43539,13 +43412,15 @@
else
pkg_failed=yes
fi
@@ -8370,7 +11369,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore QtGui >= 4.4.0\""; } >&5
($PKG_CONFIG --exists --print-errors "QtCore QtGui >= 4.4.0") 2>&5
ac_status=$?
-@@ -43231,15 +43412,14 @@ if test -n "$QT4_LIBS"; then
+@@ -43555,15 +43430,14 @@
else
pkg_failed=yes
fi
@@ -8389,7 +11388,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -43247,13 +43427,15 @@ else
+@@ -43571,17 +43445,19 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -8407,7 +11406,12 @@ Forwarded: not-needed
if test "${enable_qt4}" = "yes"; then :
-@@ -43268,8 +43450,6 @@ fi
+- as_fn_error $? "Qt 4 library not found" "$LINENO" 5
++ as_fn_error "Qt 4 library not found" "$LINENO" 5
+
+ else
+
+@@ -43592,12 +43468,10 @@
enable_qt4="no"
elif test $pkg_failed = untried; then
@@ -8416,7 +11420,57 @@ Forwarded: not-needed
if test "${enable_qt4}" = "yes"; then :
-@@ -44258,10 +44438,11 @@ pkg_failed=no
+- as_fn_error $? "Qt 4 library not found" "$LINENO" 5
++ as_fn_error "Qt 4 library not found" "$LINENO" 5
+
+ else
+
+@@ -43803,7 +43677,7 @@
+
+ if test "${enable_skins2}" != "no" && test "x$enable_qt4" = "xno"; then :
+
+- as_fn_error $? "The skins2 module depends on a the Qt4 development package. Without it you won't be able to open any dialog box from the interface, which makes the skins2 interface rather useless. Install the Qt4 development package or alternatively you can also configure with: --disable-qt4 --disable-skins2." "$LINENO" 5
++ as_fn_error "The skins2 module depends on a the Qt4 development package. Without it you won't be able to open any dialog box from the interface, which makes the skins2 interface rather useless. Install the Qt4 development package or alternatively you can also configure with: --disable-qt4 --disable-skins2." "$LINENO" 5
+
+ fi
+
+@@ -44243,7 +44117,7 @@
+
+ else
+ if test "x${enable_ncurses}" != "x"; then :
+- as_fn_error $? "tgetent not found in ncursesw tinfow tinfo
++ as_fn_error "tgetent not found in ncursesw tinfow tinfo
+ " "$LINENO" 5
+ fi
+ fi
+@@ -44397,7 +44271,7 @@
+
+ else
+ if test "x${enable_ncurses}" != "x"; then :
+- as_fn_error $? "tgetent not found in ncurses tinfo" "$LINENO" 5
++ as_fn_error "tgetent not found in ncurses tinfo" "$LINENO" 5
+ fi
+
+ fi
+@@ -44408,7 +44282,7 @@
+ else
+ if test "x${enable_ncurses}" != "x"; then :
+
+- as_fn_error $? "libncurses not found" "$LINENO" 5
++ as_fn_error "libncurses not found" "$LINENO" 5
+ fi
+
+ fi
+@@ -44531,7 +44405,7 @@
+
+ if test "$need_xid_provider" = "yes"; then :
+
+- as_fn_error $? "X11 video outputs need a window provider (Qt4, Skins2, Hildon or xcb-utils), but none were found. Please install xcb-keysyms." "$LINENO" 5
++ as_fn_error "X11 video outputs need a window provider (Qt4, Skins2, Hildon or xcb-utils), but none were found. Please install xcb-keysyms." "$LINENO" 5
+
+ fi
+
+@@ -44582,10 +44456,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOOM" >&5
$as_echo_n "checking for GOOM... " >&6; }
@@ -8432,7 +11486,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgoom2\""; } >&5
($PKG_CONFIG --exists --print-errors "libgoom2") 2>&5
ac_status=$?
-@@ -44271,13 +44452,15 @@ if test -n "$GOOM_CFLAGS"; then
+@@ -44595,13 +44470,15 @@
else
pkg_failed=yes
fi
@@ -8454,7 +11508,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgoom2\""; } >&5
($PKG_CONFIG --exists --print-errors "libgoom2") 2>&5
ac_status=$?
-@@ -44287,15 +44470,14 @@ if test -n "$GOOM_LIBS"; then
+@@ -44611,15 +44488,14 @@
else
pkg_failed=yes
fi
@@ -8473,7 +11527,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -44303,14 +44485,16 @@ else
+@@ -44627,25 +44503,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -8487,22 +11541,26 @@ Forwarded: not-needed
echo "$GOOM_PKG_ERRORS" >&5
- if test x"$enable_goom" = "xyes"; then :
+- as_fn_error $? "Library libgoom2 needed for goom was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_goom" = "xyes"; then :
- as_fn_error "Library libgoom2 needed for goom was not found" "$LINENO" 5
++ as_fn_error "Library libgoom2 needed for goom was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libgoom2 needed for goom was not found" >&5
-@@ -44318,8 +44502,6 @@ $as_echo "$as_me: WARNING: Library libgo
+ $as_echo "$as_me: WARNING: Library libgoom2 needed for goom was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_goom" = "xyes"; then :
- as_fn_error "Library libgoom2 needed for goom was not found" "$LINENO" 5
+- as_fn_error $? "Library libgoom2 needed for goom was not found" "$LINENO" 5
++ as_fn_error "Library libgoom2 needed for goom was not found" "$LINENO" 5
else
-@@ -44357,10 +44539,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libgoom2 needed for goom was not found" >&5
+ $as_echo "$as_me: WARNING: Library libgoom2 needed for goom was not found" >&2;}
+@@ -44681,10 +44557,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOOM" >&5
$as_echo_n "checking for GOOM... " >&6; }
@@ -8518,7 +11576,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgoom2\""; } >&5
($PKG_CONFIG --exists --print-errors "libgoom2") 2>&5
ac_status=$?
-@@ -44370,13 +44553,15 @@ if test -n "$GOOM_CFLAGS"; then
+@@ -44694,13 +44571,15 @@
else
pkg_failed=yes
fi
@@ -8540,7 +11598,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgoom2\""; } >&5
($PKG_CONFIG --exists --print-errors "libgoom2") 2>&5
ac_status=$?
-@@ -44386,15 +44571,14 @@ if test -n "$GOOM_LIBS"; then
+@@ -44710,15 +44589,14 @@
else
pkg_failed=yes
fi
@@ -8559,7 +11617,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -44402,14 +44586,16 @@ else
+@@ -44726,27 +44604,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -8577,9 +11635,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_goom=no
if test x"$enable_goom" = "xyes"; then :
- as_fn_error "Library libgoom2 needed for goom was not found" "$LINENO" 5
+- as_fn_error $? "Library libgoom2 needed for goom was not found" "$LINENO" 5
++ as_fn_error "Library libgoom2 needed for goom was not found" "$LINENO" 5
else
-@@ -44418,8 +44604,6 @@ $as_echo "$as_me: WARNING: Library libgo
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libgoom2 needed for goom was not found" >&5
+ $as_echo "$as_me: WARNING: Library libgoom2 needed for goom was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -8587,8 +11647,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_goom=no
if test x"$enable_goom" = "xyes"; then :
- as_fn_error "Library libgoom2 needed for goom was not found" "$LINENO" 5
-@@ -44482,10 +44666,11 @@ pkg_failed=no
+- as_fn_error $? "Library libgoom2 needed for goom was not found" "$LINENO" 5
++ as_fn_error "Library libgoom2 needed for goom was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libgoom2 needed for goom was not found" >&5
+ $as_echo "$as_me: WARNING: Library libgoom2 needed for goom was not found" >&2;}
+@@ -44806,10 +44684,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PROJECTM" >&5
$as_echo_n "checking for PROJECTM... " >&6; }
@@ -8604,7 +11668,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprojectM\""; } >&5
($PKG_CONFIG --exists --print-errors "libprojectM") 2>&5
ac_status=$?
-@@ -44495,13 +44680,15 @@ if test -n "$PROJECTM_CFLAGS"; then
+@@ -44819,13 +44698,15 @@
else
pkg_failed=yes
fi
@@ -8626,7 +11690,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprojectM\""; } >&5
($PKG_CONFIG --exists --print-errors "libprojectM") 2>&5
ac_status=$?
-@@ -44511,15 +44698,14 @@ if test -n "$PROJECTM_LIBS"; then
+@@ -44835,15 +44716,14 @@
else
pkg_failed=yes
fi
@@ -8645,7 +11709,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -44527,20 +44713,20 @@ else
+@@ -44851,20 +44731,20 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -8670,7 +11734,7 @@ Forwarded: not-needed
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libprojectM library not found" >&5
$as_echo "$as_me: WARNING: libprojectM library not found" >&2;}
-@@ -44575,10 +44761,11 @@ pkg_failed=no
+@@ -44899,10 +44779,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PROJECTM2" >&5
$as_echo_n "checking for PROJECTM2... " >&6; }
@@ -8686,7 +11750,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprojectM >= 2.0.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libprojectM >= 2.0.0") 2>&5
ac_status=$?
-@@ -44588,13 +44775,15 @@ if test -n "$PROJECTM2_CFLAGS"; then
+@@ -44912,13 +44793,15 @@
else
pkg_failed=yes
fi
@@ -8708,7 +11772,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprojectM >= 2.0.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libprojectM >= 2.0.0") 2>&5
ac_status=$?
-@@ -44604,15 +44793,14 @@ if test -n "$PROJECTM2_LIBS"; then
+@@ -44928,15 +44811,14 @@
else
pkg_failed=yes
fi
@@ -8727,7 +11791,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -44620,19 +44808,19 @@ else
+@@ -44944,19 +44826,19 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -8752,7 +11816,7 @@ Forwarded: not-needed
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using libprojectM version 1 " >&5
$as_echo "$as_me: WARNING: Using libprojectM version 1 " >&2;}
-@@ -44716,10 +44904,11 @@ pkg_failed=no
+@@ -45040,10 +44922,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BONJOUR" >&5
$as_echo_n "checking for BONJOUR... " >&6; }
@@ -8768,7 +11832,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6\""; } >&5
($PKG_CONFIG --exists --print-errors "avahi-client >= 0.6") 2>&5
ac_status=$?
-@@ -44729,13 +44918,15 @@ if test -n "$BONJOUR_CFLAGS"; then
+@@ -45053,13 +44936,15 @@
else
pkg_failed=yes
fi
@@ -8790,7 +11854,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6\""; } >&5
($PKG_CONFIG --exists --print-errors "avahi-client >= 0.6") 2>&5
ac_status=$?
-@@ -44745,15 +44936,14 @@ if test -n "$BONJOUR_LIBS"; then
+@@ -45069,15 +44954,14 @@
else
pkg_failed=yes
fi
@@ -8809,7 +11873,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -44761,14 +44951,16 @@ else
+@@ -45085,25 +44969,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -8823,22 +11887,26 @@ Forwarded: not-needed
echo "$BONJOUR_PKG_ERRORS" >&5
- if test x"$enable_bonjour" = "xyes"; then :
+- as_fn_error $? "Library avahi-client >= 0.6 needed for bonjour was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_bonjour" = "xyes"; then :
- as_fn_error "Library avahi-client >= 0.6 needed for bonjour was not found" "$LINENO" 5
++ as_fn_error "Library avahi-client >= 0.6 needed for bonjour was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library avahi-client >= 0.6 needed for bonjour was not found" >&5
-@@ -44776,8 +44968,6 @@ $as_echo "$as_me: WARNING: Library avahi
+ $as_echo "$as_me: WARNING: Library avahi-client >= 0.6 needed for bonjour was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_bonjour" = "xyes"; then :
- as_fn_error "Library avahi-client >= 0.6 needed for bonjour was not found" "$LINENO" 5
+- as_fn_error $? "Library avahi-client >= 0.6 needed for bonjour was not found" "$LINENO" 5
++ as_fn_error "Library avahi-client >= 0.6 needed for bonjour was not found" "$LINENO" 5
else
-@@ -44815,10 +45005,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library avahi-client >= 0.6 needed for bonjour was not found" >&5
+ $as_echo "$as_me: WARNING: Library avahi-client >= 0.6 needed for bonjour was not found" >&2;}
+@@ -45139,10 +45023,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BONJOUR" >&5
$as_echo_n "checking for BONJOUR... " >&6; }
@@ -8854,7 +11922,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6\""; } >&5
($PKG_CONFIG --exists --print-errors "avahi-client >= 0.6") 2>&5
ac_status=$?
-@@ -44828,13 +45019,15 @@ if test -n "$BONJOUR_CFLAGS"; then
+@@ -45152,13 +45037,15 @@
else
pkg_failed=yes
fi
@@ -8876,7 +11944,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6\""; } >&5
($PKG_CONFIG --exists --print-errors "avahi-client >= 0.6") 2>&5
ac_status=$?
-@@ -44844,15 +45037,14 @@ if test -n "$BONJOUR_LIBS"; then
+@@ -45168,15 +45055,14 @@
else
pkg_failed=yes
fi
@@ -8895,7 +11963,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -44860,14 +45052,16 @@ else
+@@ -45184,27 +45070,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -8913,9 +11981,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_bonjour=no
if test x"$enable_bonjour" = "xyes"; then :
- as_fn_error "Library avahi-client >= 0.6 needed for bonjour was not found" "$LINENO" 5
+- as_fn_error $? "Library avahi-client >= 0.6 needed for bonjour was not found" "$LINENO" 5
++ as_fn_error "Library avahi-client >= 0.6 needed for bonjour was not found" "$LINENO" 5
else
-@@ -44876,8 +45070,6 @@ $as_echo "$as_me: WARNING: Library avahi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library avahi-client >= 0.6 needed for bonjour was not found" >&5
+ $as_echo "$as_me: WARNING: Library avahi-client >= 0.6 needed for bonjour was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -8923,8 +11993,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_bonjour=no
if test x"$enable_bonjour" = "xyes"; then :
- as_fn_error "Library avahi-client >= 0.6 needed for bonjour was not found" "$LINENO" 5
-@@ -44959,10 +45151,11 @@ pkg_failed=no
+- as_fn_error $? "Library avahi-client >= 0.6 needed for bonjour was not found" "$LINENO" 5
++ as_fn_error "Library avahi-client >= 0.6 needed for bonjour was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library avahi-client >= 0.6 needed for bonjour was not found" >&5
+ $as_echo "$as_me: WARNING: Library avahi-client >= 0.6 needed for bonjour was not found" >&2;}
+@@ -45283,10 +45169,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
$as_echo_n "checking for UDEV... " >&6; }
@@ -8940,7 +12014,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 142\""; } >&5
($PKG_CONFIG --exists --print-errors "libudev >= 142") 2>&5
ac_status=$?
-@@ -44972,13 +45165,15 @@ if test -n "$UDEV_CFLAGS"; then
+@@ -45296,13 +45183,15 @@
else
pkg_failed=yes
fi
@@ -8962,7 +12036,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 142\""; } >&5
($PKG_CONFIG --exists --print-errors "libudev >= 142") 2>&5
ac_status=$?
-@@ -44988,15 +45183,14 @@ if test -n "$UDEV_LIBS"; then
+@@ -45312,15 +45201,14 @@
else
pkg_failed=yes
fi
@@ -8981,7 +12055,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -45004,14 +45198,16 @@ else
+@@ -45328,25 +45216,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -8995,22 +12069,26 @@ Forwarded: not-needed
echo "$UDEV_PKG_ERRORS" >&5
- if test x"$enable_udev" = "xyes"; then :
+- as_fn_error $? "Library libudev >= 142 needed for udev was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_udev" = "xyes"; then :
- as_fn_error "Library libudev >= 142 needed for udev was not found" "$LINENO" 5
++ as_fn_error "Library libudev >= 142 needed for udev was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libudev >= 142 needed for udev was not found" >&5
-@@ -45019,8 +45215,6 @@ $as_echo "$as_me: WARNING: Library libud
+ $as_echo "$as_me: WARNING: Library libudev >= 142 needed for udev was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_udev" = "xyes"; then :
- as_fn_error "Library libudev >= 142 needed for udev was not found" "$LINENO" 5
+- as_fn_error $? "Library libudev >= 142 needed for udev was not found" "$LINENO" 5
++ as_fn_error "Library libudev >= 142 needed for udev was not found" "$LINENO" 5
else
-@@ -45058,10 +45252,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libudev >= 142 needed for udev was not found" >&5
+ $as_echo "$as_me: WARNING: Library libudev >= 142 needed for udev was not found" >&2;}
+@@ -45382,10 +45270,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
$as_echo_n "checking for UDEV... " >&6; }
@@ -9026,7 +12104,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 142\""; } >&5
($PKG_CONFIG --exists --print-errors "libudev >= 142") 2>&5
ac_status=$?
-@@ -45071,13 +45266,15 @@ if test -n "$UDEV_CFLAGS"; then
+@@ -45395,13 +45284,15 @@
else
pkg_failed=yes
fi
@@ -9048,7 +12126,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 142\""; } >&5
($PKG_CONFIG --exists --print-errors "libudev >= 142") 2>&5
ac_status=$?
-@@ -45087,15 +45284,14 @@ if test -n "$UDEV_LIBS"; then
+@@ -45411,15 +45302,14 @@
else
pkg_failed=yes
fi
@@ -9067,7 +12145,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -45103,14 +45299,16 @@ else
+@@ -45427,27 +45317,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9085,9 +12163,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_udev=no
if test x"$enable_udev" = "xyes"; then :
- as_fn_error "Library libudev >= 142 needed for udev was not found" "$LINENO" 5
+- as_fn_error $? "Library libudev >= 142 needed for udev was not found" "$LINENO" 5
++ as_fn_error "Library libudev >= 142 needed for udev was not found" "$LINENO" 5
else
-@@ -45119,8 +45317,6 @@ $as_echo "$as_me: WARNING: Library libud
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libudev >= 142 needed for udev was not found" >&5
+ $as_echo "$as_me: WARNING: Library libudev >= 142 needed for udev was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -9095,8 +12175,12 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_udev=no
if test x"$enable_udev" = "xyes"; then :
- as_fn_error "Library libudev >= 142 needed for udev was not found" "$LINENO" 5
-@@ -45202,10 +45398,11 @@ pkg_failed=no
+- as_fn_error $? "Library libudev >= 142 needed for udev was not found" "$LINENO" 5
++ as_fn_error "Library libudev >= 142 needed for udev was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libudev >= 142 needed for udev was not found" >&5
+ $as_echo "$as_me: WARNING: Library libudev >= 142 needed for udev was not found" >&2;}
+@@ -45526,10 +45416,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MTP" >&5
$as_echo_n "checking for MTP... " >&6; }
@@ -9112,7 +12196,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmtp >= 1.0.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libmtp >= 1.0.0") 2>&5
ac_status=$?
-@@ -45215,13 +45412,15 @@ if test -n "$MTP_CFLAGS"; then
+@@ -45539,13 +45430,15 @@
else
pkg_failed=yes
fi
@@ -9134,7 +12218,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmtp >= 1.0.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libmtp >= 1.0.0") 2>&5
ac_status=$?
-@@ -45231,15 +45430,14 @@ if test -n "$MTP_LIBS"; then
+@@ -45555,15 +45448,14 @@
else
pkg_failed=yes
fi
@@ -9153,7 +12237,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -45247,14 +45445,16 @@ else
+@@ -45571,25 +45463,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9167,22 +12251,26 @@ Forwarded: not-needed
echo "$MTP_PKG_ERRORS" >&5
- if test x"$enable_mtp" = "xyes"; then :
+- as_fn_error $? "Library libmtp >= 1.0.0 needed for mtp was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_mtp" = "xyes"; then :
- as_fn_error "Library libmtp >= 1.0.0 needed for mtp was not found" "$LINENO" 5
++ as_fn_error "Library libmtp >= 1.0.0 needed for mtp was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&5
-@@ -45262,8 +45462,6 @@ $as_echo "$as_me: WARNING: Library libmt
+ $as_echo "$as_me: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_mtp" = "xyes"; then :
- as_fn_error "Library libmtp >= 1.0.0 needed for mtp was not found" "$LINENO" 5
+- as_fn_error $? "Library libmtp >= 1.0.0 needed for mtp was not found" "$LINENO" 5
++ as_fn_error "Library libmtp >= 1.0.0 needed for mtp was not found" "$LINENO" 5
else
-@@ -45311,10 +45509,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&5
+ $as_echo "$as_me: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&2;}
+@@ -45635,10 +45527,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MTP" >&5
$as_echo_n "checking for MTP... " >&6; }
@@ -9198,7 +12286,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmtp >= 1.0.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libmtp >= 1.0.0") 2>&5
ac_status=$?
-@@ -45324,13 +45523,15 @@ if test -n "$MTP_CFLAGS"; then
+@@ -45648,13 +45541,15 @@
else
pkg_failed=yes
fi
@@ -9220,7 +12308,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmtp >= 1.0.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libmtp >= 1.0.0") 2>&5
ac_status=$?
-@@ -45340,15 +45541,14 @@ if test -n "$MTP_LIBS"; then
+@@ -45664,15 +45559,14 @@
else
pkg_failed=yes
fi
@@ -9239,7 +12327,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -45356,14 +45556,16 @@ else
+@@ -45680,27 +45574,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9257,9 +12345,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_mtp=no
if test x"$enable_mtp" = "xyes"; then :
- as_fn_error "Library libmtp >= 1.0.0 needed for mtp was not found" "$LINENO" 5
+- as_fn_error $? "Library libmtp >= 1.0.0 needed for mtp was not found" "$LINENO" 5
++ as_fn_error "Library libmtp >= 1.0.0 needed for mtp was not found" "$LINENO" 5
else
-@@ -45372,8 +45574,6 @@ $as_echo "$as_me: WARNING: Library libmt
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&5
+ $as_echo "$as_me: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -9267,8 +12357,47 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_mtp=no
if test x"$enable_mtp" = "xyes"; then :
- as_fn_error "Library libmtp >= 1.0.0 needed for mtp was not found" "$LINENO" 5
-@@ -45631,10 +45831,11 @@ pkg_failed=no
+- as_fn_error $? "Library libmtp >= 1.0.0 needed for mtp was not found" "$LINENO" 5
++ as_fn_error "Library libmtp >= 1.0.0 needed for mtp was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&5
+ $as_echo "$as_me: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&2;}
+@@ -45847,7 +45741,7 @@
+ if test "x$ac_cv_have_decl_GCRYCTL_SET_THREAD_CBS" = x""yes; then :
+
+ libgcrypt-config --version >/dev/null || \
+- as_fn_error $? "gcrypt.h present but libgcrypt-config could not be found" "$LINENO" 5
++ as_fn_error "gcrypt.h present but libgcrypt-config could not be found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcry_control in -lgcrypt" >&5
+ $as_echo_n "checking for gcry_control in -lgcrypt... " >&6; }
+ if test "${ac_cv_lib_gcrypt_gcry_control+set}" = set; then :
+@@ -45892,14 +45786,14 @@
+
+ else
+
+- as_fn_error $? "libgcrypt not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day." "$LINENO" 5
++ as_fn_error "libgcrypt not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day." "$LINENO" 5
+
+ fi
+
+
+ else
+
+- as_fn_error $? "libgcrypt version 1.1.94 or higher not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day." "$LINENO" 5
++ as_fn_error "libgcrypt version 1.1.94 or higher not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day." "$LINENO" 5
+
+ fi
+
+@@ -45942,7 +45836,7 @@
+
+ if test "${enable_gnutls}" = "yes"; then :
+
+- as_fn_error $? "--enable-gnutls and --disable-libgcrypt are mutually exclusive." "$LINENO" 5
++ as_fn_error "--enable-gnutls and --disable-libgcrypt are mutually exclusive." "$LINENO" 5
+
+ fi
+ enable_gnutls="no"
+@@ -45955,10 +45849,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNUTLS" >&5
$as_echo_n "checking for GNUTLS... " >&6; }
@@ -9284,7 +12413,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.7.4\""; } >&5
($PKG_CONFIG --exists --print-errors "gnutls >= 1.7.4") 2>&5
ac_status=$?
-@@ -45644,13 +45845,15 @@ if test -n "$GNUTLS_CFLAGS"; then
+@@ -45968,13 +45863,15 @@
else
pkg_failed=yes
fi
@@ -9306,7 +12435,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.7.4\""; } >&5
($PKG_CONFIG --exists --print-errors "gnutls >= 1.7.4") 2>&5
ac_status=$?
-@@ -45660,15 +45863,14 @@ if test -n "$GNUTLS_LIBS"; then
+@@ -45984,15 +45881,14 @@
else
pkg_failed=yes
fi
@@ -9325,7 +12454,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -45676,13 +45878,15 @@ else
+@@ -46000,27 +45896,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9343,7 +12472,9 @@ Forwarded: not-needed
if test "${enable_gnutls}" = "yes"; then :
-@@ -45691,8 +45895,6 @@ fi
+- as_fn_error $? "gnutls not present or too old (version 1.7.4 required)" "$LINENO" 5
++ as_fn_error "gnutls not present or too old (version 1.7.4 required)" "$LINENO" 5
+
fi
elif test $pkg_failed = untried; then
@@ -9352,7 +12483,21 @@ Forwarded: not-needed
if test "${enable_gnutls}" = "yes"; then :
-@@ -45863,10 +46065,11 @@ pkg_failed=no
+- as_fn_error $? "gnutls not present or too old (version 1.7.4 required)" "$LINENO" 5
++ as_fn_error "gnutls not present or too old (version 1.7.4 required)" "$LINENO" 5
+
+ fi
+
+@@ -46113,7 +46009,7 @@
+
+ else
+
+- as_fn_error $? "libgcrypt support required for RemoteOSD plugin" "$LINENO" 5
++ as_fn_error "libgcrypt support required for RemoteOSD plugin" "$LINENO" 5
+
+ fi
+
+@@ -46187,10 +46083,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSSO_SCREENSAVER" >&5
$as_echo_n "checking for OSSO_SCREENSAVER... " >&6; }
@@ -9368,7 +12513,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libosso\""; } >&5
($PKG_CONFIG --exists --print-errors "libosso") 2>&5
ac_status=$?
-@@ -45876,13 +46079,15 @@ if test -n "$OSSO_SCREENSAVER_CFLAGS"; t
+@@ -46200,13 +46097,15 @@
else
pkg_failed=yes
fi
@@ -9390,7 +12535,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libosso\""; } >&5
($PKG_CONFIG --exists --print-errors "libosso") 2>&5
ac_status=$?
-@@ -45892,15 +46097,14 @@ if test -n "$OSSO_SCREENSAVER_LIBS"; the
+@@ -46216,15 +46115,14 @@
else
pkg_failed=yes
fi
@@ -9409,7 +12554,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -45908,14 +46112,16 @@ else
+@@ -46232,25 +46130,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9423,22 +12568,26 @@ Forwarded: not-needed
echo "$OSSO_SCREENSAVER_PKG_ERRORS" >&5
- if test x"$enable_osso_screensaver" = "xyes"; then :
+- as_fn_error $? "Library libosso needed for osso_screensaver was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_osso_screensaver" = "xyes"; then :
- as_fn_error "Library libosso needed for osso_screensaver was not found" "$LINENO" 5
++ as_fn_error "Library libosso needed for osso_screensaver was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libosso needed for osso_screensaver was not found" >&5
-@@ -45923,8 +46129,6 @@ $as_echo "$as_me: WARNING: Library libos
+ $as_echo "$as_me: WARNING: Library libosso needed for osso_screensaver was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_osso_screensaver" = "xyes"; then :
- as_fn_error "Library libosso needed for osso_screensaver was not found" "$LINENO" 5
+- as_fn_error $? "Library libosso needed for osso_screensaver was not found" "$LINENO" 5
++ as_fn_error "Library libosso needed for osso_screensaver was not found" "$LINENO" 5
else
-@@ -45962,10 +46166,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libosso needed for osso_screensaver was not found" >&5
+ $as_echo "$as_me: WARNING: Library libosso needed for osso_screensaver was not found" >&2;}
+@@ -46286,10 +46184,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSSO_SCREENSAVER" >&5
$as_echo_n "checking for OSSO_SCREENSAVER... " >&6; }
@@ -9454,7 +12603,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libosso\""; } >&5
($PKG_CONFIG --exists --print-errors "libosso") 2>&5
ac_status=$?
-@@ -45975,13 +46180,15 @@ if test -n "$OSSO_SCREENSAVER_CFLAGS"; t
+@@ -46299,13 +46198,15 @@
else
pkg_failed=yes
fi
@@ -9476,7 +12625,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libosso\""; } >&5
($PKG_CONFIG --exists --print-errors "libosso") 2>&5
ac_status=$?
-@@ -45991,15 +46198,14 @@ if test -n "$OSSO_SCREENSAVER_LIBS"; the
+@@ -46315,15 +46216,14 @@
else
pkg_failed=yes
fi
@@ -9495,7 +12644,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -46007,14 +46213,16 @@ else
+@@ -46331,27 +46231,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9513,9 +12662,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_osso_screensaver=no
if test x"$enable_osso_screensaver" = "xyes"; then :
- as_fn_error "Library libosso needed for osso_screensaver was not found" "$LINENO" 5
+- as_fn_error $? "Library libosso needed for osso_screensaver was not found" "$LINENO" 5
++ as_fn_error "Library libosso needed for osso_screensaver was not found" "$LINENO" 5
else
-@@ -46023,8 +46231,6 @@ $as_echo "$as_me: WARNING: Library libos
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libosso needed for osso_screensaver was not found" >&5
+ $as_echo "$as_me: WARNING: Library libosso needed for osso_screensaver was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -9523,8 +12674,21 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_osso_screensaver=no
if test x"$enable_osso_screensaver" = "xyes"; then :
- as_fn_error "Library libosso needed for osso_screensaver was not found" "$LINENO" 5
-@@ -46150,10 +46356,11 @@ pkg_failed=no
+- as_fn_error $? "Library libosso needed for osso_screensaver was not found" "$LINENO" 5
++ as_fn_error "Library libosso needed for osso_screensaver was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libosso needed for osso_screensaver was not found" >&5
+ $as_echo "$as_me: WARNING: Library libosso needed for osso_screensaver was not found" >&2;}
+@@ -46417,7 +46317,7 @@
+ then
+ if test "${have_libgcrypt}" != "yes"
+ then
+- as_fn_error $? "libgcrypt is required for update checking system" "$LINENO" 5
++ as_fn_error "libgcrypt is required for update checking system" "$LINENO" 5
+ fi
+
+
+@@ -46474,10 +46374,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLITE" >&5
$as_echo_n "checking for SQLITE... " >&6; }
@@ -9540,7 +12704,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.6.0\""; } >&5
($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.6.0") 2>&5
ac_status=$?
-@@ -46163,13 +46370,15 @@ if test -n "$SQLITE_CFLAGS"; then
+@@ -46487,13 +46388,15 @@
else
pkg_failed=yes
fi
@@ -9562,7 +12726,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.6.0\""; } >&5
($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.6.0") 2>&5
ac_status=$?
-@@ -46179,15 +46388,14 @@ if test -n "$SQLITE_LIBS"; then
+@@ -46503,15 +46406,14 @@
else
pkg_failed=yes
fi
@@ -9581,7 +12745,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -46195,14 +46403,16 @@ else
+@@ -46519,25 +46421,25 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9595,22 +12759,26 @@ Forwarded: not-needed
echo "$SQLITE_PKG_ERRORS" >&5
- if test x"$enable_sqlite" = "xyes"; then :
+- as_fn_error $? "Library sqlite3 >= 3.6.0 needed for sqlite was not found" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test x"$enable_sqlite" = "xyes"; then :
- as_fn_error "Library sqlite3 >= 3.6.0 needed for sqlite was not found" "$LINENO" 5
++ as_fn_error "Library sqlite3 >= 3.6.0 needed for sqlite was not found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library sqlite3 >= 3.6.0 needed for sqlite was not found" >&5
-@@ -46210,8 +46420,6 @@ $as_echo "$as_me: WARNING: Library sqlit
+ $as_echo "$as_me: WARNING: Library sqlite3 >= 3.6.0 needed for sqlite was not found" >&2;}
fi
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if test x"$enable_sqlite" = "xyes"; then :
- as_fn_error "Library sqlite3 >= 3.6.0 needed for sqlite was not found" "$LINENO" 5
+- as_fn_error $? "Library sqlite3 >= 3.6.0 needed for sqlite was not found" "$LINENO" 5
++ as_fn_error "Library sqlite3 >= 3.6.0 needed for sqlite was not found" "$LINENO" 5
else
-@@ -46249,10 +46457,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library sqlite3 >= 3.6.0 needed for sqlite was not found" >&5
+ $as_echo "$as_me: WARNING: Library sqlite3 >= 3.6.0 needed for sqlite was not found" >&2;}
+@@ -46573,10 +46475,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLITE" >&5
$as_echo_n "checking for SQLITE... " >&6; }
@@ -9626,7 +12794,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.6.0\""; } >&5
($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.6.0") 2>&5
ac_status=$?
-@@ -46262,13 +46471,15 @@ if test -n "$SQLITE_CFLAGS"; then
+@@ -46586,13 +46489,15 @@
else
pkg_failed=yes
fi
@@ -9648,7 +12816,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.6.0\""; } >&5
($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.6.0") 2>&5
ac_status=$?
-@@ -46278,15 +46489,14 @@ if test -n "$SQLITE_LIBS"; then
+@@ -46602,15 +46507,14 @@
else
pkg_failed=yes
fi
@@ -9667,7 +12835,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -46294,14 +46504,16 @@ else
+@@ -46618,27 +46522,27 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9685,9 +12853,11 @@ Forwarded: not-needed
+$as_echo "no" >&6; }
+ enable_sqlite=no
if test x"$enable_sqlite" = "xyes"; then :
- as_fn_error "Library sqlite3 >= 3.6.0 needed for sqlite was not found" "$LINENO" 5
+- as_fn_error $? "Library sqlite3 >= 3.6.0 needed for sqlite was not found" "$LINENO" 5
++ as_fn_error "Library sqlite3 >= 3.6.0 needed for sqlite was not found" "$LINENO" 5
else
-@@ -46310,8 +46522,6 @@ $as_echo "$as_me: WARNING: Library sqlit
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library sqlite3 >= 3.6.0 needed for sqlite was not found" >&5
+ $as_echo "$as_me: WARNING: Library sqlite3 >= 3.6.0 needed for sqlite was not found" >&2;}
fi
elif test $pkg_failed = untried; then
@@ -9695,8 +12865,58 @@ Forwarded: not-needed
-$as_echo "no" >&6; }
enable_sqlite=no
if test x"$enable_sqlite" = "xyes"; then :
- as_fn_error "Library sqlite3 >= 3.6.0 needed for sqlite was not found" "$LINENO" 5
-@@ -47055,29 +47265,35 @@ $as_echo "$as_me: Checking for Mozilla"
+- as_fn_error $? "Library sqlite3 >= 3.6.0 needed for sqlite was not found" "$LINENO" 5
++ as_fn_error "Library sqlite3 >= 3.6.0 needed for sqlite was not found" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library sqlite3 >= 3.6.0 needed for sqlite was not found" >&5
+ $as_echo "$as_me: WARNING: Library sqlite3 >= 3.6.0 needed for sqlite was not found" >&2;}
+@@ -46711,7 +46615,7 @@
+ then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error $? "cannot cd to ${with_sqlite}" "$LINENO" 5
++ as_fn_error "cannot cd to ${with_sqlite}" "$LINENO" 5
+ fi
+
+
+@@ -46739,7 +46643,7 @@
+ $as_echo "#define SQLITE_MODULE 1" >>confdefs.h
+
+ else
+- as_fn_error $? "sqlite3 is required for sqlite module" "$LINENO" 5
++ as_fn_error "sqlite3 is required for sqlite module" "$LINENO" 5
+ fi
+
+ done
+@@ -46976,8 +46880,8 @@
+
+ ;; #(
+ *)
+- as_fn_error $? "unknown endianness
+- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
++ as_fn_error "unknown endianness
++ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
+
+ if test "${ac_cv_c_bigendian}" = "yes"; then :
+@@ -47288,14 +47192,14 @@
+ PLUGINS_BINDINGS="${PLUGINS_BINDINGS} activex"
+
+ else
+- as_fn_error $? "required OLE headers are missing from your system" "$LINENO" 5
++ as_fn_error "required OLE headers are missing from your system" "$LINENO" 5
+
+ fi
+
+ done
+
+ else
+- as_fn_error $? "required OLE headers are missing from your system" "$LINENO" 5
++ as_fn_error "required OLE headers are missing from your system" "$LINENO" 5
+
+ fi
+
+@@ -47379,29 +47283,35 @@
if test -n "$i"
then
echo "Trying to find $i package" >&5
@@ -9740,16 +12960,16 @@ Forwarded: not-needed
for ac_header in npapi.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "npapi.h" "ac_cv_header_npapi_h" "$ac_includes_default"
-@@ -47111,7 +47327,7 @@ fi
+@@ -47435,7 +47345,7 @@
done
if test "${MOZILLA_REQUIRED_HEADERS}" = "0"; then
-- as_fn_error "Please install the Firefox development tools; plugin/npapi.h and/or plugin/npruntime.h were not found." "$LINENO" 5
+- as_fn_error $? "Please install the Firefox development tools; plugin/npapi.h and/or plugin/npruntime.h were not found." "$LINENO" 5
+ as_fn_error "Please install the Firefox development tools; mozilla-config.h, plugin/npapi.h and plugin/npruntime.h were not found." "$LINENO" 5
fi
MOZILLA_REQUIRED_HEADERS=
mozilla=:
-@@ -47119,21 +47335,23 @@ done
+@@ -47443,21 +47353,23 @@
@@ -9779,7 +12999,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm xt\""; } >&5
($PKG_CONFIG --exists --print-errors "xpm xt") 2>&5
ac_status=$?
-@@ -47143,13 +47361,15 @@ if test -n "$XPM_CFLAGS"; then
+@@ -47467,13 +47379,15 @@
else
pkg_failed=yes
fi
@@ -9801,7 +13021,7 @@ Forwarded: not-needed
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm xt\""; } >&5
($PKG_CONFIG --exists --print-errors "xpm xt") 2>&5
ac_status=$?
-@@ -47159,15 +47379,14 @@ if test -n "$XPM_LIBS"; then
+@@ -47483,15 +47397,14 @@
else
pkg_failed=yes
fi
@@ -9820,7 +13040,7 @@ Forwarded: not-needed
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -47175,21 +47394,21 @@ else
+@@ -47499,21 +47412,21 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9836,40 +13056,66 @@ Forwarded: not-needed
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
-- as_fn_error "Please install the libXpm and libXt development files." "$LINENO" 5
+- as_fn_error $? "Please install the libXpm and libXt development files." "$LINENO" 5
+ as_fn_error "Please install the libXpm and libXt development files." "$LINENO" 5
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-- as_fn_error "Please install the libXpm and libXt development files." "$LINENO" 5
+- as_fn_error $? "Please install the libXpm and libXt development files." "$LINENO" 5
+ as_fn_error "Please install the libXpm and libXt development files." "$LINENO" 5
else
XPM_CFLAGS=$pkg_cv_XPM_CFLAGS
-@@ -47205,11 +47424,6 @@ $as_echo "yes" >&6; }
+@@ -47529,11 +47442,6 @@
fi
- if test "${have_xcb_keysyms}" != "yes"; then :
-
-- as_fn_error "Please install xcb-keysyms from xcb-utils." "$LINENO" 5
+- as_fn_error $? "Please install xcb-keysyms from xcb-utils." "$LINENO" 5
-
-fi
fi
-@@ -47285,7 +47499,7 @@ fi
+@@ -47609,7 +47517,7 @@
done
test -n "$MOZILLA_CONFIG" || MOZILLA_CONFIG="no"
-- test "${MOZILLA_CONFIG}" = "no" && as_fn_error "Please install the Mozilla development tools (version 1.9.2 or higher) or use --disable-mozilla." "$LINENO" 5
+- test "${MOZILLA_CONFIG}" = "no" && as_fn_error $? "Please install the Mozilla development tools (version 1.9.2 or higher) or use --disable-mozilla." "$LINENO" 5
+ test "${MOZILLA_CONFIG}" = "no" && as_fn_error "Please install the Mozilla development tools. mozilla-config was not found." "$LINENO" 5
fi
-@@ -47543,8 +47757,22 @@ fi
+@@ -47680,14 +47588,14 @@
+ _ACEOF
+
+ else
+- as_fn_error $? "Please install libXpm-devel library for required X11/xpm.h" "$LINENO" 5
++ as_fn_error "Please install libXpm-devel library for required X11/xpm.h" "$LINENO" 5
+ fi
+
+ done
+
+ if test "${have_xcb_keysyms}" != "yes"; then :
+
+- as_fn_error $? "Please install xcb-keysyms from xcb-utils." "$LINENO" 5
++ as_fn_error "Please install xcb-keysyms from xcb-utils." "$LINENO" 5
+
+ fi
+ LDFLAGS="${LDFLAGS_save}"
+@@ -47757,7 +47665,7 @@
+
+ if test "${MOZILLA_REQUIRED_HEADERS}" = "0"
+ then
+- as_fn_error $? "Please install the Mozilla development tools, required headers were not found." "$LINENO" 5
++ as_fn_error "Please install the Mozilla development tools, required headers were not found." "$LINENO" 5
+ fi
+ MOZILLA_REQUIRED_HEADERS=
+ CPPFLAGS="${CPPFLAGS_save}"
+@@ -47867,8 +47775,22 @@
fi
real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`"
@@ -9893,7 +13139,15 @@ Forwarded: not-needed
for ac_header in npapi.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "npapi.h" "ac_cv_header_npapi_h" "$ac_includes_default"
-@@ -47586,10 +47814,29 @@ done
+@@ -47903,17 +47825,36 @@
+
+ if test "${MOZILLA_REQUIRED_HEADERS}" = "0"
+ then
+- as_fn_error $? "Please install the Mozilla development tools, required headers were not found." "$LINENO" 5
++ as_fn_error "Please install the Mozilla development tools, required headers were not found." "$LINENO" 5
+ fi
+ MOZILLA_REQUIRED_HEADERS=
+ mozilla=:
PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
@@ -9924,9 +13178,535 @@ Forwarded: not-needed
MOZILLA_SDK_PATH="${real_mozilla_sdk}"
if test -n "${CYGPATH}"; then
---- vlc-1.1.2.orig/Makefile.in
-+++ vlc-1.1.2/Makefile.in
-@@ -517,7 +517,6 @@ PCRE_LIBS = @PCRE_LIBS@
+@@ -48208,7 +48149,6 @@
+
+ ac_libobjs=
+ ac_ltlibobjs=
+-U=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+ # 1. Remove the extension, and $U if already installed.
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+@@ -48232,172 +48172,172 @@
+ fi
+
+ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+- as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
++ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+- as_fn_error $? "conditional \"AMDEP\" was never defined.
++ as_fn_error "conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
++ as_fn_error "conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+- as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
++ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then
+- as_fn_error $? "conditional \"am__fastdepOBJC\" was never defined.
++ as_fn_error "conditional \"am__fastdepOBJC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then
+- as_fn_error $? "conditional \"am__fastdepOBJC\" was never defined.
++ as_fn_error "conditional \"am__fastdepOBJC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
+- as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
++ as_fn_error "conditional \"am__fastdepCCAS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_BEOS_TRUE}" && test -z "${HAVE_BEOS_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_BEOS\" was never defined.
++ as_fn_error "conditional \"HAVE_BEOS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_DARWIN_TRUE}" && test -z "${HAVE_DARWIN_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_DARWIN\" was never defined.
++ as_fn_error "conditional \"HAVE_DARWIN\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_LINUX_TRUE}" && test -z "${HAVE_LINUX_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_LINUX\" was never defined.
++ as_fn_error "conditional \"HAVE_LINUX\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_WIN32_TRUE}" && test -z "${HAVE_WIN32_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_WIN32\" was never defined.
++ as_fn_error "conditional \"HAVE_WIN32\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_WINCE_TRUE}" && test -z "${HAVE_WINCE_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_WINCE\" was never defined.
++ as_fn_error "conditional \"HAVE_WINCE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${USE_PEFLAGS_TRUE}" && test -z "${USE_PEFLAGS_FALSE}"; then
+- as_fn_error $? "conditional \"USE_PEFLAGS\" was never defined.
++ as_fn_error "conditional \"USE_PEFLAGS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+- as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
++ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_DIRENT_TRUE}" && test -z "${BUILD_DIRENT_FALSE}"; then
+- as_fn_error $? "conditional \"BUILD_DIRENT\" was never defined.
++ as_fn_error "conditional \"BUILD_DIRENT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_ZLIB_TRUE}" && test -z "${HAVE_ZLIB_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_ZLIB\" was never defined.
++ as_fn_error "conditional \"HAVE_ZLIB\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_MINIZIP_TRUE}" && test -z "${HAVE_MINIZIP_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_MINIZIP\" was never defined.
++ as_fn_error "conditional \"HAVE_MINIZIP\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_MMX_TRUE}" && test -z "${HAVE_MMX_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_MMX\" was never defined.
++ as_fn_error "conditional \"HAVE_MMX\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_MMXEXT_TRUE}" && test -z "${HAVE_MMXEXT_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_MMXEXT\" was never defined.
++ as_fn_error "conditional \"HAVE_MMXEXT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_SSE2_TRUE}" && test -z "${HAVE_SSE2_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_SSE2\" was never defined.
++ as_fn_error "conditional \"HAVE_SSE2\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_3DNOW_TRUE}" && test -z "${HAVE_3DNOW_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_3DNOW\" was never defined.
++ as_fn_error "conditional \"HAVE_3DNOW\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_ARM_NEON_TRUE}" && test -z "${HAVE_ARM_NEON_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_ARM_NEON\" was never defined.
++ as_fn_error "conditional \"HAVE_ARM_NEON\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_ALTIVEC_TRUE}" && test -z "${HAVE_ALTIVEC_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_ALTIVEC\" was never defined.
++ as_fn_error "conditional \"HAVE_ALTIVEC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_SOUT_TRUE}" && test -z "${ENABLE_SOUT_FALSE}"; then
+- as_fn_error $? "conditional \"ENABLE_SOUT\" was never defined.
++ as_fn_error "conditional \"ENABLE_SOUT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_LUA_TRUE}" && test -z "${BUILD_LUA_FALSE}"; then
+- as_fn_error $? "conditional \"BUILD_LUA\" was never defined.
++ as_fn_error "conditional \"BUILD_LUA\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_HTTPD_TRUE}" && test -z "${BUILD_HTTPD_FALSE}"; then
+- as_fn_error $? "conditional \"BUILD_HTTPD\" was never defined.
++ as_fn_error "conditional \"BUILD_HTTPD\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_VLM_TRUE}" && test -z "${ENABLE_VLM_FALSE}"; then
+- as_fn_error $? "conditional \"ENABLE_VLM\" was never defined.
++ as_fn_error "conditional \"ENABLE_VLM\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${MERGE_FFMPEG_TRUE}" && test -z "${MERGE_FFMPEG_FALSE}"; then
+- as_fn_error $? "conditional \"MERGE_FFMPEG\" was never defined.
++ as_fn_error "conditional \"MERGE_FFMPEG\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_OSDMENU_TRUE}" && test -z "${BUILD_OSDMENU_FALSE}"; then
+- as_fn_error $? "conditional \"BUILD_OSDMENU\" was never defined.
++ as_fn_error "conditional \"BUILD_OSDMENU\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_SKINS_TRUE}" && test -z "${BUILD_SKINS_FALSE}"; then
+- as_fn_error $? "conditional \"BUILD_SKINS\" was never defined.
++ as_fn_error "conditional \"BUILD_SKINS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_HILDON_TRUE}" && test -z "${BUILD_HILDON_FALSE}"; then
+- as_fn_error $? "conditional \"BUILD_HILDON\" was never defined.
++ as_fn_error "conditional \"BUILD_HILDON\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_QT4_TRUE}" && test -z "${ENABLE_QT4_FALSE}"; then
+- as_fn_error $? "conditional \"ENABLE_QT4\" was never defined.
++ as_fn_error "conditional \"ENABLE_QT4\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_MACOSX_VLC_APP_TRUE}" && test -z "${BUILD_MACOSX_VLC_APP_FALSE}"; then
+- as_fn_error $? "conditional \"BUILD_MACOSX_VLC_APP\" was never defined.
++ as_fn_error "conditional \"BUILD_MACOSX_VLC_APP\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_GCRYPT_TRUE}" && test -z "${HAVE_GCRYPT_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_GCRYPT\" was never defined.
++ as_fn_error "conditional \"HAVE_GCRYPT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_SQLITE_TRUE}" && test -z "${HAVE_SQLITE_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_SQLITE\" was never defined.
++ as_fn_error "conditional \"HAVE_SQLITE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+
+ if test -z "${KDE_SOLID_TRUE}" && test -z "${KDE_SOLID_FALSE}"; then
+- as_fn_error $? "conditional \"KDE_SOLID\" was never defined.
++ as_fn_error "conditional \"KDE_SOLID\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${LOADER_TRUE}" && test -z "${LOADER_FALSE}"; then
+- as_fn_error $? "conditional \"LOADER\" was never defined.
++ as_fn_error "conditional \"LOADER\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_VLC_TRUE}" && test -z "${BUILD_VLC_FALSE}"; then
+- as_fn_error $? "conditional \"BUILD_VLC\" was never defined.
++ as_fn_error "conditional \"BUILD_VLC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAS_MIDL_COMPILER_TRUE}" && test -z "${HAS_MIDL_COMPILER_FALSE}"; then
+- as_fn_error $? "conditional \"HAS_MIDL_COMPILER\" was never defined.
++ as_fn_error "conditional \"HAS_MIDL_COMPILER\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAS_WIDL_COMPILER_TRUE}" && test -z "${HAS_WIDL_COMPILER_FALSE}"; then
+- as_fn_error $? "conditional \"HAS_WIDL_COMPILER\" was never defined.
++ as_fn_error "conditional \"HAS_WIDL_COMPILER\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_ACTIVEX_TRUE}" && test -z "${BUILD_ACTIVEX_FALSE}"; then
+- as_fn_error $? "conditional \"BUILD_ACTIVEX\" was never defined.
++ as_fn_error "conditional \"BUILD_ACTIVEX\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_MOZILLA_TRUE}" && test -z "${BUILD_MOZILLA_FALSE}"; then
+- as_fn_error $? "conditional \"BUILD_MOZILLA\" was never defined.
++ as_fn_error "conditional \"BUILD_MOZILLA\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+
+@@ -48547,19 +48487,19 @@
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+-# as_fn_error STATUS ERROR [LINENO LOG_FD]
+-# ----------------------------------------
++# as_fn_error ERROR [LINENO LOG_FD]
++# ---------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with STATUS, using 1 if that was 0.
++# script with status $?, using 1 if that was 0.
+ as_fn_error ()
+ {
+- as_status=$1; test $as_status -eq 0 && as_status=1
+- if test "$4"; then
+- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
++ as_status=$?; test $as_status -eq 0 && as_status=1
++ if test "$3"; then
++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ fi
+- $as_echo "$as_me: error: $2" >&2
++ $as_echo "$as_me: error: $1" >&2
+ as_fn_exit $as_status
+ } # as_fn_error
+
+@@ -48755,7 +48695,7 @@
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
++ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+ } # as_fn_mkdir_p
+@@ -48809,7 +48749,7 @@
+ # values after options handling.
+ ac_log="
+ This file was extended by vlc $as_me 1.1.3, which was
+-generated by GNU Autoconf 2.67. Invocation command line was
++generated by GNU Autoconf 2.65. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -48875,10 +48815,10 @@
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ vlc config.status 1.1.3
+-configured by $0, generated by GNU Autoconf 2.67,
++configured by $0, generated by GNU Autoconf 2.65,
+ with options \\"\$ac_cs_config\\"
+
+-Copyright (C) 2010 Free Software Foundation, Inc.
++Copyright (C) 2009 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+
+@@ -48896,16 +48836,11 @@
+ while test $# != 0
+ do
+ case $1 in
+- --*=?*)
++ --*=*)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+ ac_shift=:
+ ;;
+- --*=)
+- ac_option=`expr "X$1" : 'X\([^=]*\)='`
+- ac_optarg=
+- ac_shift=:
+- ;;
+ *)
+ ac_option=$1
+ ac_optarg=$2
+@@ -48927,7 +48862,6 @@
+ $ac_shift
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+- '') as_fn_error $? "missing file argument" ;;
+ esac
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
+ ac_need_defaults=false;;
+@@ -48940,7 +48874,7 @@
+ ac_need_defaults=false;;
+ --he | --h)
+ # Conflict between --help and --header
+- as_fn_error $? "ambiguous option: \`$1'
++ as_fn_error "ambiguous option: \`$1'
+ Try \`$0 --help' for more information.";;
+ --help | --hel | -h )
+ $as_echo "$ac_cs_usage"; exit ;;
+@@ -48949,7 +48883,7 @@
+ ac_cs_silent=: ;;
+
+ # This is an error.
+- -*) as_fn_error $? "unrecognized option: \`$1'
++ -*) as_fn_error "unrecognized option: \`$1'
+ Try \`$0 --help' for more information." ;;
+
+ *) as_fn_append ac_config_targets " $1"
+@@ -49471,7 +49405,7 @@
+ "modules/altivec/Makefile") CONFIG_FILES="$CONFIG_FILES modules/altivec/Makefile" ;;
+ "modules/arm_neon/Makefile") CONFIG_FILES="$CONFIG_FILES modules/arm_neon/Makefile" ;;
+
+- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
++ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ esac
+ done
+
+@@ -49509,7 +49443,7 @@
+ {
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
++} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+
+ # Set up the scripts for CONFIG_FILES section.
+ # No need to generate them if there are no CONFIG_FILES.
+@@ -49526,7 +49460,7 @@
+ fi
+ 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'
++ ac_cs_awk_cr='\r'
+ else
+ ac_cs_awk_cr=$ac_cr
+ fi
+@@ -49540,18 +49474,18 @@
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+ } >conf$$subs.sh ||
+- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ . ./conf$$subs.sh ||
+- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
+ break
+ elif $ac_last_try; then
+- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+@@ -49640,28 +49574,20 @@
+ else
+ cat
+ fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
++ || as_fn_error "could not setup config files machinery" "$LINENO" 5
+ _ACEOF
+
+-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
++# VPATH may cause trouble with some makes, so we remove $(srcdir),
++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+ # trailing colons and then remove the whole line if VPATH becomes empty
+ # (actually we leave an empty line to preserve line numbers).
+ if test "x$srcdir" = x.; then
+- ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
+-h
+-s///
+-s/^/:/
+-s/[ ]*$/:/
+-s/:\$(srcdir):/:/g
+-s/:\${srcdir}:/:/g
+-s/:@srcdir@:/:/g
+-s/^:*//
++ ac_vpsub='/^[ ]*VPATH[ ]*=/{
++s/:*\$(srcdir):*/:/
++s/:*\${srcdir}:*/:/
++s/:*@srcdir@:*/:/
++s/^\([^=]*=[ ]*\):*/\1/
+ s/:*$//
+-x
+-s/\(=[ ]*\).*/\1/
+-G
+-s/\n//
+ s/^[^=]*=[ ]*$//
+ }'
+ fi
+@@ -49689,7 +49615,7 @@
+ if test -z "$ac_t"; then
+ break
+ elif $ac_last_try; then
+- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
++ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+@@ -49774,7 +49700,7 @@
+ _ACAWK
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
++ as_fn_error "could not setup config headers machinery" "$LINENO" 5
+ fi # test -n "$CONFIG_HEADERS"
+
+
+@@ -49787,7 +49713,7 @@
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
++ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
+@@ -49815,7 +49741,7 @@
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
++ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ esac
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append ac_file_inputs " '$ac_f'"
+@@ -49842,7 +49768,7 @@
+
+ case $ac_tag in
+ *:-:* | *:-) cat >"$tmp/stdin" \
+- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
++ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+ esac
+ ;;
+ esac
+@@ -49979,22 +49905,22 @@
+ $ac_datarootdir_hack
+ "
+ eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++ || as_fn_error "could not create $ac_file" "$LINENO" 5
+
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined. Please make sure it is defined" >&5
++which seems to be undefined. Please make sure it is defined." >&5
+ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined. Please make sure it is defined" >&2;}
++which seems to be undefined. Please make sure it is defined." >&2;}
+
+ rm -f "$tmp/stdin"
+ case $ac_file in
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ esac \
+- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++ || as_fn_error "could not create $ac_file" "$LINENO" 5
+ ;;
+ :H)
+ #
+@@ -50005,19 +49931,19 @@
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+ } >"$tmp/config.h" \
+- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++ || as_fn_error "could not create $ac_file" "$LINENO" 5
+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ rm -f "$ac_file"
+ mv "$tmp/config.h" "$ac_file" \
+- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++ || as_fn_error "could not create $ac_file" "$LINENO" 5
+ fi
+ else
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+- || as_fn_error $? "could not create -" "$LINENO" 5
++ || as_fn_error "could not create -" "$LINENO" 5
+ fi
+ # Compute "$ac_file"'s index in $config_headers.
+ _am_arg="$ac_file"
+@@ -51088,7 +51014,7 @@
+ ac_clean_files=$ac_clean_files_save
+
+ test $ac_write_fail = 0 ||
+- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+ # configure is writing to config.log, and then calls config.status.
+@@ -51109,7 +51035,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.
+- $ac_cs_success || as_fn_exit 1
++ $ac_cs_success || as_fn_exit $?
+ fi
+ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -517,7 +517,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -9934,9 +13714,18 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/aclocal.m4
-+++ vlc-1.1.2/aclocal.m4
-@@ -20,7 +20,6 @@ If you have problems, you may need to re
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -13,14 +13,13 @@
+
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+-[m4_warning([this file was generated for autoconf 2.67.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
++[m4_warning([this file was generated for autoconf 2.65.
+ You have another version of autoconf. It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
@@ -9944,7 +13733,7 @@ Forwarded: not-needed
#
# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
#
-@@ -48,10 +47,7 @@ To do so, use the procedure documented b
+@@ -48,10 +47,7 @@
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
@@ -9956,7 +13745,7 @@ Forwarded: not-needed
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
-@@ -64,6 +60,7 @@ if test -n "$PKG_CONFIG"; then
+@@ -64,6 +60,7 @@
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
@@ -9964,7 +13753,7 @@ Forwarded: not-needed
fi[]dnl
])# PKG_PROG_PKG_CONFIG
-@@ -72,31 +69,34 @@ fi[]dnl
+@@ -72,31 +69,34 @@
# Check to see whether a particular set of modules exists. Similar
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
#
@@ -10012,7 +13801,7 @@ Forwarded: not-needed
fi[]dnl
])# _PKG_CONFIG
-@@ -138,17 +138,16 @@ and $1[]_LIBS to avoid the need to call
+@@ -138,17 +138,16 @@
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
@@ -10033,7 +13822,7 @@ Forwarded: not-needed
[Package requirements ($2) were not met:
$$1_PKG_ERRORS
-@@ -156,24 +155,25 @@ $$1_PKG_ERRORS
+@@ -156,24 +155,25 @@
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
@@ -10066,9 +13855,9 @@ Forwarded: not-needed
fi[]dnl
])# PKG_CHECK_MODULES
---- vlc-1.1.2.orig/doc/Makefile.in
-+++ vlc-1.1.2/doc/Makefile.in
-@@ -438,7 +438,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -438,7 +438,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10076,9 +13865,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/share/Makefile.in
-+++ vlc-1.1.2/share/Makefile.in
-@@ -462,7 +462,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/share/Makefile.in
++++ b/share/Makefile.in
+@@ -462,7 +462,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10086,9 +13875,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/Makefile.in
-+++ vlc-1.1.2/modules/Makefile.in
-@@ -462,7 +462,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/Makefile.in
++++ b/modules/Makefile.in
+@@ -462,7 +462,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10096,9 +13885,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/packetizer/Makefile.in
-+++ vlc-1.1.2/modules/packetizer/Makefile.in
-@@ -594,7 +594,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/packetizer/Makefile.in
++++ b/modules/packetizer/Makefile.in
+@@ -594,7 +594,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10106,9 +13895,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/video_chroma/Makefile.in
-+++ vlc-1.1.2/modules/video_chroma/Makefile.in
-@@ -558,7 +558,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/video_chroma/Makefile.in
++++ b/modules/video_chroma/Makefile.in
+@@ -558,7 +558,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10116,9 +13905,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/3dnow/Makefile.in
-+++ vlc-1.1.2/modules/3dnow/Makefile.in
-@@ -479,7 +479,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/3dnow/Makefile.in
++++ b/modules/3dnow/Makefile.in
+@@ -479,7 +479,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10126,9 +13915,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/stream_out/Makefile.in
-+++ vlc-1.1.2/modules/stream_out/Makefile.in
-@@ -708,7 +708,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/stream_out/Makefile.in
++++ b/modules/stream_out/Makefile.in
+@@ -708,7 +708,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10136,9 +13925,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/stream_out/transcode/Makefile.in
-+++ vlc-1.1.2/modules/stream_out/transcode/Makefile.in
-@@ -488,7 +488,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/stream_out/transcode/Makefile.in
++++ b/modules/stream_out/transcode/Makefile.in
+@@ -488,7 +488,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10146,9 +13935,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/access/Makefile.in
-+++ vlc-1.1.2/modules/access/Makefile.in
-@@ -898,7 +898,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/access/Makefile.in
++++ b/modules/access/Makefile.in
+@@ -898,7 +898,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10156,9 +13945,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/access/rtp/Makefile.in
-+++ vlc-1.1.2/modules/access/rtp/Makefile.in
-@@ -483,7 +483,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/access/rtp/Makefile.in
++++ b/modules/access/rtp/Makefile.in
+@@ -483,7 +483,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10166,9 +13955,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/access/bda/Makefile.in
-+++ vlc-1.1.2/modules/access/bda/Makefile.in
-@@ -499,7 +499,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/access/bda/Makefile.in
++++ b/modules/access/bda/Makefile.in
+@@ -499,7 +499,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10176,9 +13965,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/access/zip/Makefile.in
-+++ vlc-1.1.2/modules/access/zip/Makefile.in
-@@ -486,7 +486,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/access/zip/Makefile.in
++++ b/modules/access/zip/Makefile.in
+@@ -486,7 +486,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10186,9 +13975,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/access/dshow/Makefile.in
-+++ vlc-1.1.2/modules/access/dshow/Makefile.in
-@@ -500,7 +500,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/access/dshow/Makefile.in
++++ b/modules/access/dshow/Makefile.in
+@@ -500,7 +500,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10196,9 +13985,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/access/mms/Makefile.in
-+++ vlc-1.1.2/modules/access/mms/Makefile.in
-@@ -489,7 +489,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/access/mms/Makefile.in
++++ b/modules/access/mms/Makefile.in
+@@ -489,7 +489,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10206,9 +13995,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/access/bd/Makefile.in
-+++ vlc-1.1.2/modules/access/bd/Makefile.in
-@@ -486,7 +486,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/access/bd/Makefile.in
++++ b/modules/access/bd/Makefile.in
+@@ -486,7 +486,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10216,9 +14005,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/access/dvb/Makefile.in
-+++ vlc-1.1.2/modules/access/dvb/Makefile.in
-@@ -486,7 +486,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/access/dvb/Makefile.in
++++ b/modules/access/dvb/Makefile.in
+@@ -486,7 +486,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10226,9 +14015,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/access/vcd/Makefile.in
-+++ vlc-1.1.2/modules/access/vcd/Makefile.in
-@@ -485,7 +485,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/access/vcd/Makefile.in
++++ b/modules/access/vcd/Makefile.in
+@@ -485,7 +485,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10236,9 +14025,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/access/vcdx/Makefile.in
-+++ vlc-1.1.2/modules/access/vcdx/Makefile.in
-@@ -486,7 +486,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/access/vcdx/Makefile.in
++++ b/modules/access/vcdx/Makefile.in
+@@ -486,7 +486,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10246,9 +14035,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/access/screen/Makefile.in
-+++ vlc-1.1.2/modules/access/screen/Makefile.in
-@@ -507,7 +507,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/access/screen/Makefile.in
++++ b/modules/access/screen/Makefile.in
+@@ -507,7 +507,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10256,9 +14045,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/access/rtsp/Makefile.in
-+++ vlc-1.1.2/modules/access/rtsp/Makefile.in
-@@ -490,7 +490,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/access/rtsp/Makefile.in
++++ b/modules/access/rtsp/Makefile.in
+@@ -490,7 +490,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10266,9 +14055,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/audio_filter/Makefile.in
-+++ vlc-1.1.2/modules/audio_filter/Makefile.in
-@@ -584,7 +584,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/audio_filter/Makefile.in
++++ b/modules/audio_filter/Makefile.in
+@@ -584,7 +584,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10276,9 +14065,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/audio_filter/resampler/Makefile.in
-+++ vlc-1.1.2/modules/audio_filter/resampler/Makefile.in
-@@ -497,7 +497,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/audio_filter/resampler/Makefile.in
++++ b/modules/audio_filter/resampler/Makefile.in
+@@ -497,7 +497,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10286,9 +14075,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/audio_filter/spatializer/Makefile.in
-+++ vlc-1.1.2/modules/audio_filter/spatializer/Makefile.in
-@@ -504,7 +504,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/audio_filter/spatializer/Makefile.in
++++ b/modules/audio_filter/spatializer/Makefile.in
+@@ -504,7 +504,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10296,9 +14085,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/audio_filter/converter/Makefile.in
-+++ vlc-1.1.2/modules/audio_filter/converter/Makefile.in
-@@ -562,7 +562,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/audio_filter/converter/Makefile.in
++++ b/modules/audio_filter/converter/Makefile.in
+@@ -562,7 +562,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10306,9 +14095,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/audio_filter/channel_mixer/Makefile.in
-+++ vlc-1.1.2/modules/audio_filter/channel_mixer/Makefile.in
-@@ -535,7 +535,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/audio_filter/channel_mixer/Makefile.in
++++ b/modules/audio_filter/channel_mixer/Makefile.in
+@@ -535,7 +535,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10316,9 +14105,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/services_discovery/Makefile.in
-+++ vlc-1.1.2/modules/services_discovery/Makefile.in
-@@ -588,7 +588,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/services_discovery/Makefile.in
++++ b/modules/services_discovery/Makefile.in
+@@ -588,7 +588,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10326,9 +14115,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/visualization/Makefile.in
-+++ vlc-1.1.2/modules/visualization/Makefile.in
-@@ -549,7 +549,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/visualization/Makefile.in
++++ b/modules/visualization/Makefile.in
+@@ -549,7 +549,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10336,9 +14125,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/visualization/visual/Makefile.in
-+++ vlc-1.1.2/modules/visualization/visual/Makefile.in
-@@ -484,7 +484,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/visualization/visual/Makefile.in
++++ b/modules/visualization/visual/Makefile.in
+@@ -484,7 +484,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10346,9 +14135,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/video_output/Makefile.in
-+++ vlc-1.1.2/modules/video_output/Makefile.in
-@@ -766,7 +766,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/video_output/Makefile.in
++++ b/modules/video_output/Makefile.in
+@@ -766,7 +766,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10356,9 +14145,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/video_output/msw/Makefile.in
-+++ vlc-1.1.2/modules/video_output/msw/Makefile.in
-@@ -541,7 +541,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/video_output/msw/Makefile.in
++++ b/modules/video_output/msw/Makefile.in
+@@ -541,7 +541,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10366,9 +14155,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/control/Makefile.in
-+++ vlc-1.1.2/modules/control/Makefile.in
-@@ -651,7 +651,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/control/Makefile.in
++++ b/modules/control/Makefile.in
+@@ -651,7 +651,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10376,9 +14165,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/control/http/Makefile.in
-+++ vlc-1.1.2/modules/control/http/Makefile.in
-@@ -487,7 +487,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/control/http/Makefile.in
++++ b/modules/control/http/Makefile.in
+@@ -487,7 +487,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10386,9 +14175,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/control/globalhotkeys/Makefile.in
-+++ vlc-1.1.2/modules/control/globalhotkeys/Makefile.in
-@@ -488,7 +488,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/control/globalhotkeys/Makefile.in
++++ b/modules/control/globalhotkeys/Makefile.in
+@@ -488,7 +488,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10396,9 +14185,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/altivec/Makefile.in
-+++ vlc-1.1.2/modules/altivec/Makefile.in
-@@ -491,7 +491,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/altivec/Makefile.in
++++ b/modules/altivec/Makefile.in
+@@ -491,7 +491,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10406,9 +14195,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/demux/Makefile.in
-+++ vlc-1.1.2/modules/demux/Makefile.in
-@@ -880,7 +880,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/demux/Makefile.in
++++ b/modules/demux/Makefile.in
+@@ -880,7 +880,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10416,9 +14205,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/demux/asf/Makefile.in
-+++ vlc-1.1.2/modules/demux/asf/Makefile.in
-@@ -485,7 +485,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/demux/asf/Makefile.in
++++ b/modules/demux/asf/Makefile.in
+@@ -485,7 +485,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10426,9 +14215,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/demux/avi/Makefile.in
-+++ vlc-1.1.2/modules/demux/avi/Makefile.in
-@@ -485,7 +485,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/demux/avi/Makefile.in
++++ b/modules/demux/avi/Makefile.in
+@@ -485,7 +485,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10436,9 +14225,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/demux/avformat/Makefile.in
-+++ vlc-1.1.2/modules/demux/avformat/Makefile.in
-@@ -494,7 +494,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/demux/avformat/Makefile.in
++++ b/modules/demux/avformat/Makefile.in
+@@ -494,7 +494,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10446,9 +14235,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/demux/mkv/Makefile.in
-+++ vlc-1.1.2/modules/demux/mkv/Makefile.in
-@@ -507,7 +507,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/demux/mkv/Makefile.in
++++ b/modules/demux/mkv/Makefile.in
+@@ -507,7 +507,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10456,9 +14245,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/demux/mp4/Makefile.in
-+++ vlc-1.1.2/modules/demux/mp4/Makefile.in
-@@ -485,7 +485,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/demux/mp4/Makefile.in
++++ b/modules/demux/mp4/Makefile.in
+@@ -485,7 +485,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10466,9 +14255,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/demux/mpeg/Makefile.in
-+++ vlc-1.1.2/modules/demux/mpeg/Makefile.in
-@@ -505,7 +505,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/demux/mpeg/Makefile.in
++++ b/modules/demux/mpeg/Makefile.in
+@@ -505,7 +505,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10476,9 +14265,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/demux/playlist/Makefile.in
-+++ vlc-1.1.2/modules/demux/playlist/Makefile.in
-@@ -493,7 +493,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/demux/playlist/Makefile.in
++++ b/modules/demux/playlist/Makefile.in
+@@ -493,7 +493,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10486,9 +14275,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/sse2/Makefile.in
-+++ vlc-1.1.2/modules/sse2/Makefile.in
-@@ -502,7 +502,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/sse2/Makefile.in
++++ b/modules/sse2/Makefile.in
+@@ -502,7 +502,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10496,9 +14285,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/meta_engine/Makefile.in
-+++ vlc-1.1.2/modules/meta_engine/Makefile.in
-@@ -523,7 +523,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/meta_engine/Makefile.in
++++ b/modules/meta_engine/Makefile.in
+@@ -523,7 +523,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10506,9 +14295,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/codec/Makefile.in
-+++ vlc-1.1.2/modules/codec/Makefile.in
-@@ -943,7 +943,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/codec/Makefile.in
++++ b/modules/codec/Makefile.in
+@@ -943,7 +943,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10516,9 +14305,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/codec/avcodec/Makefile.in
-+++ vlc-1.1.2/modules/codec/avcodec/Makefile.in
-@@ -507,7 +507,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/codec/avcodec/Makefile.in
++++ b/modules/codec/avcodec/Makefile.in
+@@ -507,7 +507,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10526,9 +14315,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/codec/wmafixed/Makefile.in
-+++ vlc-1.1.2/modules/codec/wmafixed/Makefile.in
-@@ -487,7 +487,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/codec/wmafixed/Makefile.in
++++ b/modules/codec/wmafixed/Makefile.in
+@@ -487,7 +487,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10536,9 +14325,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/codec/omxil/Makefile.in
-+++ vlc-1.1.2/modules/codec/omxil/Makefile.in
-@@ -484,7 +484,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/codec/omxil/Makefile.in
++++ b/modules/codec/omxil/Makefile.in
+@@ -484,7 +484,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10546,9 +14335,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/codec/subtitles/Makefile.in
-+++ vlc-1.1.2/modules/codec/subtitles/Makefile.in
-@@ -507,7 +507,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/codec/subtitles/Makefile.in
++++ b/modules/codec/subtitles/Makefile.in
+@@ -507,7 +507,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10556,9 +14345,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/codec/shine/Makefile.in
-+++ vlc-1.1.2/modules/codec/shine/Makefile.in
-@@ -483,7 +483,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/codec/shine/Makefile.in
++++ b/modules/codec/shine/Makefile.in
+@@ -483,7 +483,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10566,9 +14355,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/codec/dmo/Makefile.in
-+++ vlc-1.1.2/modules/codec/dmo/Makefile.in
-@@ -483,7 +483,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/codec/dmo/Makefile.in
++++ b/modules/codec/dmo/Makefile.in
+@@ -483,7 +483,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10576,9 +14365,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/codec/spudec/Makefile.in
-+++ vlc-1.1.2/modules/codec/spudec/Makefile.in
-@@ -485,7 +485,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/codec/spudec/Makefile.in
++++ b/modules/codec/spudec/Makefile.in
+@@ -485,7 +485,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10586,9 +14375,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/mux/Makefile.in
-+++ vlc-1.1.2/modules/mux/Makefile.in
-@@ -594,7 +594,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/mux/Makefile.in
++++ b/modules/mux/Makefile.in
+@@ -594,7 +594,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10596,9 +14385,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/mux/mpeg/Makefile.in
-+++ vlc-1.1.2/modules/mux/mpeg/Makefile.in
-@@ -498,7 +498,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/mux/mpeg/Makefile.in
++++ b/modules/mux/mpeg/Makefile.in
+@@ -498,7 +498,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10606,9 +14395,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/arm_neon/Makefile.in
-+++ vlc-1.1.2/modules/arm_neon/Makefile.in
-@@ -500,7 +500,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/arm_neon/Makefile.in
++++ b/modules/arm_neon/Makefile.in
+@@ -500,7 +500,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10616,9 +14405,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/gui/Makefile.in
-+++ vlc-1.1.2/modules/gui/Makefile.in
-@@ -536,7 +536,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/gui/Makefile.in
++++ b/modules/gui/Makefile.in
+@@ -536,7 +536,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10626,9 +14415,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/gui/macosx/Makefile.in
-+++ vlc-1.1.2/modules/gui/macosx/Makefile.in
-@@ -524,7 +524,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/gui/macosx/Makefile.in
++++ b/modules/gui/macosx/Makefile.in
+@@ -524,7 +524,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10636,9 +14425,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/gui/minimal_macosx/Makefile.in
-+++ vlc-1.1.2/modules/gui/minimal_macosx/Makefile.in
-@@ -513,7 +513,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/gui/minimal_macosx/Makefile.in
++++ b/modules/gui/minimal_macosx/Makefile.in
+@@ -513,7 +513,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10646,9 +14435,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/gui/skins2/Makefile.in
-+++ vlc-1.1.2/modules/gui/skins2/Makefile.in
-@@ -759,7 +759,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/gui/skins2/Makefile.in
++++ b/modules/gui/skins2/Makefile.in
+@@ -759,7 +759,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10656,9 +14445,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/gui/macosx_dialog_provider/Makefile.in
-+++ vlc-1.1.2/modules/gui/macosx_dialog_provider/Makefile.in
-@@ -496,7 +496,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/gui/macosx_dialog_provider/Makefile.in
++++ b/modules/gui/macosx_dialog_provider/Makefile.in
+@@ -496,7 +496,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10666,9 +14455,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/gui/hildon/Makefile.in
-+++ vlc-1.1.2/modules/gui/hildon/Makefile.in
-@@ -487,7 +487,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/gui/hildon/Makefile.in
++++ b/modules/gui/hildon/Makefile.in
+@@ -487,7 +487,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10676,9 +14465,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/gui/qt4/Makefile.in
-+++ vlc-1.1.2/modules/gui/qt4/Makefile.in
-@@ -620,7 +620,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/gui/qt4/Makefile.in
++++ b/modules/gui/qt4/Makefile.in
+@@ -620,7 +620,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10686,9 +14475,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/audio_mixer/Makefile.in
-+++ vlc-1.1.2/modules/audio_mixer/Makefile.in
-@@ -510,7 +510,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/audio_mixer/Makefile.in
++++ b/modules/audio_mixer/Makefile.in
+@@ -510,7 +510,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10696,9 +14485,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/mmxext/Makefile.in
-+++ vlc-1.1.2/modules/mmxext/Makefile.in
-@@ -481,7 +481,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/mmxext/Makefile.in
++++ b/modules/mmxext/Makefile.in
+@@ -481,7 +481,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10706,9 +14495,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/access_output/Makefile.in
-+++ vlc-1.1.2/modules/access_output/Makefile.in
-@@ -548,7 +548,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/access_output/Makefile.in
++++ b/modules/access_output/Makefile.in
+@@ -548,7 +548,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10716,9 +14505,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/video_filter/Makefile.in
-+++ vlc-1.1.2/modules/video_filter/Makefile.in
-@@ -1168,7 +1168,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/video_filter/Makefile.in
++++ b/modules/video_filter/Makefile.in
+@@ -1168,7 +1168,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10726,9 +14515,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/video_filter/dynamicoverlay/Makefile.in
-+++ vlc-1.1.2/modules/video_filter/dynamicoverlay/Makefile.in
-@@ -491,7 +491,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/video_filter/dynamicoverlay/Makefile.in
++++ b/modules/video_filter/dynamicoverlay/Makefile.in
+@@ -491,7 +491,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10736,9 +14525,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/misc/Makefile.in
-+++ vlc-1.1.2/modules/misc/Makefile.in
-@@ -677,7 +677,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/misc/Makefile.in
++++ b/modules/misc/Makefile.in
+@@ -677,7 +677,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10746,9 +14535,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/misc/notify/Makefile.in
-+++ vlc-1.1.2/modules/misc/notify/Makefile.in
-@@ -563,7 +563,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/misc/notify/Makefile.in
++++ b/modules/misc/notify/Makefile.in
+@@ -563,7 +563,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10756,9 +14545,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/misc/osd/Makefile.in
-+++ vlc-1.1.2/modules/misc/osd/Makefile.in
-@@ -488,7 +488,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/misc/osd/Makefile.in
++++ b/modules/misc/osd/Makefile.in
+@@ -488,7 +488,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10766,9 +14555,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/misc/lua/Makefile.in
-+++ vlc-1.1.2/modules/misc/lua/Makefile.in
-@@ -498,7 +498,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/misc/lua/Makefile.in
++++ b/modules/misc/lua/Makefile.in
+@@ -498,7 +498,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10776,9 +14565,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/misc/xml/Makefile.in
-+++ vlc-1.1.2/modules/misc/xml/Makefile.in
-@@ -495,7 +495,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/misc/xml/Makefile.in
++++ b/modules/misc/xml/Makefile.in
+@@ -495,7 +495,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10786,9 +14575,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/misc/playlist/Makefile.in
-+++ vlc-1.1.2/modules/misc/playlist/Makefile.in
-@@ -486,7 +486,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/misc/playlist/Makefile.in
++++ b/modules/misc/playlist/Makefile.in
+@@ -486,7 +486,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10796,9 +14585,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/misc/stats/Makefile.in
-+++ vlc-1.1.2/modules/misc/stats/Makefile.in
-@@ -486,7 +486,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/misc/stats/Makefile.in
++++ b/modules/misc/stats/Makefile.in
+@@ -486,7 +486,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10806,9 +14595,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/misc/dummy/Makefile.in
-+++ vlc-1.1.2/modules/misc/dummy/Makefile.in
-@@ -488,7 +488,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/misc/dummy/Makefile.in
++++ b/modules/misc/dummy/Makefile.in
+@@ -488,7 +488,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10816,9 +14605,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/stream_filter/Makefile.in
-+++ vlc-1.1.2/modules/stream_filter/Makefile.in
-@@ -512,7 +512,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/stream_filter/Makefile.in
++++ b/modules/stream_filter/Makefile.in
+@@ -512,7 +512,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10826,9 +14615,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/audio_output/Makefile.in
-+++ vlc-1.1.2/modules/audio_output/Makefile.in
-@@ -615,7 +615,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/audio_output/Makefile.in
++++ b/modules/audio_output/Makefile.in
+@@ -615,7 +615,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10836,9 +14625,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/modules/mmx/Makefile.in
-+++ vlc-1.1.2/modules/mmx/Makefile.in
-@@ -510,7 +510,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/modules/mmx/Makefile.in
++++ b/modules/mmx/Makefile.in
+@@ -510,7 +510,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10846,9 +14635,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/projects/activex/Makefile.in
-+++ vlc-1.1.2/projects/activex/Makefile.in
-@@ -513,7 +513,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/projects/activex/Makefile.in
++++ b/projects/activex/Makefile.in
+@@ -513,7 +513,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10856,9 +14645,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/projects/mozilla/Makefile.in
-+++ vlc-1.1.2/projects/mozilla/Makefile.in
-@@ -533,7 +533,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/projects/mozilla/Makefile.in
++++ b/projects/mozilla/Makefile.in
+@@ -533,7 +533,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10866,7 +14655,7 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
-@@ -740,7 +739,8 @@ DIST_sources = $(SOURCES_mozilla_common)
+@@ -740,7 +739,8 @@
@BUILD_MOZILLA_TRUE@@HAVE_DARWIN_TRUE@@HAVE_WIN32_FALSE@ -F/System/Library/Frameworks/CoreFoundation.framework $(moz_CFLAGS) \
@BUILD_MOZILLA_TRUE@@HAVE_DARWIN_TRUE@@HAVE_WIN32_FALSE@ -I/Developer/Headers/FlatCarbon -fno-common -fpascal-strings \
@BUILD_MOZILLA_TRUE@@HAVE_DARWIN_TRUE@@HAVE_WIN32_FALSE@ -Wmost -Wno-four-char-constants -Wno-unknown-pragmas -DXP_MACOSX=1 \
@@ -10876,9 +14665,9 @@ Forwarded: not-needed
@BUILD_MOZILLA_TRUE@@HAVE_WIN32_TRUE at CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32
@BUILD_MOZILLA_TRUE@@HAVE_DARWIN_TRUE@@HAVE_WIN32_FALSE at LDFLAGS_mozilla_EXTRA = -no-undefined -bundle -Wl,-read_only_relocs -Wl,suppress \
---- vlc-1.1.2.orig/compat/Makefile.in
-+++ vlc-1.1.2/compat/Makefile.in
-@@ -448,7 +448,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/compat/Makefile.in
++++ b/compat/Makefile.in
+@@ -448,7 +448,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10886,9 +14675,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/extras/package/ipkg/Makefile.in
-+++ vlc-1.1.2/extras/package/ipkg/Makefile.in
-@@ -411,7 +411,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/extras/package/ipkg/Makefile.in
++++ b/extras/package/ipkg/Makefile.in
+@@ -411,7 +411,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10896,9 +14685,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/test/Makefile.in
-+++ vlc-1.1.2/test/Makefile.in
-@@ -524,7 +524,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -524,7 +524,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10906,9 +14695,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/src/Makefile.in
-+++ vlc-1.1.2/src/Makefile.in
-@@ -731,7 +731,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -731,7 +731,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10916,9 +14705,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/src/test/Makefile.in
-+++ vlc-1.1.2/src/test/Makefile.in
-@@ -482,7 +482,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/src/test/Makefile.in
++++ b/src/test/Makefile.in
+@@ -482,7 +482,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10926,9 +14715,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/bin/Makefile.in
-+++ vlc-1.1.2/bin/Makefile.in
-@@ -487,7 +487,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/bin/Makefile.in
++++ b/bin/Makefile.in
+@@ -487,7 +487,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10936,9 +14725,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/m4/Makefile.in
-+++ vlc-1.1.2/m4/Makefile.in
-@@ -411,7 +411,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/m4/Makefile.in
++++ b/m4/Makefile.in
+@@ -411,7 +411,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10946,9 +14735,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/libs/unzip/Makefile.in
-+++ vlc-1.1.2/libs/unzip/Makefile.in
-@@ -453,7 +453,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/libs/unzip/Makefile.in
++++ b/libs/unzip/Makefile.in
+@@ -453,7 +453,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10956,9 +14745,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/libs/srtp/Makefile.in
-+++ vlc-1.1.2/libs/srtp/Makefile.in
-@@ -479,7 +479,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/libs/srtp/Makefile.in
++++ b/libs/srtp/Makefile.in
+@@ -479,7 +479,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
@@ -10966,9 +14755,9 @@ Forwarded: not-needed
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
---- vlc-1.1.2.orig/libs/loader/Makefile.in
-+++ vlc-1.1.2/libs/loader/Makefile.in
-@@ -476,7 +476,6 @@ PCRE_LIBS = @PCRE_LIBS@
+--- a/libs/loader/Makefile.in
++++ b/libs/loader/Makefile.in
+@@ -476,7 +476,6 @@
PEFLAGS = @PEFLAGS@
PKGDIR = @PKGDIR@
PKG_CONFIG = @PKG_CONFIG@
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list