[SCM] VLC media player packaging branch, sid, updated. debian/1.1.2-1-2-g1fc7644
bdrung-guest at users.alioth.debian.org
bdrung-guest at users.alioth.debian.org
Thu Aug 12 12:08:17 UTC 2010
The following commit has been merged in the sid branch:
commit d1c7f52bcf9a9b54fa4f3a8a7358a79bdb569e84
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Aug 12 11:27:56 2010 +0200
502_xulrunner_191.diff: Shorten it and split it into two parts.
diff --git a/debian/patches/502_xulrunner_191.diff b/debian/patches/502_xulrunner_191.diff
index d6558a9..4bb2043 100644
--- a/debian/patches/502_xulrunner_191.diff
+++ b/debian/patches/502_xulrunner_191.diff
@@ -2,11 +2,9 @@ Description: Make vlc compatible with xulrunner 1.9.1
Author: Christophe Mutricy <xtophe at videolan.org>
Forwarded: not-needed
-Index: debian.git/config.h.in
-===================================================================
---- debian.git.orig/config.h.in 2010-06-21 01:50:57.000000000 +0200
-+++ debian.git/config.h.in 2010-06-23 00:47:04.664226507 +0200
-@@ -501,6 +501,9 @@
+--- a/config.h.in
++++ b/config.h.in
+@@ -504,6 +504,9 @@
/* Define to 1 if you have the <npapi.h> header file. */
#undef HAVE_NPAPI_H
@@ -16,185 +14,9 @@ Index: debian.git/config.h.in
/* Define to 1 if you have the <npruntime.h> header file. */
#undef HAVE_NPRUNTIME_H
-Index: debian.git/configure
-===================================================================
---- debian.git.orig/configure 2010-06-21 01:50:55.000000000 +0200
-+++ debian.git/configure 2010-06-23 00:47:04.674226144 +0200
-@@ -47000,33 +47000,39 @@
- found=1
- else
- if test -n "$PKG_CONFIG"; then
-- for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do
-+ for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do
- if test -n "$i"
- then
- echo "Trying to find $i package" >&5
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $i >= 1.9.2" >&5
--$as_echo_n "checking for $i >= 1.9.2... " >&6; }
-- if $PKG_CONFIG --exists --print-errors "$i >= 1.9.2" 2>&5
-+ if $PKG_CONFIG --exists --print-errors "$i" 2>&5
- then
- echo "Using $i pkg-config package." >&5
- echo "Using $i package." >&6
- found=1
- MOZILLA_CFLAGS=$(eval $PKG_CONFIG --cflags "$i" )
- MOZILLA_LIBS=$(eval $PKG_CONFIG --libs "$i" )
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
- break
- fi
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
- fi
-- done
-+ done
- fi
- fi
- if test $found = 1; then :
-
- CPPFLAGS="${CPPFLAGS_save} ${MOZILLA_CFLAGS}"
- MOZILLA_REQUIRED_HEADERS=1
-+ for ac_header in npfunctions.h
-+do :
-+ ac_fn_cxx_check_header_mongrel "$LINENO" "npfunctions.h" "ac_cv_header_npfunctions_h" "$ac_includes_default"
-+if test "x$ac_cv_header_npfunctions_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_NPFUNCTIONS_H 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
- for ac_header in npapi.h
- do :
- ac_fn_cxx_check_header_mongrel "$LINENO" "npapi.h" "ac_cv_header_npapi_h" "$ac_includes_default"
-@@ -47060,7 +47066,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; mozilla-config.h, plugin/npapi.h and plugin/npruntime.h were not found." "$LINENO" 5
- fi
- MOZILLA_REQUIRED_HEADERS=
- mozilla=:
-@@ -47068,11 +47074,12 @@
-
-
-
-- eval "CPPFLAGS_mozilla="'"$'"{CPPFLAGS_mozilla} -DXP_UNIX"'"'
-+
-+ eval "CPPFLAGS_mozilla="'"$'"{CPPFLAGS_mozilla} -DXP_UNIX -DOJI"'"'
- am_modules_with_cppflags="${am_modules_with_cppflags} mozilla"
-
-
-- if test "${SYS}" != "darwin"; then :
-+ if test "${SYS}" != "darwin"; then :
-
-
- pkg_failed=no
-@@ -47132,13 +47139,13 @@
- echo "$XPM_PKG_ERRORS" >&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
-
- else
- XPM_CFLAGS=$pkg_cv_XPM_CFLAGS
-@@ -47154,11 +47161,6 @@
-
-
- fi
-- if test "${have_xcb_keysyms}" != "yes"; then :
--
-- as_fn_error "Please install xcb-keysyms from xcb-utils." "$LINENO" 5
--
--fi
-
- fi
-
-@@ -47234,7 +47236,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. mozilla-config was not found." "$LINENO" 5
-
-
- fi
-@@ -47492,8 +47494,22 @@
- fi
-
- real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`"
-- CPPFLAGS="${CPPFLAGS_save} -I${real_mozilla_sdk}/include"
-+ CPPFLAGS="${CPPFLAGS_save} -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include"
- MOZILLA_REQUIRED_HEADERS=1
-+ for ac_header in mozilla-config.h
-+do :
-+ ac_fn_cxx_check_header_mongrel "$LINENO" "mozilla-config.h" "ac_cv_header_mozilla_config_h" "$ac_includes_default"
-+if test "x$ac_cv_header_mozilla_config_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_MOZILLA_CONFIG_H 1
-+_ACEOF
-+
-+else
-+ MOZILLA_REQUIRED_HEADERS=0
-+fi
-+
-+done
-+
- for ac_header in npapi.h
- do :
- ac_fn_cxx_check_header_mongrel "$LINENO" "npapi.h" "ac_cv_header_npapi_h" "$ac_includes_default"
-@@ -47535,10 +47551,29 @@
- PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
-
-
-- eval "CPPFLAGS_mozilla="'"$'"{CPPFLAGS_mozilla} -DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk}/include"'"'
-+ eval "CPPFLAGS_mozilla="'"$'"{CPPFLAGS_mozilla} -DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include"'"'
- am_modules_with_cppflags="${am_modules_with_cppflags} mozilla"
-
-
-+ if ${need_xpcom_libs}; then
-+
-+
-+ eval "LIBS_mozilla="'"'"-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 -lxpcomglue "'$'"{LIBS_mozilla}"'"'
-+ am_modules_with_libs="${am_modules_with_libs} mozilla"
-+
-+
-+ if test "${SYS}" = "mingw32"; then
-+ if test -d "${real_mozilla_sdk}/embedstring/bin"
-+ then
-+
-+
-+ eval "LIBS_mozilla="'"'"-lembedstring "'$'"{LIBS_mozilla}"'"'
-+ am_modules_with_libs="${am_modules_with_libs} mozilla"
-+
-+
-+ fi
-+ fi
-+ fi
- MOZILLA_SDK_PATH="${real_mozilla_sdk}"
-
- if test -n "${CYGPATH}"; then
-Index: debian.git/configure.ac
-===================================================================
---- debian.git.orig/configure.ac 2010-06-20 22:17:11.000000000 +0200
-+++ debian.git/configure.ac 2010-06-23 00:47:04.684226299 +0200
-@@ -4550,29 +4550,27 @@
- found=1
- else
- if test -n "$PKG_CONFIG"; then
-- for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do
-+ for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do
+--- a/configure.ac
++++ b/configure.ac
+@@ -4561,25 +4561,23 @@
if test -n "$i"
then
echo "Trying to find $i package" >&AS_MESSAGE_LOG_FD
@@ -223,7 +45,7 @@ Index: debian.git/configure.ac
AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
[#if HAVE_NPAPI_H
-@@ -4580,24 +4578,22 @@
+@@ -4587,21 +4585,19 @@
#endif
])
if test "${MOZILLA_REQUIRED_HEADERS}" = "0"; then
@@ -253,24 +75,17 @@ Index: debian.git/configure.ac
+ ])
])
])
-- VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS} ${XPM_CFLAGS}])
-+ VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS} ${XPM_CFLAGS}])
- VLC_ADD_LIBS([mozilla],[${MOZILLA_LIBS} ${XPM_LIBS}])
- VLC_ADD_PLUGIN([mozilla])
- PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
-@@ -4606,9 +4602,9 @@
- ],
- [
+ VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS} ${XPM_CFLAGS}])
+@@ -4615,7 +4611,7 @@
AC_PATH_PROGS(MOZILLA_CONFIG,
-- [mozilla-config seamonkey-config xulrunner-config],
-+ [mozilla-config seamonkey-config xulrunner-config],
+ [mozilla-config seamonkey-config xulrunner-config],
[no])
- test "${MOZILLA_CONFIG}" = "no" && AC_MSG_ERROR([Please install the Mozilla development tools (version 1.9.2 or higher) or use --disable-mozilla.])
+ test "${MOZILLA_CONFIG}" = "no" && AC_MSG_ERROR([Please install the Mozilla development tools. mozilla-config was not found.])
]
)
dnl pkg-config failed but we might have found a mozilla-config
-@@ -4664,8 +4660,9 @@
+@@ -4671,8 +4667,9 @@
fi
real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`"
@@ -281,7 +96,7 @@ Index: debian.git/configure.ac
AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
[#if HAVE_NPAPI_H
-@@ -4679,7 +4676,17 @@
+@@ -4686,7 +4683,17 @@
MOZILLA_REQUIRED_HEADERS=
mozilla=:
PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
@@ -300,10 +115,8 @@ Index: debian.git/configure.ac
MOZILLA_SDK_PATH="${real_mozilla_sdk}"
if test -n "${CYGPATH}"; then
-Index: debian.git/projects/mozilla/Makefile.am
-===================================================================
---- debian.git.orig/projects/mozilla/Makefile.am 2010-04-27 23:44:27.000000000 +0200
-+++ debian.git/projects/mozilla/Makefile.am 2010-06-23 00:47:04.684226299 +0200
+--- a/projects/mozilla/Makefile.am
++++ b/projects/mozilla/Makefile.am
@@ -67,7 +67,8 @@
-F/System/Library/Frameworks/CoreFoundation.framework $(moz_CFLAGS) \
-I/Developer/Headers/FlatCarbon -fno-common -fpascal-strings \
@@ -314,24 +127,8 @@ Index: debian.git/projects/mozilla/Makefile.am
LDFLAGS_mozilla_EXTRA = -no-undefined -bundle -Wl,-read_only_relocs -Wl,suppress \
-Wl,-headerpad_max_install_names -shrext $(LIBEXT) -Wl,-framework,Carbon -Wl,-framework,System
-Index: debian.git/projects/mozilla/Makefile.in
-===================================================================
---- debian.git.orig/projects/mozilla/Makefile.in 2010-06-21 01:51:16.000000000 +0200
-+++ debian.git/projects/mozilla/Makefile.in 2010-06-23 00:47:04.684226299 +0200
-@@ -740,7 +740,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 \
-- at BUILD_MOZILLA_TRUE@@HAVE_DARWIN_TRUE@@HAVE_WIN32_FALSE@ -DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0
-+ at BUILD_MOZILLA_TRUE@@HAVE_DARWIN_TRUE@@HAVE_WIN32_FALSE@ -DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0 \
-+ at BUILD_MOZILLA_TRUE@@HAVE_DARWIN_TRUE@@HAVE_WIN32_FALSE@ -include mozilla-config.h
-
- @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 \
-Index: debian.git/projects/mozilla/control/npolibvlc.cpp
-===================================================================
---- debian.git.orig/projects/mozilla/control/npolibvlc.cpp 2010-04-27 23:44:27.000000000 +0200
-+++ debian.git/projects/mozilla/control/npolibvlc.cpp 2010-06-23 00:47:04.684226299 +0200
+--- a/projects/mozilla/control/npolibvlc.cpp
++++ b/projects/mozilla/control/npolibvlc.cpp
@@ -28,6 +28,11 @@
#include <string.h>
#include <stdlib.h>
@@ -409,10 +206,8 @@ Index: debian.git/projects/mozilla/control/npolibvlc.cpp
h+=len;
}
*h='\0';
-Index: debian.git/projects/mozilla/control/nporuntime.cpp
-===================================================================
---- debian.git.orig/projects/mozilla/control/nporuntime.cpp 2010-04-27 23:44:27.000000000 +0200
-+++ debian.git/projects/mozilla/control/nporuntime.cpp 2010-06-23 00:47:04.684226299 +0200
+--- a/projects/mozilla/control/nporuntime.cpp
++++ b/projects/mozilla/control/nporuntime.cpp
@@ -27,16 +27,21 @@
#include <string.h>
#include <stdlib.h>
@@ -438,10 +233,8 @@ Index: debian.git/projects/mozilla/control/nporuntime.cpp
}
return val;
}
-Index: debian.git/projects/mozilla/support/npmac.cpp
-===================================================================
---- debian.git.orig/projects/mozilla/support/npmac.cpp 2010-04-27 23:44:55.000000000 +0200
-+++ debian.git/projects/mozilla/support/npmac.cpp 2010-06-23 00:47:04.684226299 +0200
+--- a/projects/mozilla/support/npmac.cpp
++++ b/projects/mozilla/support/npmac.cpp
@@ -76,13 +76,10 @@
#undef XP_UNIX
#endif
@@ -925,10 +718,8 @@ Index: debian.git/projects/mozilla/support/npmac.cpp
}
//
-Index: debian.git/projects/mozilla/support/npunix.c
-===================================================================
---- debian.git.orig/projects/mozilla/support/npunix.c 2010-04-13 02:22:27.000000000 +0200
-+++ debian.git/projects/mozilla/support/npunix.c 2010-06-23 00:47:04.684226299 +0200
+--- a/projects/mozilla/support/npunix.c
++++ b/projects/mozilla/support/npunix.c
@@ -46,12 +46,13 @@
#include "config.h"
@@ -946,10 +737,8 @@ Index: debian.git/projects/mozilla/support/npunix.c
#endif
#include "../vlcshell.h"
-Index: debian.git/projects/mozilla/support/npwin.cpp
-===================================================================
---- debian.git.orig/projects/mozilla/support/npwin.cpp 2010-04-27 23:45:07.000000000 +0200
-+++ debian.git/projects/mozilla/support/npwin.cpp 2010-06-23 00:47:04.684226299 +0200
+--- a/projects/mozilla/support/npwin.cpp
++++ b/projects/mozilla/support/npwin.cpp
@@ -30,15 +30,19 @@
//#define OJI 1
@@ -983,10 +772,8 @@ Index: debian.git/projects/mozilla/support/npwin.cpp
{
return g_pNavigatorFuncs->memalloc(size);
}
-Index: debian.git/projects/mozilla/vlcplugin.cpp
-===================================================================
---- debian.git.orig/projects/mozilla/vlcplugin.cpp 2010-06-08 00:57:45.000000000 +0200
-+++ debian.git/projects/mozilla/vlcplugin.cpp 2010-06-23 00:47:04.684226299 +0200
+--- a/projects/mozilla/vlcplugin.cpp
++++ b/projects/mozilla/vlcplugin.cpp
@@ -28,11 +28,14 @@
*****************************************************************************/
#include "config.h"
@@ -1068,10 +855,8 @@ Index: debian.git/projects/mozilla/vlcplugin.cpp
}
}
NPN_ReleaseVariantValue(&result);
-Index: debian.git/projects/mozilla/vlcplugin.h
-===================================================================
---- debian.git.orig/projects/mozilla/vlcplugin.h 2010-05-20 18:25:11.000000000 +0200
-+++ debian.git/projects/mozilla/vlcplugin.h 2010-06-23 00:47:04.684226299 +0200
+--- a/projects/mozilla/vlcplugin.h
++++ b/projects/mozilla/vlcplugin.h
@@ -30,16 +30,10 @@
#define __VLCPLUGIN_H__
@@ -1137,10 +922,8 @@ Index: debian.git/projects/mozilla/vlcplugin.h
/* plugin properties */
int b_stream;
-Index: debian.git/projects/mozilla/vlcshell.cpp
-===================================================================
---- debian.git.orig/projects/mozilla/vlcshell.cpp 2010-05-03 11:26:24.000000000 +0200
-+++ debian.git/projects/mozilla/vlcshell.cpp 2010-06-23 00:47:04.684226299 +0200
+--- a/projects/mozilla/vlcshell.cpp
++++ b/projects/mozilla/vlcshell.cpp
@@ -31,6 +31,11 @@
#include <string.h>
#include <stdlib.h>
@@ -1215,10 +998,8 @@ Index: debian.git/projects/mozilla/vlcshell.cpp
{
/* TODO */
return len;
-Index: debian.git/projects/mozilla/vlcshell.h
-===================================================================
---- debian.git.orig/projects/mozilla/vlcshell.h 2010-04-27 23:44:27.000000000 +0200
-+++ debian.git/projects/mozilla/vlcshell.h 2010-06-23 00:47:04.684226299 +0200
+--- a/projects/mozilla/vlcshell.h
++++ b/projects/mozilla/vlcshell.h
@@ -27,20 +27,11 @@
char * NPP_GetMIMEDescription( void );
diff --git a/debian/patches/503_autoreconf.diff b/debian/patches/503_autoreconf.diff
new file mode 100644
index 0000000..d8e5ada
--- /dev/null
+++ b/debian/patches/503_autoreconf.diff
@@ -0,0 +1,10978 @@
+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
+ MINIZIP_CFLAGS
+ HAVE_ZLIB_FALSE
+ HAVE_ZLIB_TRUE
+-PKG_CONFIG_LIBDIR
+ PKG_CONFIG
+ PKG_CONFIG_PATH
+ BUILD_DIRENT_FALSE
+@@ -1545,7 +1544,6 @@ CONTRIB_DIR
+ CXXCPP
+ PKG_CONFIG_PATH
+ PKG_CONFIG
+-PKG_CONFIG_LIBDIR
+ MINIZIP_CFLAGS
+ MINIZIP_LIBS
+ DBUS_CFLAGS
+@@ -2581,8 +2579,6 @@ Some influential environment variables:
+ PKG_CONFIG_PATH
+ Paths where to find .pc not at the default location
+ PKG_CONFIG path to pkg-config utility
+- PKG_CONFIG_LIBDIR
+- path overriding pkg-config's built-in search path
+ MINIZIP_CFLAGS
+ C compiler flags for MINIZIP, overriding pkg-config
+ MINIZIP_LIBS
+@@ -10264,13 +10260,13 @@ if test "${lt_cv_nm_interface+set}" = se
+ 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: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: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: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*)
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 11475 "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
+ -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: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: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
+ -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: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: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
+ -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: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: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
+ -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: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: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
+ 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 16109 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -16206,7 +16202,7 @@ else
+ 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 16205 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -18162,11 +18158,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18165: $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: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
+ -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: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: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
+ -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: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: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
+
+
+
+-
+-
+-
+-
+ 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; }
+ $as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
++
+ fi
+
+ if test -n "${PKG_CONFIG}" ; then :
+@@ -24059,10 +24052,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MINIZIP" >&5
+ $as_echo_n "checking for MINIZIP... " >&6; }
+
+-if test -n "$MINIZIP_CFLAGS"; then
+- pkg_cv_MINIZIP_CFLAGS="$MINIZIP_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$MINIZIP_CFLAGS"; then
++ pkg_cv_MINIZIP_CFLAGS="$MINIZIP_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$MINIZIP_LIBS"; then
+- pkg_cv_MINIZIP_LIBS="$MINIZIP_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$MINIZIP_LIBS"; then
++ pkg_cv_MINIZIP_LIBS="$MINIZIP_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -24104,13 +24099,15 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- MINIZIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "minizip " 2>&1`
++ MINIZIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "minizip "`
+ else
+- MINIZIP_PKG_ERRORS=`$PKG_CONFIG --print-errors "minizip " 2>&1`
++ MINIZIP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "minizip "`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MINIZIP_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ for ac_header in unzip.h
+ do :
+@@ -24135,8 +24132,6 @@ done
+
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ for ac_header in unzip.h
+ do :
+@@ -24240,10 +24235,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
+ $as_echo_n "checking for DBUS... " >&6; }
+
+-if test -n "$DBUS_CFLAGS"; then
+- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DBUS_CFLAGS"; then
++ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$DBUS_LIBS"; then
+- pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DBUS_LIBS"; then
++ pkg_cv_DBUS_LIBS="$DBUS_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -24285,18 +24282,18 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 1.0.0" 2>&1`
++ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1 >= 1.0.0"`
+ else
+- DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 1.0.0" 2>&1`
++ DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 >= 1.0.0"`
+ fi
+ # 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_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
+
+ 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
+
+ else
+@@ -26098,10 +26095,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
+ $as_echo_n "checking for LUA... " >&6; }
+
+-if test -n "$LUA_CFLAGS"; then
+- pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LUA_CFLAGS"; then
++ pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LUA_LIBS"; then
+- pkg_cv_LUA_LIBS="$LUA_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LUA_LIBS"; then
++ pkg_cv_LUA_LIBS="$LUA_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -26143,13 +26142,15 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua5.1" 2>&1`
++ LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1"`
+ else
+- LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua5.1" 2>&1`
++ LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LUA_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ { $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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
+ $as_echo_n "checking for LUA... " >&6; }
+
+-if test -n "$LUA_CFLAGS"; then
+- pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LUA_CFLAGS"; then
++ pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LUA_LIBS"; then
+- pkg_cv_LUA_LIBS="$LUA_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LUA_LIBS"; then
++ pkg_cv_LUA_LIBS="$LUA_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -26203,13 +26206,15 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua >= 5.1" 2>&1`
++ LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua >= 5.1"`
+ else
+- LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua >= 5.1" 2>&1`
++ LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua >= 5.1"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LUA_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ have_lua=yes
+ for ac_header in lua.h lauxlib.h lualib.h
+@@ -26357,8 +26362,6 @@ fi
+
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ have_lua=yes
+ for ac_header in lua.h lauxlib.h lualib.h
+@@ -26514,8 +26517,6 @@ $as_echo "yes" >&6; }
+ fi
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ { $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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
+ $as_echo_n "checking for LUA... " >&6; }
+
+-if test -n "$LUA_CFLAGS"; then
+- pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LUA_CFLAGS"; then
++ pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LUA_LIBS"; then
+- pkg_cv_LUA_LIBS="$LUA_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LUA_LIBS"; then
++ pkg_cv_LUA_LIBS="$LUA_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -26569,13 +26572,15 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua >= 5.1" 2>&1`
++ LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua >= 5.1"`
+ else
+- LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua >= 5.1" 2>&1`
++ LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua >= 5.1"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LUA_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ have_lua=yes
+ for ac_header in lua.h lauxlib.h lualib.h
+@@ -26723,8 +26728,6 @@ fi
+
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ have_lua=yes
+ for ac_header in lua.h lauxlib.h lualib.h
+@@ -27003,10 +27006,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPROXY" >&5
+ $as_echo_n "checking for LIBPROXY... " >&6; }
+
+-if test -n "$LIBPROXY_CFLAGS"; then
+- pkg_cv_LIBPROXY_CFLAGS="$LIBPROXY_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBPROXY_CFLAGS"; then
++ pkg_cv_LIBPROXY_CFLAGS="$LIBPROXY_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LIBPROXY_LIBS"; then
+- pkg_cv_LIBPROXY_LIBS="$LIBPROXY_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBPROXY_LIBS"; then
++ pkg_cv_LIBPROXY_LIBS="$LIBPROXY_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -27048,13 +27053,15 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBPROXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libproxy-1.0" 2>&1`
++ LIBPROXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libproxy-1.0"`
+ else
+- LIBPROXY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libproxy-1.0" 2>&1`
++ LIBPROXY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libproxy-1.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBPROXY_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if test "x${enable_libproxy}" != "x"; then :
+
+@@ -27063,8 +27070,6 @@ fi
+ 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_libproxy}" != "x"; then :
+
+@@ -27217,10 +27222,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY" >&5
+ $as_echo_n "checking for NOTIFY... " >&6; }
+
+-if test -n "$NOTIFY_CFLAGS"; then
+- pkg_cv_NOTIFY_CFLAGS="$NOTIFY_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$NOTIFY_CFLAGS"; then
++ pkg_cv_NOTIFY_CFLAGS="$NOTIFY_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$NOTIFY_LIBS"; then
+- pkg_cv_NOTIFY_LIBS="$NOTIFY_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$NOTIFY_LIBS"; then
++ pkg_cv_NOTIFY_LIBS="$NOTIFY_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -27262,14 +27269,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- NOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify" 2>&1`
++ NOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify"`
+ else
+- NOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify" 2>&1`
++ NOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$NOTIFY_PKG_ERRORS" >&5
+
+- if test x"$enable_notify" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -27316,10 +27323,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY" >&5
+ $as_echo_n "checking for NOTIFY... " >&6; }
+
+-if test -n "$NOTIFY_CFLAGS"; then
+- pkg_cv_NOTIFY_CFLAGS="$NOTIFY_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$NOTIFY_CFLAGS"; then
++ pkg_cv_NOTIFY_CFLAGS="$NOTIFY_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$NOTIFY_LIBS"; then
+- pkg_cv_NOTIFY_LIBS="$NOTIFY_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$NOTIFY_LIBS"; then
++ pkg_cv_NOTIFY_LIBS="$NOTIFY_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -27361,14 +27370,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- NOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify" 2>&1`
++ NOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify"`
+ else
+- NOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify" 2>&1`
++ NOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$NOTIFY_PKG_ERRORS" >&5
+
+- enable_notify=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -27377,8 +27388,6 @@ $as_echo "$as_me: WARNING: Library libno
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for TAGLIB" >&5
+ $as_echo_n "checking for TAGLIB... " >&6; }
+
+-if test -n "$TAGLIB_CFLAGS"; then
+- pkg_cv_TAGLIB_CFLAGS="$TAGLIB_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$TAGLIB_CFLAGS"; then
++ pkg_cv_TAGLIB_CFLAGS="$TAGLIB_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$TAGLIB_LIBS"; then
+- pkg_cv_TAGLIB_LIBS="$TAGLIB_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$TAGLIB_LIBS"; then
++ pkg_cv_TAGLIB_LIBS="$TAGLIB_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -27487,18 +27498,18 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- TAGLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "taglib >= 1.5" 2>&1`
++ TAGLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "taglib >= 1.5"`
+ else
+- TAGLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "taglib >= 1.5" 2>&1`
++ TAGLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "taglib >= 1.5"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$TAGLIB_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: TagLib library not found" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: TagLib library not found" >&5
+ $as_echo "$as_me: WARNING: TagLib library not found" >&2;}
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+ { $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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DC1394" >&5
+ $as_echo_n "checking for DC1394... " >&6; }
+
+-if test -n "$DC1394_CFLAGS"; then
+- pkg_cv_DC1394_CFLAGS="$DC1394_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DC1394_CFLAGS"; then
++ pkg_cv_DC1394_CFLAGS="$DC1394_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$DC1394_LIBS"; then
+- pkg_cv_DC1394_LIBS="$DC1394_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DC1394_LIBS"; then
++ pkg_cv_DC1394_LIBS="$DC1394_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -27981,14 +27994,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DC1394_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0" 2>&1`
++ DC1394_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0"`
+ else
+- DC1394_PKG_ERRORS=`$PKG_CONFIG --print-errors "libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0" 2>&1`
++ DC1394_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DC1394_PKG_ERRORS" >&5
+
+- if test x"$enable_dc1394" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -28035,10 +28048,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DC1394" >&5
+ $as_echo_n "checking for DC1394... " >&6; }
+
+-if test -n "$DC1394_CFLAGS"; then
+- pkg_cv_DC1394_CFLAGS="$DC1394_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DC1394_CFLAGS"; then
++ pkg_cv_DC1394_CFLAGS="$DC1394_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$DC1394_LIBS"; then
+- pkg_cv_DC1394_LIBS="$DC1394_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DC1394_LIBS"; then
++ pkg_cv_DC1394_LIBS="$DC1394_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -28080,14 +28095,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DC1394_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0" 2>&1`
++ DC1394_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0"`
+ else
+- DC1394_PKG_ERRORS=`$PKG_CONFIG --print-errors "libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0" 2>&1`
++ DC1394_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DC1394_PKG_ERRORS" >&5
+
+- enable_dc1394=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -28096,8 +28113,6 @@ $as_echo "$as_me: WARNING: Library libra
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for DV" >&5
+ $as_echo_n "checking for DV... " >&6; }
+
+-if test -n "$DV_CFLAGS"; then
+- pkg_cv_DV_CFLAGS="$DV_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DV_CFLAGS"; then
++ pkg_cv_DV_CFLAGS="$DV_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$DV_LIBS"; then
+- pkg_cv_DV_LIBS="$DV_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DV_LIBS"; then
++ pkg_cv_DV_LIBS="$DV_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -28223,14 +28240,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3" 2>&1`
++ DV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3"`
+ else
+- DV_PKG_ERRORS=`$PKG_CONFIG --print-errors "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3" 2>&1`
++ DV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DV_PKG_ERRORS" >&5
+
+- if test x"$enable_dv" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -28277,10 +28294,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DV" >&5
+ $as_echo_n "checking for DV... " >&6; }
+
+-if test -n "$DV_CFLAGS"; then
+- pkg_cv_DV_CFLAGS="$DV_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DV_CFLAGS"; then
++ pkg_cv_DV_CFLAGS="$DV_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$DV_LIBS"; then
+- pkg_cv_DV_LIBS="$DV_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DV_LIBS"; then
++ pkg_cv_DV_LIBS="$DV_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -28322,14 +28341,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3" 2>&1`
++ DV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3"`
+ else
+- DV_PKG_ERRORS=`$PKG_CONFIG --print-errors "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3" 2>&1`
++ DV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DV_PKG_ERRORS" >&5
+
+- enable_dv=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -28338,8 +28359,6 @@ $as_echo "$as_me: WARNING: Library libra
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for OPENCV" >&5
+ $as_echo_n "checking for OPENCV... " >&6; }
+
+-if test -n "$OPENCV_CFLAGS"; then
+- pkg_cv_OPENCV_CFLAGS="$OPENCV_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$OPENCV_CFLAGS"; then
++ pkg_cv_OPENCV_CFLAGS="$OPENCV_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$OPENCV_LIBS"; then
+- pkg_cv_OPENCV_LIBS="$OPENCV_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$OPENCV_LIBS"; then
++ pkg_cv_OPENCV_LIBS="$OPENCV_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -28880,14 +28901,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- OPENCV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "opencv" 2>&1`
++ OPENCV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "opencv"`
+ else
+- OPENCV_PKG_ERRORS=`$PKG_CONFIG --print-errors "opencv" 2>&1`
++ OPENCV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "opencv"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$OPENCV_PKG_ERRORS" >&5
+
+- if test x"$enable_opencv" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -28944,10 +28965,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENCV" >&5
+ $as_echo_n "checking for OPENCV... " >&6; }
+
+-if test -n "$OPENCV_CFLAGS"; then
+- pkg_cv_OPENCV_CFLAGS="$OPENCV_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$OPENCV_CFLAGS"; then
++ pkg_cv_OPENCV_CFLAGS="$OPENCV_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$OPENCV_LIBS"; then
+- pkg_cv_OPENCV_LIBS="$OPENCV_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$OPENCV_LIBS"; then
++ pkg_cv_OPENCV_LIBS="$OPENCV_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -28989,14 +29012,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- OPENCV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "opencv" 2>&1`
++ OPENCV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "opencv"`
+ else
+- OPENCV_PKG_ERRORS=`$PKG_CONFIG --print-errors "opencv" 2>&1`
++ OPENCV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "opencv"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$OPENCV_PKG_ERRORS" >&5
+
+- enable_opencv=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -29005,8 +29030,6 @@ $as_echo "$as_me: WARNING: Library openc
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for LIBV4L" >&5
+ $as_echo_n "checking for LIBV4L... " >&6; }
+
+-if test -n "$LIBV4L_CFLAGS"; then
+- pkg_cv_LIBV4L_CFLAGS="$LIBV4L_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBV4L_CFLAGS"; then
++ pkg_cv_LIBV4L_CFLAGS="$LIBV4L_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LIBV4L_LIBS"; then
+- pkg_cv_LIBV4L_LIBS="$LIBV4L_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBV4L_LIBS"; then
++ pkg_cv_LIBV4L_LIBS="$LIBV4L_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -29554,19 +29579,19 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBV4L_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libv4l1" 2>&1`
++ LIBV4L_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libv4l1"`
+ else
+- LIBV4L_PKG_ERRORS=`$PKG_CONFIG --print-errors "libv4l1" 2>&1`
++ LIBV4L_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libv4l1"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBV4L_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: LibV4L support disabled because libv4l development headers were not found" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ { $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;}
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+ { $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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBV4L2" >&5
+ $as_echo_n "checking for LIBV4L2... " >&6; }
+
+-if test -n "$LIBV4L2_CFLAGS"; then
+- pkg_cv_LIBV4L2_CFLAGS="$LIBV4L2_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBV4L2_CFLAGS"; then
++ pkg_cv_LIBV4L2_CFLAGS="$LIBV4L2_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LIBV4L2_LIBS"; then
+- pkg_cv_LIBV4L2_LIBS="$LIBV4L2_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBV4L2_LIBS"; then
++ pkg_cv_LIBV4L2_LIBS="$LIBV4L2_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -29700,19 +29727,19 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBV4L2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libv4l2" 2>&1`
++ LIBV4L2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libv4l2"`
+ else
+- LIBV4L2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libv4l2" 2>&1`
++ LIBV4L2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libv4l2"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBV4L2_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: LibV4L2 support disabled because libv4l2 development headers were not found" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ { $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;}
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+ { $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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOMEVFS" >&5
+ $as_echo_n "checking for GNOMEVFS... " >&6; }
+
+-if test -n "$GNOMEVFS_CFLAGS"; then
+- pkg_cv_GNOMEVFS_CFLAGS="$GNOMEVFS_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GNOMEVFS_CFLAGS"; then
++ pkg_cv_GNOMEVFS_CFLAGS="$GNOMEVFS_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$GNOMEVFS_LIBS"; then
+- pkg_cv_GNOMEVFS_LIBS="$GNOMEVFS_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GNOMEVFS_LIBS"; then
++ pkg_cv_GNOMEVFS_LIBS="$GNOMEVFS_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -29884,14 +29913,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-vfs-2.0" 2>&1`
++ GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-vfs-2.0"`
+ else
+- GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-vfs-2.0" 2>&1`
++ GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-vfs-2.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GNOMEVFS_PKG_ERRORS" >&5
+
+- if test x"$enable_gnomevfs" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -29938,10 +29967,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOMEVFS" >&5
+ $as_echo_n "checking for GNOMEVFS... " >&6; }
+
+-if test -n "$GNOMEVFS_CFLAGS"; then
+- pkg_cv_GNOMEVFS_CFLAGS="$GNOMEVFS_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GNOMEVFS_CFLAGS"; then
++ pkg_cv_GNOMEVFS_CFLAGS="$GNOMEVFS_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$GNOMEVFS_LIBS"; then
+- pkg_cv_GNOMEVFS_LIBS="$GNOMEVFS_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GNOMEVFS_LIBS"; then
++ pkg_cv_GNOMEVFS_LIBS="$GNOMEVFS_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -29983,14 +30014,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-vfs-2.0" 2>&1`
++ GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-vfs-2.0"`
+ else
+- GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-vfs-2.0" 2>&1`
++ GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-vfs-2.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GNOMEVFS_PKG_ERRORS" >&5
+
+- enable_gnomevfs=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -29999,8 +30032,6 @@ $as_echo "$as_me: WARNING: Library gnome
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCDIO" >&5
+ $as_echo_n "checking for LIBCDIO... " >&6; }
+
+-if test -n "$LIBCDIO_CFLAGS"; then
+- pkg_cv_LIBCDIO_CFLAGS="$LIBCDIO_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBCDIO_CFLAGS"; then
++ pkg_cv_LIBCDIO_CFLAGS="$LIBCDIO_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LIBCDIO_LIBS"; then
+- pkg_cv_LIBCDIO_LIBS="$LIBCDIO_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBCDIO_LIBS"; then
++ pkg_cv_LIBCDIO_LIBS="$LIBCDIO_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -30109,17 +30142,17 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBCDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcdio >= 0.78.2 libiso9660 >= 0.72" 2>&1`
++ LIBCDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcdio >= 0.78.2 libiso9660 >= 0.72"`
+ else
+- LIBCDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcdio >= 0.78.2 libiso9660 >= 0.72" 2>&1`
++ LIBCDIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcdio >= 0.78.2 libiso9660 >= 0.72"`
+ fi
+ # 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
+-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
++elif test $pkg_failed = untried; then
+ 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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBVCDINFO" >&5
+ $as_echo_n "checking for LIBVCDINFO... " >&6; }
+
+-if test -n "$LIBVCDINFO_CFLAGS"; then
+- pkg_cv_LIBVCDINFO_CFLAGS="$LIBVCDINFO_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBVCDINFO_CFLAGS"; then
++ pkg_cv_LIBVCDINFO_CFLAGS="$LIBVCDINFO_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LIBVCDINFO_LIBS"; then
+- pkg_cv_LIBVCDINFO_LIBS="$LIBVCDINFO_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBVCDINFO_LIBS"; then
++ pkg_cv_LIBVCDINFO_LIBS="$LIBVCDINFO_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -30189,17 +30224,17 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBVCDINFO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libvcdinfo >= 0.7.22" 2>&1`
++ LIBVCDINFO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libvcdinfo >= 0.7.22"`
+ else
+- LIBVCDINFO_PKG_ERRORS=`$PKG_CONFIG --print-errors "libvcdinfo >= 0.7.22" 2>&1`
++ LIBVCDINFO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libvcdinfo >= 0.7.22"`
+ fi
+ # 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
+-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
++elif test $pkg_failed = untried; then
+ 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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCDDB" >&5
+ $as_echo_n "checking for LIBCDDB... " >&6; }
+
+-if test -n "$LIBCDDB_CFLAGS"; then
+- pkg_cv_LIBCDDB_CFLAGS="$LIBCDDB_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBCDDB_CFLAGS"; then
++ pkg_cv_LIBCDDB_CFLAGS="$LIBCDDB_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LIBCDDB_LIBS"; then
+- pkg_cv_LIBCDDB_LIBS="$LIBCDDB_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBCDDB_LIBS"; then
++ pkg_cv_LIBCDDB_LIBS="$LIBCDDB_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -30449,20 +30486,20 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBCDDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcddb >= 0.9.5" 2>&1`
++ LIBCDDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcddb >= 0.9.5"`
+ else
+- LIBCDDB_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcddb >= 0.9.5" 2>&1`
++ LIBCDDB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcddb >= 0.9.5"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBCDDB_PKG_ERRORS" >&5
+
+- :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ :
+ { $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;}
+ HAVE_LIBCDDB=no
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+ :
+ { $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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OGG" >&5
+ $as_echo_n "checking for OGG... " >&6; }
+
+-if test -n "$OGG_CFLAGS"; then
+- pkg_cv_OGG_CFLAGS="$OGG_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$OGG_CFLAGS"; then
++ pkg_cv_OGG_CFLAGS="$OGG_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$OGG_LIBS"; then
+- pkg_cv_OGG_LIBS="$OGG_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$OGG_LIBS"; then
++ pkg_cv_OGG_LIBS="$OGG_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -30796,14 +30835,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ogg >= 1.0" 2>&1`
++ OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ogg >= 1.0"`
+ else
+- OGG_PKG_ERRORS=`$PKG_CONFIG --print-errors "ogg >= 1.0" 2>&1`
++ OGG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ogg >= 1.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$OGG_PKG_ERRORS" >&5
+
+- if test x"$enable_ogg" = "xyes"; 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
+ 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 >
+
+ 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
+ else
+@@ -30850,10 +30889,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OGG" >&5
+ $as_echo_n "checking for OGG... " >&6; }
+
+-if test -n "$OGG_CFLAGS"; then
+- pkg_cv_OGG_CFLAGS="$OGG_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$OGG_CFLAGS"; then
++ pkg_cv_OGG_CFLAGS="$OGG_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$OGG_LIBS"; then
+- pkg_cv_OGG_LIBS="$OGG_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$OGG_LIBS"; then
++ pkg_cv_OGG_LIBS="$OGG_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -30895,14 +30936,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ogg >= 1.0" 2>&1`
++ OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ogg >= 1.0"`
+ else
+- OGG_PKG_ERRORS=`$PKG_CONFIG --print-errors "ogg >= 1.0" 2>&1`
++ OGG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ogg >= 1.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$OGG_PKG_ERRORS" >&5
+
+- enable_ogg=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -30911,8 +30954,6 @@ $as_echo "$as_me: WARNING: Library ogg >
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for MUX_OGG" >&5
+ $as_echo_n "checking for MUX_OGG... " >&6; }
+
+-if test -n "$MUX_OGG_CFLAGS"; then
+- pkg_cv_MUX_OGG_CFLAGS="$MUX_OGG_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$MUX_OGG_CFLAGS"; then
++ pkg_cv_MUX_OGG_CFLAGS="$MUX_OGG_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$MUX_OGG_LIBS"; then
+- pkg_cv_MUX_OGG_LIBS="$MUX_OGG_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$MUX_OGG_LIBS"; then
++ pkg_cv_MUX_OGG_LIBS="$MUX_OGG_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -31039,14 +31082,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- MUX_OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ogg >= 1.0" 2>&1`
++ MUX_OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ogg >= 1.0"`
+ else
+- MUX_OGG_PKG_ERRORS=`$PKG_CONFIG --print-errors "ogg >= 1.0" 2>&1`
++ MUX_OGG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ogg >= 1.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MUX_OGG_PKG_ERRORS" >&5
+
+- if test x"$enable_mux_ogg" = "xyes"; 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
+ 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 >
+
+ 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
+ else
+@@ -31093,10 +31136,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MUX_OGG" >&5
+ $as_echo_n "checking for MUX_OGG... " >&6; }
+
+-if test -n "$MUX_OGG_CFLAGS"; then
+- pkg_cv_MUX_OGG_CFLAGS="$MUX_OGG_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$MUX_OGG_CFLAGS"; then
++ pkg_cv_MUX_OGG_CFLAGS="$MUX_OGG_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$MUX_OGG_LIBS"; then
+- pkg_cv_MUX_OGG_LIBS="$MUX_OGG_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$MUX_OGG_LIBS"; then
++ pkg_cv_MUX_OGG_LIBS="$MUX_OGG_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -31138,14 +31183,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- MUX_OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ogg >= 1.0" 2>&1`
++ MUX_OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ogg >= 1.0"`
+ else
+- MUX_OGG_PKG_ERRORS=`$PKG_CONFIG --print-errors "ogg >= 1.0" 2>&1`
++ MUX_OGG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ogg >= 1.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MUX_OGG_PKG_ERRORS" >&5
+
+- enable_mux_ogg=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -31154,8 +31201,6 @@ $as_echo "$as_me: WARNING: Library ogg >
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for SHOUT" >&5
+ $as_echo_n "checking for SHOUT... " >&6; }
+
+-if test -n "$SHOUT_CFLAGS"; then
+- pkg_cv_SHOUT_CFLAGS="$SHOUT_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SHOUT_CFLAGS"; then
++ pkg_cv_SHOUT_CFLAGS="$SHOUT_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$SHOUT_LIBS"; then
+- pkg_cv_SHOUT_LIBS="$SHOUT_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SHOUT_LIBS"; then
++ pkg_cv_SHOUT_LIBS="$SHOUT_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -31284,14 +31331,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SHOUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "shout >= 2.1" 2>&1`
++ SHOUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "shout >= 2.1"`
+ else
+- SHOUT_PKG_ERRORS=`$PKG_CONFIG --print-errors "shout >= 2.1" 2>&1`
++ SHOUT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "shout >= 2.1"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SHOUT_PKG_ERRORS" >&5
+
+- if test x"$enable_shout" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -31338,10 +31385,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHOUT" >&5
+ $as_echo_n "checking for SHOUT... " >&6; }
+
+-if test -n "$SHOUT_CFLAGS"; then
+- pkg_cv_SHOUT_CFLAGS="$SHOUT_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SHOUT_CFLAGS"; then
++ pkg_cv_SHOUT_CFLAGS="$SHOUT_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$SHOUT_LIBS"; then
+- pkg_cv_SHOUT_LIBS="$SHOUT_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SHOUT_LIBS"; then
++ pkg_cv_SHOUT_LIBS="$SHOUT_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -31383,14 +31432,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SHOUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "shout >= 2.1" 2>&1`
++ SHOUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "shout >= 2.1"`
+ else
+- SHOUT_PKG_ERRORS=`$PKG_CONFIG --print-errors "shout >= 2.1" 2>&1`
++ SHOUT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "shout >= 2.1"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SHOUT_PKG_ERRORS" >&5
+
+- enable_shout=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -31399,8 +31450,6 @@ $as_echo "$as_me: WARNING: Library shout
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for LIBMODPLUG" >&5
+ $as_echo_n "checking for LIBMODPLUG... " >&6; }
+
+-if test -n "$LIBMODPLUG_CFLAGS"; then
+- pkg_cv_LIBMODPLUG_CFLAGS="$LIBMODPLUG_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBMODPLUG_CFLAGS"; then
++ pkg_cv_LIBMODPLUG_CFLAGS="$LIBMODPLUG_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LIBMODPLUG_LIBS"; then
+- pkg_cv_LIBMODPLUG_LIBS="$LIBMODPLUG_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBMODPLUG_LIBS"; then
++ pkg_cv_LIBMODPLUG_LIBS="$LIBMODPLUG_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -31726,13 +31777,15 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBMODPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libmodplug >= 0.8.4 libmodplug != 0.8.8" 2>&1`
++ LIBMODPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmodplug >= 0.8.4 libmodplug != 0.8.8"`
+ else
+- LIBMODPLUG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libmodplug >= 0.8.4 libmodplug != 0.8.8" 2>&1`
++ LIBMODPLUG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmodplug >= 0.8.4 libmodplug != 0.8.8"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBMODPLUG_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ 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_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_echo "$as_me:${as_lineno-$LINENO}: checking for AVCODEC" >&5
+ $as_echo_n "checking for AVCODEC... " >&6; }
+
+-if test -n "$AVCODEC_CFLAGS"; then
+- pkg_cv_AVCODEC_CFLAGS="$AVCODEC_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$AVCODEC_CFLAGS"; then
++ pkg_cv_AVCODEC_CFLAGS="$AVCODEC_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$AVCODEC_LIBS"; then
+- pkg_cv_AVCODEC_LIBS="$AVCODEC_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$AVCODEC_LIBS"; then
++ pkg_cv_AVCODEC_LIBS="$AVCODEC_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -32286,19 +32339,19 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- AVCODEC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavcodec >= 51.48.0 libavutil" 2>&1`
++ AVCODEC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libavcodec >= 51.48.0 libavutil"`
+ else
+- AVCODEC_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavcodec >= 51.48.0 libavutil" 2>&1`
++ AVCODEC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libavcodec >= 51.48.0 libavutil"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$AVCODEC_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ 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
+
+@@ -32398,10 +32451,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBVA" >&5
+ $as_echo_n "checking for LIBVA... " >&6; }
+
+-if test -n "$LIBVA_CFLAGS"; then
+- pkg_cv_LIBVA_CFLAGS="$LIBVA_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBVA_CFLAGS"; then
++ pkg_cv_LIBVA_CFLAGS="$LIBVA_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LIBVA_LIBS"; then
+- pkg_cv_LIBVA_LIBS="$LIBVA_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBVA_LIBS"; then
++ pkg_cv_LIBVA_LIBS="$LIBVA_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -32443,13 +32498,15 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBVA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libva libva-x11" 2>&1`
++ LIBVA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libva libva-x11"`
+ else
+- LIBVA_PKG_ERRORS=`$PKG_CONFIG --print-errors "libva libva-x11" 2>&1`
++ LIBVA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libva libva-x11"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBVA_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ fi
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for AVFORMAT" >&5
+ $as_echo_n "checking for AVFORMAT... " >&6; }
+
+-if test -n "$AVFORMAT_CFLAGS"; then
+- pkg_cv_AVFORMAT_CFLAGS="$AVFORMAT_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$AVFORMAT_CFLAGS"; then
++ pkg_cv_AVFORMAT_CFLAGS="$AVFORMAT_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$AVFORMAT_LIBS"; then
+- pkg_cv_AVFORMAT_LIBS="$AVFORMAT_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$AVFORMAT_LIBS"; then
++ pkg_cv_AVFORMAT_LIBS="$AVFORMAT_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -32725,19 +32782,19 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- AVFORMAT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavformat libavcodec libavutil" 2>&1`
++ AVFORMAT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libavformat libavcodec libavutil"`
+ else
+- AVFORMAT_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavformat libavcodec libavutil" 2>&1`
++ AVFORMAT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libavformat libavcodec libavutil"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$AVFORMAT_PKG_ERRORS" >&5
+
++ { $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
+
+ 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
+
+@@ -32862,10 +32919,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SWSCALE" >&5
+ $as_echo_n "checking for SWSCALE... " >&6; }
+
+-if test -n "$SWSCALE_CFLAGS"; then
+- pkg_cv_SWSCALE_CFLAGS="$SWSCALE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SWSCALE_CFLAGS"; then
++ pkg_cv_SWSCALE_CFLAGS="$SWSCALE_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$SWSCALE_LIBS"; then
+- pkg_cv_SWSCALE_LIBS="$SWSCALE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SWSCALE_LIBS"; then
++ pkg_cv_SWSCALE_LIBS="$SWSCALE_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -32907,19 +32966,19 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SWSCALE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libswscale" 2>&1`
++ SWSCALE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libswscale"`
+ else
+- SWSCALE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libswscale" 2>&1`
++ SWSCALE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libswscale"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SWSCALE_PKG_ERRORS" >&5
+
++ { $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
+
+ 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
+
+@@ -32997,10 +33056,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSTPROC" >&5
+ $as_echo_n "checking for POSTPROC... " >&6; }
+
+-if test -n "$POSTPROC_CFLAGS"; then
+- pkg_cv_POSTPROC_CFLAGS="$POSTPROC_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$POSTPROC_CFLAGS"; then
++ pkg_cv_POSTPROC_CFLAGS="$POSTPROC_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$POSTPROC_LIBS"; then
+- pkg_cv_POSTPROC_LIBS="$POSTPROC_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$POSTPROC_LIBS"; then
++ pkg_cv_POSTPROC_LIBS="$POSTPROC_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -33042,19 +33103,19 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- POSTPROC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpostproc libavutil" 2>&1`
++ POSTPROC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpostproc libavutil"`
+ else
+- POSTPROC_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpostproc libavutil" 2>&1`
++ POSTPROC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpostproc libavutil"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$POSTPROC_PKG_ERRORS" >&5
+
++ { $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
+
+ 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
+
+@@ -33331,10 +33392,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TWOLAME" >&5
+ $as_echo_n "checking for TWOLAME... " >&6; }
+
+-if test -n "$TWOLAME_CFLAGS"; then
+- pkg_cv_TWOLAME_CFLAGS="$TWOLAME_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$TWOLAME_CFLAGS"; then
++ pkg_cv_TWOLAME_CFLAGS="$TWOLAME_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$TWOLAME_LIBS"; then
+- pkg_cv_TWOLAME_LIBS="$TWOLAME_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$TWOLAME_LIBS"; then
++ pkg_cv_TWOLAME_LIBS="$TWOLAME_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -33376,14 +33439,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- TWOLAME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "twolame" 2>&1`
++ TWOLAME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "twolame"`
+ else
+- TWOLAME_PKG_ERRORS=`$PKG_CONFIG --print-errors "twolame" 2>&1`
++ TWOLAME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "twolame"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$TWOLAME_PKG_ERRORS" >&5
+
+- if test x"$enable_twolame" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -33435,10 +33498,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TWOLAME" >&5
+ $as_echo_n "checking for TWOLAME... " >&6; }
+
+-if test -n "$TWOLAME_CFLAGS"; then
+- pkg_cv_TWOLAME_CFLAGS="$TWOLAME_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$TWOLAME_CFLAGS"; then
++ pkg_cv_TWOLAME_CFLAGS="$TWOLAME_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$TWOLAME_LIBS"; then
+- pkg_cv_TWOLAME_LIBS="$TWOLAME_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$TWOLAME_LIBS"; then
++ pkg_cv_TWOLAME_LIBS="$TWOLAME_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -33480,14 +33545,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- TWOLAME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "twolame" 2>&1`
++ TWOLAME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "twolame"`
+ else
+- TWOLAME_PKG_ERRORS=`$PKG_CONFIG --print-errors "twolame" 2>&1`
++ TWOLAME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "twolame"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$TWOLAME_PKG_ERRORS" >&5
+
+- enable_twolame=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -33496,8 +33563,6 @@ $as_echo "$as_me: WARNING: Library twola
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for DCA" >&5
+ $as_echo_n "checking for DCA... " >&6; }
+
+-if test -n "$DCA_CFLAGS"; then
+- pkg_cv_DCA_CFLAGS="$DCA_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DCA_CFLAGS"; then
++ pkg_cv_DCA_CFLAGS="$DCA_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$DCA_LIBS"; then
+- pkg_cv_DCA_LIBS="$DCA_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DCA_LIBS"; then
++ pkg_cv_DCA_LIBS="$DCA_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -33966,14 +34033,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DCA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libdca >= 0.0.5" 2>&1`
++ DCA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdca >= 0.0.5"`
+ else
+- DCA_PKG_ERRORS=`$PKG_CONFIG --print-errors "libdca >= 0.0.5" 2>&1`
++ DCA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdca >= 0.0.5"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DCA_PKG_ERRORS" >&5
+
+- if test x"$enable_dca" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -34020,10 +34087,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DCA" >&5
+ $as_echo_n "checking for DCA... " >&6; }
+
+-if test -n "$DCA_CFLAGS"; then
+- pkg_cv_DCA_CFLAGS="$DCA_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DCA_CFLAGS"; then
++ pkg_cv_DCA_CFLAGS="$DCA_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$DCA_LIBS"; then
+- pkg_cv_DCA_LIBS="$DCA_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DCA_LIBS"; then
++ pkg_cv_DCA_LIBS="$DCA_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -34065,14 +34134,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DCA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libdca >= 0.0.5" 2>&1`
++ DCA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdca >= 0.0.5"`
+ else
+- DCA_PKG_ERRORS=`$PKG_CONFIG --print-errors "libdca >= 0.0.5" 2>&1`
++ DCA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdca >= 0.0.5"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DCA_PKG_ERRORS" >&5
+
+- enable_dca=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -34081,8 +34152,6 @@ $as_echo "$as_me: WARNING: Library libdc
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for FLAC" >&5
+ $as_echo_n "checking for FLAC... " >&6; }
+
+-if test -n "$FLAC_CFLAGS"; then
+- pkg_cv_FLAC_CFLAGS="$FLAC_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$FLAC_CFLAGS"; then
++ pkg_cv_FLAC_CFLAGS="$FLAC_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$FLAC_LIBS"; then
+- pkg_cv_FLAC_LIBS="$FLAC_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$FLAC_LIBS"; then
++ pkg_cv_FLAC_LIBS="$FLAC_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -34209,14 +34280,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- FLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "flac" 2>&1`
++ FLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "flac"`
+ else
+- FLAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "flac" 2>&1`
++ FLAC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "flac"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$FLAC_PKG_ERRORS" >&5
+
+- if test x"$enable_flac" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -34263,10 +34334,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLAC" >&5
+ $as_echo_n "checking for FLAC... " >&6; }
+
+-if test -n "$FLAC_CFLAGS"; then
+- pkg_cv_FLAC_CFLAGS="$FLAC_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$FLAC_CFLAGS"; then
++ pkg_cv_FLAC_CFLAGS="$FLAC_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$FLAC_LIBS"; then
+- pkg_cv_FLAC_LIBS="$FLAC_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$FLAC_LIBS"; then
++ pkg_cv_FLAC_LIBS="$FLAC_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -34308,14 +34381,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- FLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "flac" 2>&1`
++ FLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "flac"`
+ else
+- FLAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "flac" 2>&1`
++ FLAC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "flac"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$FLAC_PKG_ERRORS" >&5
+
+- enable_flac=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -34324,8 +34399,6 @@ $as_echo "$as_me: WARNING: Library flac
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for LIBMPEG2" >&5
+ $as_echo_n "checking for LIBMPEG2... " >&6; }
+
+-if test -n "$LIBMPEG2_CFLAGS"; then
+- pkg_cv_LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBMPEG2_CFLAGS"; then
++ pkg_cv_LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LIBMPEG2_LIBS"; then
+- pkg_cv_LIBMPEG2_LIBS="$LIBMPEG2_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBMPEG2_LIBS"; then
++ pkg_cv_LIBMPEG2_LIBS="$LIBMPEG2_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -34452,14 +34527,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBMPEG2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libmpeg2 > 0.3.2" 2>&1`
++ LIBMPEG2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmpeg2 > 0.3.2"`
+ else
+- LIBMPEG2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libmpeg2 > 0.3.2" 2>&1`
++ LIBMPEG2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmpeg2 > 0.3.2"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBMPEG2_PKG_ERRORS" >&5
+
+- if test x"$enable_libmpeg2" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -34506,10 +34581,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBMPEG2" >&5
+ $as_echo_n "checking for LIBMPEG2... " >&6; }
+
+-if test -n "$LIBMPEG2_CFLAGS"; then
+- pkg_cv_LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBMPEG2_CFLAGS"; then
++ pkg_cv_LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LIBMPEG2_LIBS"; then
+- pkg_cv_LIBMPEG2_LIBS="$LIBMPEG2_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBMPEG2_LIBS"; then
++ pkg_cv_LIBMPEG2_LIBS="$LIBMPEG2_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -34551,14 +34628,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBMPEG2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libmpeg2 > 0.3.2" 2>&1`
++ LIBMPEG2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmpeg2 > 0.3.2"`
+ else
+- LIBMPEG2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libmpeg2 > 0.3.2" 2>&1`
++ LIBMPEG2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmpeg2 > 0.3.2"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBMPEG2_PKG_ERRORS" >&5
+
+- enable_libmpeg2=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -34567,8 +34646,6 @@ $as_echo "$as_me: WARNING: Library libmp
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for VORBIS" >&5
+ $as_echo_n "checking for VORBIS... " >&6; }
+
+-if test -n "$VORBIS_CFLAGS"; then
+- pkg_cv_VORBIS_CFLAGS="$VORBIS_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$VORBIS_CFLAGS"; then
++ pkg_cv_VORBIS_CFLAGS="$VORBIS_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$VORBIS_LIBS"; then
+- pkg_cv_VORBIS_LIBS="$VORBIS_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$VORBIS_LIBS"; then
++ pkg_cv_VORBIS_LIBS="$VORBIS_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -34695,14 +34774,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ogg vorbis >= 1.1 vorbisenc >= 1.1" 2>&1`
++ VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ogg vorbis >= 1.1 vorbisenc >= 1.1"`
+ else
+- VORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors "ogg vorbis >= 1.1 vorbisenc >= 1.1" 2>&1`
++ VORBIS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ogg vorbis >= 1.1 vorbisenc >= 1.1"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$VORBIS_PKG_ERRORS" >&5
+
+- if test x"$enable_vorbis" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -34749,10 +34828,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for VORBIS" >&5
+ $as_echo_n "checking for VORBIS... " >&6; }
+
+-if test -n "$VORBIS_CFLAGS"; then
+- pkg_cv_VORBIS_CFLAGS="$VORBIS_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$VORBIS_CFLAGS"; then
++ pkg_cv_VORBIS_CFLAGS="$VORBIS_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$VORBIS_LIBS"; then
+- pkg_cv_VORBIS_LIBS="$VORBIS_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$VORBIS_LIBS"; then
++ pkg_cv_VORBIS_LIBS="$VORBIS_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -34794,14 +34875,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ogg vorbis >= 1.1 vorbisenc >= 1.1" 2>&1`
++ VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ogg vorbis >= 1.1 vorbisenc >= 1.1"`
+ else
+- VORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors "ogg vorbis >= 1.1 vorbisenc >= 1.1" 2>&1`
++ VORBIS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ogg vorbis >= 1.1 vorbisenc >= 1.1"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$VORBIS_PKG_ERRORS" >&5
+
+- enable_vorbis=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -34810,8 +34893,6 @@ $as_echo "$as_me: WARNING: Library ogg v
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for SPEEX" >&5
+ $as_echo_n "checking for SPEEX... " >&6; }
+
+-if test -n "$SPEEX_CFLAGS"; then
+- pkg_cv_SPEEX_CFLAGS="$SPEEX_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SPEEX_CFLAGS"; then
++ pkg_cv_SPEEX_CFLAGS="$SPEEX_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$SPEEX_LIBS"; then
+- pkg_cv_SPEEX_LIBS="$SPEEX_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SPEEX_LIBS"; then
++ pkg_cv_SPEEX_LIBS="$SPEEX_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -34973,14 +35056,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SPEEX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ogg speex >= 1.0.5" 2>&1`
++ SPEEX_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ogg speex >= 1.0.5"`
+ else
+- SPEEX_PKG_ERRORS=`$PKG_CONFIG --print-errors "ogg speex >= 1.0.5" 2>&1`
++ SPEEX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ogg speex >= 1.0.5"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SPEEX_PKG_ERRORS" >&5
+
+- if test x"$enable_speex" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -35027,10 +35110,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPEEX" >&5
+ $as_echo_n "checking for SPEEX... " >&6; }
+
+-if test -n "$SPEEX_CFLAGS"; then
+- pkg_cv_SPEEX_CFLAGS="$SPEEX_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SPEEX_CFLAGS"; then
++ pkg_cv_SPEEX_CFLAGS="$SPEEX_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$SPEEX_LIBS"; then
+- pkg_cv_SPEEX_LIBS="$SPEEX_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SPEEX_LIBS"; then
++ pkg_cv_SPEEX_LIBS="$SPEEX_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -35072,14 +35157,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SPEEX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ogg speex >= 1.0.5" 2>&1`
++ SPEEX_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ogg speex >= 1.0.5"`
+ else
+- SPEEX_PKG_ERRORS=`$PKG_CONFIG --print-errors "ogg speex >= 1.0.5" 2>&1`
++ SPEEX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ogg speex >= 1.0.5"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SPEEX_PKG_ERRORS" >&5
+
+- enable_speex=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -35088,8 +35175,6 @@ $as_echo "$as_me: WARNING: Library ogg s
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for THEORA" >&5
+ $as_echo_n "checking for THEORA... " >&6; }
+
+-if test -n "$THEORA_CFLAGS"; then
+- pkg_cv_THEORA_CFLAGS="$THEORA_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$THEORA_CFLAGS"; then
++ pkg_cv_THEORA_CFLAGS="$THEORA_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$THEORA_LIBS"; then
+- pkg_cv_THEORA_LIBS="$THEORA_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$THEORA_LIBS"; then
++ pkg_cv_THEORA_LIBS="$THEORA_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -35216,14 +35303,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ogg theora >= 1.0" 2>&1`
++ THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ogg theora >= 1.0"`
+ else
+- THEORA_PKG_ERRORS=`$PKG_CONFIG --print-errors "ogg theora >= 1.0" 2>&1`
++ THEORA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ogg theora >= 1.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$THEORA_PKG_ERRORS" >&5
+
+- if test x"$enable_theora" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -35270,10 +35357,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for THEORA" >&5
+ $as_echo_n "checking for THEORA... " >&6; }
+
+-if test -n "$THEORA_CFLAGS"; then
+- pkg_cv_THEORA_CFLAGS="$THEORA_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$THEORA_CFLAGS"; then
++ pkg_cv_THEORA_CFLAGS="$THEORA_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$THEORA_LIBS"; then
+- pkg_cv_THEORA_LIBS="$THEORA_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$THEORA_LIBS"; then
++ pkg_cv_THEORA_LIBS="$THEORA_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -35315,14 +35404,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ogg theora >= 1.0" 2>&1`
++ THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ogg theora >= 1.0"`
+ else
+- THEORA_PKG_ERRORS=`$PKG_CONFIG --print-errors "ogg theora >= 1.0" 2>&1`
++ THEORA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ogg theora >= 1.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$THEORA_PKG_ERRORS" >&5
+
+- enable_theora=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -35331,8 +35422,6 @@ $as_echo "$as_me: WARNING: Library ogg t
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for DIRAC" >&5
+ $as_echo_n "checking for DIRAC... " >&6; }
+
+-if test -n "$DIRAC_CFLAGS"; then
+- pkg_cv_DIRAC_CFLAGS="$DIRAC_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DIRAC_CFLAGS"; then
++ pkg_cv_DIRAC_CFLAGS="$DIRAC_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$DIRAC_LIBS"; then
+- pkg_cv_DIRAC_LIBS="$DIRAC_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DIRAC_LIBS"; then
++ pkg_cv_DIRAC_LIBS="$DIRAC_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -35459,14 +35550,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DIRAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dirac >= 0.10.0" 2>&1`
++ DIRAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dirac >= 0.10.0"`
+ else
+- DIRAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "dirac >= 0.10.0" 2>&1`
++ DIRAC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dirac >= 0.10.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DIRAC_PKG_ERRORS" >&5
+
+- if test x"$enable_dirac" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -35513,10 +35604,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIRAC" >&5
+ $as_echo_n "checking for DIRAC... " >&6; }
+
+-if test -n "$DIRAC_CFLAGS"; then
+- pkg_cv_DIRAC_CFLAGS="$DIRAC_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DIRAC_CFLAGS"; then
++ pkg_cv_DIRAC_CFLAGS="$DIRAC_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$DIRAC_LIBS"; then
+- pkg_cv_DIRAC_LIBS="$DIRAC_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DIRAC_LIBS"; then
++ pkg_cv_DIRAC_LIBS="$DIRAC_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -35558,14 +35651,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DIRAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dirac >= 0.10.0" 2>&1`
++ DIRAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dirac >= 0.10.0"`
+ else
+- DIRAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "dirac >= 0.10.0" 2>&1`
++ DIRAC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dirac >= 0.10.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DIRAC_PKG_ERRORS" >&5
+
+- enable_dirac=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -35574,8 +35669,6 @@ $as_echo "$as_me: WARNING: Library dirac
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for SCHROEDINGER" >&5
+ $as_echo_n "checking for SCHROEDINGER... " >&6; }
+
+-if test -n "$SCHROEDINGER_CFLAGS"; then
+- pkg_cv_SCHROEDINGER_CFLAGS="$SCHROEDINGER_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SCHROEDINGER_CFLAGS"; then
++ pkg_cv_SCHROEDINGER_CFLAGS="$SCHROEDINGER_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$SCHROEDINGER_LIBS"; then
+- pkg_cv_SCHROEDINGER_LIBS="$SCHROEDINGER_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SCHROEDINGER_LIBS"; then
++ pkg_cv_SCHROEDINGER_LIBS="$SCHROEDINGER_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -35702,14 +35797,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SCHROEDINGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "schroedinger-1.0 >= 1.0.6" 2>&1`
++ SCHROEDINGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "schroedinger-1.0 >= 1.0.6"`
+ else
+- SCHROEDINGER_PKG_ERRORS=`$PKG_CONFIG --print-errors "schroedinger-1.0 >= 1.0.6" 2>&1`
++ SCHROEDINGER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "schroedinger-1.0 >= 1.0.6"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SCHROEDINGER_PKG_ERRORS" >&5
+
+- if test x"$enable_schroedinger" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -35756,10 +35851,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCHROEDINGER" >&5
+ $as_echo_n "checking for SCHROEDINGER... " >&6; }
+
+-if test -n "$SCHROEDINGER_CFLAGS"; then
+- pkg_cv_SCHROEDINGER_CFLAGS="$SCHROEDINGER_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SCHROEDINGER_CFLAGS"; then
++ pkg_cv_SCHROEDINGER_CFLAGS="$SCHROEDINGER_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$SCHROEDINGER_LIBS"; then
+- pkg_cv_SCHROEDINGER_LIBS="$SCHROEDINGER_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SCHROEDINGER_LIBS"; then
++ pkg_cv_SCHROEDINGER_LIBS="$SCHROEDINGER_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -35801,14 +35898,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SCHROEDINGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "schroedinger-1.0 >= 1.0.6" 2>&1`
++ SCHROEDINGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "schroedinger-1.0 >= 1.0.6"`
+ else
+- SCHROEDINGER_PKG_ERRORS=`$PKG_CONFIG --print-errors "schroedinger-1.0 >= 1.0.6" 2>&1`
++ SCHROEDINGER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "schroedinger-1.0 >= 1.0.6"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SCHROEDINGER_PKG_ERRORS" >&5
+
+- enable_schroedinger=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -35817,8 +35916,6 @@ $as_echo "$as_me: WARNING: Library schro
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for X264" >&5
+ $as_echo_n "checking for X264... " >&6; }
+
+-if test -n "$X264_CFLAGS"; then
+- pkg_cv_X264_CFLAGS="$X264_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$X264_CFLAGS"; then
++ pkg_cv_X264_CFLAGS="$X264_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$X264_LIBS"; then
+- pkg_cv_X264_LIBS="$X264_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$X264_LIBS"; then
++ pkg_cv_X264_LIBS="$X264_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -36050,19 +36149,19 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- X264_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x264" 2>&1`
++ X264_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x264"`
+ else
+- X264_PKG_ERRORS=`$PKG_CONFIG --print-errors "x264" 2>&1`
++ X264_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x264"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$X264_PKG_ERRORS" >&5
+
++ { $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
+
+ 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
+
+@@ -36113,10 +36212,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X264" >&5
+ $as_echo_n "checking for X264... " >&6; }
+
+-if test -n "$X264_CFLAGS"; then
+- pkg_cv_X264_CFLAGS="$X264_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$X264_CFLAGS"; then
++ pkg_cv_X264_CFLAGS="$X264_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$X264_LIBS"; then
+- pkg_cv_X264_LIBS="$X264_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$X264_LIBS"; then
++ pkg_cv_X264_LIBS="$X264_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -36158,21 +36259,21 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- X264_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x264 >= 0.76" 2>&1`
++ X264_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x264 >= 0.76"`
+ else
+- X264_PKG_ERRORS=`$PKG_CONFIG --print-errors "x264 >= 0.76" 2>&1`
++ X264_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x264 >= 0.76"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$X264_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ fi
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for FLUIDSYNTH" >&5
+ $as_echo_n "checking for FLUIDSYNTH... " >&6; }
+
+-if test -n "$FLUIDSYNTH_CFLAGS"; then
+- pkg_cv_FLUIDSYNTH_CFLAGS="$FLUIDSYNTH_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$FLUIDSYNTH_CFLAGS"; then
++ pkg_cv_FLUIDSYNTH_CFLAGS="$FLUIDSYNTH_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$FLUIDSYNTH_LIBS"; then
+- pkg_cv_FLUIDSYNTH_LIBS="$FLUIDSYNTH_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$FLUIDSYNTH_LIBS"; then
++ pkg_cv_FLUIDSYNTH_LIBS="$FLUIDSYNTH_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -36334,14 +36437,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fluidsynth" 2>&1`
++ FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "fluidsynth"`
+ else
+- FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --print-errors "fluidsynth" 2>&1`
++ FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fluidsynth"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$FLUIDSYNTH_PKG_ERRORS" >&5
+
+- if test x"$enable_fluidsynth" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -36388,10 +36491,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLUIDSYNTH" >&5
+ $as_echo_n "checking for FLUIDSYNTH... " >&6; }
+
+-if test -n "$FLUIDSYNTH_CFLAGS"; then
+- pkg_cv_FLUIDSYNTH_CFLAGS="$FLUIDSYNTH_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$FLUIDSYNTH_CFLAGS"; then
++ pkg_cv_FLUIDSYNTH_CFLAGS="$FLUIDSYNTH_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$FLUIDSYNTH_LIBS"; then
+- pkg_cv_FLUIDSYNTH_LIBS="$FLUIDSYNTH_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$FLUIDSYNTH_LIBS"; then
++ pkg_cv_FLUIDSYNTH_LIBS="$FLUIDSYNTH_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -36433,14 +36538,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fluidsynth" 2>&1`
++ FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "fluidsynth"`
+ else
+- FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --print-errors "fluidsynth" 2>&1`
++ FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fluidsynth"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$FLUIDSYNTH_PKG_ERRORS" >&5
+
+- enable_fluidsynth=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -36449,8 +36556,6 @@ $as_echo "$as_me: WARNING: Library fluid
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for ZVBI" >&5
+ $as_echo_n "checking for ZVBI... " >&6; }
+
+-if test -n "$ZVBI_CFLAGS"; then
+- pkg_cv_ZVBI_CFLAGS="$ZVBI_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$ZVBI_CFLAGS"; then
++ pkg_cv_ZVBI_CFLAGS="$ZVBI_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$ZVBI_LIBS"; then
+- pkg_cv_ZVBI_LIBS="$ZVBI_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$ZVBI_LIBS"; then
++ pkg_cv_ZVBI_LIBS="$ZVBI_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -36564,20 +36671,20 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- ZVBI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "zvbi-0.2 >= 0.2.28" 2>&1`
++ ZVBI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "zvbi-0.2 >= 0.2.28"`
+ else
+- ZVBI_PKG_ERRORS=`$PKG_CONFIG --print-errors "zvbi-0.2 >= 0.2.28" 2>&1`
++ ZVBI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "zvbi-0.2 >= 0.2.28"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$ZVBI_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ { $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;}
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ { $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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBASS" >&5
+ $as_echo_n "checking for LIBASS... " >&6; }
+
+-if test -n "$LIBASS_CFLAGS"; then
+- pkg_cv_LIBASS_CFLAGS="$LIBASS_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBASS_CFLAGS"; then
++ pkg_cv_LIBASS_CFLAGS="$LIBASS_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LIBASS_LIBS"; then
+- pkg_cv_LIBASS_LIBS="$LIBASS_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBASS_LIBS"; then
++ pkg_cv_LIBASS_LIBS="$LIBASS_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -36699,20 +36808,20 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBASS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libass >= 0.9.6" 2>&1`
++ LIBASS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libass >= 0.9.6"`
+ else
+- LIBASS_PKG_ERRORS=`$PKG_CONFIG --print-errors "libass >= 0.9.6" 2>&1`
++ LIBASS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libass >= 0.9.6"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBASS_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: LIBASS library not found" >&5
+ $as_echo "$as_me: WARNING: LIBASS library not found" >&2;}
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ { $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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCRE" >&5
+ $as_echo_n "checking for PCRE... " >&6; }
+
+-if test -n "$PCRE_CFLAGS"; then
+- pkg_cv_PCRE_CFLAGS="$PCRE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$PCRE_CFLAGS"; then
++ pkg_cv_PCRE_CFLAGS="$PCRE_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$PCRE_LIBS"; then
+- pkg_cv_PCRE_LIBS="$PCRE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$PCRE_LIBS"; then
++ pkg_cv_PCRE_LIBS="$PCRE_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -36829,20 +36940,20 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- PCRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpcre >= 6.5" 2>&1`
++ PCRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpcre >= 6.5"`
+ else
+- PCRE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpcre >= 6.5" 2>&1`
++ PCRE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpcre >= 6.5"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PCRE_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ { $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;}
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ { $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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KATE" >&5
+ $as_echo_n "checking for KATE... " >&6; }
+
+-if test -n "$KATE_CFLAGS"; then
+- pkg_cv_KATE_CFLAGS="$KATE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$KATE_CFLAGS"; then
++ pkg_cv_KATE_CFLAGS="$KATE_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$KATE_LIBS"; then
+- pkg_cv_KATE_LIBS="$KATE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$KATE_LIBS"; then
++ pkg_cv_KATE_LIBS="$KATE_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -36942,13 +37055,15 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- KATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "kate >= 0.1.5" 2>&1`
++ KATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "kate >= 0.1.5"`
+ else
+- KATE_PKG_ERRORS=`$PKG_CONFIG --print-errors "kate >= 0.1.5" 2>&1`
++ KATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "kate >= 0.1.5"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$KATE_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ for ac_header in kate/kate.h
+ do :
+@@ -37037,8 +37152,6 @@ done
+
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ for ac_header in kate/kate.h
+ do :
+@@ -37168,10 +37281,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIGER" >&5
+ $as_echo_n "checking for TIGER... " >&6; }
+
+-if test -n "$TIGER_CFLAGS"; then
+- pkg_cv_TIGER_CFLAGS="$TIGER_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$TIGER_CFLAGS"; then
++ pkg_cv_TIGER_CFLAGS="$TIGER_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$TIGER_LIBS"; then
+- pkg_cv_TIGER_LIBS="$TIGER_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$TIGER_LIBS"; then
++ pkg_cv_TIGER_LIBS="$TIGER_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -37213,13 +37328,15 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- TIGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tiger >= 0.3.1" 2>&1`
++ TIGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tiger >= 0.3.1"`
+ else
+- TIGER_PKG_ERRORS=`$PKG_CONFIG --print-errors "tiger >= 0.3.1" 2>&1`
++ TIGER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tiger >= 0.3.1"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$TIGER_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if test "x${enable_tiger}" != "x"; then :
+
+@@ -37228,8 +37345,6 @@ fi
+ 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_tiger}" != "x"; then :
+
+@@ -38006,10 +38121,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB" >&5
+ $as_echo_n "checking for XCB... " >&6; }
+
+-if test -n "$XCB_CFLAGS"; then
+- pkg_cv_XCB_CFLAGS="$XCB_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCB_CFLAGS"; then
++ pkg_cv_XCB_CFLAGS="$XCB_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$XCB_LIBS"; then
+- pkg_cv_XCB_LIBS="$XCB_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCB_LIBS"; then
++ pkg_cv_XCB_LIBS="$XCB_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -38051,9 +38168,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb" 2>&1`
++ XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb"`
+ else
+- XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb" 2>&1`
++ XCB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb"`
+ 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
+
+ Alternatively, you may set the environment variables XCB_CFLAGS
+ and XCB_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
++See the pkg-config man page for more details.
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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
+ XCB_LIBS=$pkg_cv_XCB_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-
++ :
+ fi
+
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_SHM" >&5
+ $as_echo_n "checking for XCB_SHM... " >&6; }
+
+-if test -n "$XCB_SHM_CFLAGS"; then
+- pkg_cv_XCB_SHM_CFLAGS="$XCB_SHM_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCB_SHM_CFLAGS"; then
++ pkg_cv_XCB_SHM_CFLAGS="$XCB_SHM_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$XCB_SHM_LIBS"; then
+- pkg_cv_XCB_SHM_LIBS="$XCB_SHM_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCB_SHM_LIBS"; then
++ pkg_cv_XCB_SHM_LIBS="$XCB_SHM_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -38140,9 +38258,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- XCB_SHM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-shm" 2>&1`
++ XCB_SHM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-shm"`
+ else
+- XCB_SHM_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-shm" 2>&1`
++ XCB_SHM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-shm"`
+ 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
+
+ Alternatively, you may set the environment variables XCB_SHM_CFLAGS
+ and XCB_SHM_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
++See the pkg-config man page for more details.
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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
+ XCB_SHM_LIBS=$pkg_cv_XCB_SHM_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-
++ :
+ fi
+
+
+@@ -38210,10 +38327,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XV" >&5
+ $as_echo_n "checking for XCB_XV... " >&6; }
+
+-if test -n "$XCB_XV_CFLAGS"; then
+- pkg_cv_XCB_XV_CFLAGS="$XCB_XV_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCB_XV_CFLAGS"; then
++ pkg_cv_XCB_XV_CFLAGS="$XCB_XV_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$XCB_XV_LIBS"; then
+- pkg_cv_XCB_XV_LIBS="$XCB_XV_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCB_XV_LIBS"; then
++ pkg_cv_XCB_XV_LIBS="$XCB_XV_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -38255,23 +38374,26 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- XCB_XV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-xv >= 1.1.90.1" 2>&1`
++ XCB_XV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-xv >= 1.1.90.1"`
+ else
+- XCB_XV_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-xv >= 1.1.90.1" 2>&1`
++ XCB_XV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-xv >= 1.1.90.1"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$XCB_XV_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XV" >&5
+ $as_echo_n "checking for XCB_XV... " >&6; }
+
+-if test -n "$XCB_XV_CFLAGS"; then
+- pkg_cv_XCB_XV_CFLAGS="$XCB_XV_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCB_XV_CFLAGS"; then
++ pkg_cv_XCB_XV_CFLAGS="$XCB_XV_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$XCB_XV_LIBS"; then
+- pkg_cv_XCB_XV_LIBS="$XCB_XV_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCB_XV_LIBS"; then
++ pkg_cv_XCB_XV_LIBS="$XCB_XV_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -38313,9 +38436,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- XCB_XV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-xv" 2>&1`
++ XCB_XV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-xv"`
+ else
+- XCB_XV_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-xv" 2>&1`
++ XCB_XV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-xv"`
+ 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
+
+ Alternatively, you may set the environment variables XCB_XV_CFLAGS
+ and XCB_XV_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
++See the pkg-config man page for more details.
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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; }
+ fi
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XV" >&5
+ $as_echo_n "checking for XCB_XV... " >&6; }
+
+-if test -n "$XCB_XV_CFLAGS"; then
+- pkg_cv_XCB_XV_CFLAGS="$XCB_XV_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCB_XV_CFLAGS"; then
++ pkg_cv_XCB_XV_CFLAGS="$XCB_XV_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$XCB_XV_LIBS"; then
+- pkg_cv_XCB_XV_LIBS="$XCB_XV_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCB_XV_LIBS"; then
++ pkg_cv_XCB_XV_LIBS="$XCB_XV_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -38421,9 +38543,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- XCB_XV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-xv" 2>&1`
++ XCB_XV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-xv"`
+ else
+- XCB_XV_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-xv" 2>&1`
++ XCB_XV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-xv"`
+ 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
+
+ Alternatively, you may set the environment variables XCB_XV_CFLAGS
+ and XCB_XV_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
++See the pkg-config man page for more details.
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_RANDR" >&5
+ $as_echo_n "checking for XCB_RANDR... " >&6; }
+
+-if test -n "$XCB_RANDR_CFLAGS"; then
+- pkg_cv_XCB_RANDR_CFLAGS="$XCB_RANDR_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCB_RANDR_CFLAGS"; then
++ pkg_cv_XCB_RANDR_CFLAGS="$XCB_RANDR_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$XCB_RANDR_LIBS"; then
+- pkg_cv_XCB_RANDR_LIBS="$XCB_RANDR_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCB_RANDR_LIBS"; then
++ pkg_cv_XCB_RANDR_LIBS="$XCB_RANDR_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -38543,17 +38666,17 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- XCB_RANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-randr >= 1.3" 2>&1`
++ XCB_RANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-randr >= 1.3"`
+ else
+- XCB_RANDR_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-randr >= 1.3" 2>&1`
++ XCB_RANDR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-randr >= 1.3"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$XCB_RANDR_PKG_ERRORS" >&5
+
+- true
+-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; }
++ true
++elif test $pkg_failed = untried; then
+ true
+ else
+ XCB_RANDR_CFLAGS=$pkg_cv_XCB_RANDR_CFLAGS
+@@ -38588,10 +38711,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_KEYSYMS" >&5
+ $as_echo_n "checking for XCB_KEYSYMS... " >&6; }
+
+-if test -n "$XCB_KEYSYMS_CFLAGS"; then
+- pkg_cv_XCB_KEYSYMS_CFLAGS="$XCB_KEYSYMS_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCB_KEYSYMS_CFLAGS"; then
++ pkg_cv_XCB_KEYSYMS_CFLAGS="$XCB_KEYSYMS_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$XCB_KEYSYMS_LIBS"; then
+- pkg_cv_XCB_KEYSYMS_LIBS="$XCB_KEYSYMS_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCB_KEYSYMS_LIBS"; then
++ pkg_cv_XCB_KEYSYMS_LIBS="$XCB_KEYSYMS_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -38633,23 +38758,26 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- XCB_KEYSYMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-keysyms >= 0.3.4" 2>&1`
++ XCB_KEYSYMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-keysyms >= 0.3.4"`
+ else
+- XCB_KEYSYMS_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-keysyms >= 0.3.4" 2>&1`
++ XCB_KEYSYMS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-keysyms >= 0.3.4"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$XCB_KEYSYMS_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_KEYSYMS" >&5
+ $as_echo_n "checking for XCB_KEYSYMS... " >&6; }
+
+-if test -n "$XCB_KEYSYMS_CFLAGS"; then
+- pkg_cv_XCB_KEYSYMS_CFLAGS="$XCB_KEYSYMS_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCB_KEYSYMS_CFLAGS"; then
++ pkg_cv_XCB_KEYSYMS_CFLAGS="$XCB_KEYSYMS_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$XCB_KEYSYMS_LIBS"; then
+- pkg_cv_XCB_KEYSYMS_LIBS="$XCB_KEYSYMS_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCB_KEYSYMS_LIBS"; then
++ pkg_cv_XCB_KEYSYMS_LIBS="$XCB_KEYSYMS_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -38691,13 +38820,15 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- XCB_KEYSYMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-keysyms" 2>&1`
++ XCB_KEYSYMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-keysyms"`
+ else
+- XCB_KEYSYMS_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-keysyms" 2>&1`
++ XCB_KEYSYMS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-keysyms"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$XCB_KEYSYMS_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ have_xcb_keysyms="no"
+ need_xid_provider="yes"
+@@ -38705,8 +38836,6 @@ fi
+ $as_echo "$as_me: WARNING: libxcb-keysyms not found. Hotkeys will not be supported." >&2;}
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ have_xcb_keysyms="no"
+ need_xid_provider="yes"
+@@ -38730,18 +38859,17 @@ $as_echo "yes" >&6; }
+ fi
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_KEYSYMS" >&5
+ $as_echo_n "checking for XCB_KEYSYMS... " >&6; }
+
+-if test -n "$XCB_KEYSYMS_CFLAGS"; then
+- pkg_cv_XCB_KEYSYMS_CFLAGS="$XCB_KEYSYMS_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCB_KEYSYMS_CFLAGS"; then
++ pkg_cv_XCB_KEYSYMS_CFLAGS="$XCB_KEYSYMS_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$XCB_KEYSYMS_LIBS"; then
+- pkg_cv_XCB_KEYSYMS_LIBS="$XCB_KEYSYMS_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCB_KEYSYMS_LIBS"; then
++ pkg_cv_XCB_KEYSYMS_LIBS="$XCB_KEYSYMS_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -38783,13 +38912,15 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- XCB_KEYSYMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-keysyms" 2>&1`
++ XCB_KEYSYMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-keysyms"`
+ else
+- XCB_KEYSYMS_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-keysyms" 2>&1`
++ XCB_KEYSYMS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-keysyms"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$XCB_KEYSYMS_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ have_xcb_keysyms="no"
+ need_xid_provider="yes"
+@@ -38797,8 +38928,6 @@ fi
+ $as_echo "$as_me: WARNING: libxcb-keysyms not found. Hotkeys will not be supported." >&2;}
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ have_xcb_keysyms="no"
+ need_xid_provider="yes"
+@@ -38838,10 +38967,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPROTO" >&5
+ $as_echo_n "checking for XPROTO... " >&6; }
+
+-if test -n "$XPROTO_CFLAGS"; then
+- pkg_cv_XPROTO_CFLAGS="$XPROTO_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XPROTO_CFLAGS"; then
++ pkg_cv_XPROTO_CFLAGS="$XPROTO_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$XPROTO_LIBS"; then
+- pkg_cv_XPROTO_LIBS="$XPROTO_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XPROTO_LIBS"; then
++ pkg_cv_XPROTO_LIBS="$XPROTO_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -38883,9 +39014,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- XPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xproto" 2>&1`
++ XPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xproto"`
+ else
+- XPROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors "xproto" 2>&1`
++ XPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto"`
+ 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
+
+ Alternatively, you may set the environment variables XPROTO_CFLAGS
+ and XPROTO_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
++See the pkg-config man page for more details.
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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
+ XPROTO_LIBS=$pkg_cv_XPROTO_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-
++ :
+ fi
+
+
+@@ -38975,10 +39105,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XLIB_XCB" >&5
+ $as_echo_n "checking for XLIB_XCB... " >&6; }
+
+-if test -n "$XLIB_XCB_CFLAGS"; then
+- pkg_cv_XLIB_XCB_CFLAGS="$XLIB_XCB_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XLIB_XCB_CFLAGS"; then
++ pkg_cv_XLIB_XCB_CFLAGS="$XLIB_XCB_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$XLIB_XCB_LIBS"; then
+- pkg_cv_XLIB_XCB_LIBS="$XLIB_XCB_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XLIB_XCB_LIBS"; then
++ pkg_cv_XLIB_XCB_LIBS="$XLIB_XCB_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -39020,9 +39152,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- XLIB_XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11-xcb" 2>&1`
++ XLIB_XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11-xcb"`
+ else
+- XLIB_XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11-xcb" 2>&1`
++ XLIB_XCB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11-xcb"`
+ 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
+
+ Alternatively, you may set the environment variables XLIB_XCB_CFLAGS
+ and XLIB_XCB_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
++See the pkg-config man page for more details.
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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
+ XLIB_XCB_LIBS=$pkg_cv_XLIB_XCB_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-
++ :
+ fi
+
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GL" >&5
+ $as_echo_n "checking for GL... " >&6; }
+
+-if test -n "$GL_CFLAGS"; then
+- pkg_cv_GL_CFLAGS="$GL_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GL_CFLAGS"; then
++ pkg_cv_GL_CFLAGS="$GL_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$GL_LIBS"; then
+- pkg_cv_GL_LIBS="$GL_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GL_LIBS"; then
++ pkg_cv_GL_LIBS="$GL_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -39109,13 +39242,15 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gl" 2>&1`
++ GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gl"`
+ else
+- GL_PKG_ERRORS=`$PKG_CONFIG --print-errors "gl" 2>&1`
++ GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gl"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GL_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ 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
+
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ 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
+ GL_LIBS=$pkg_cv_GL_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-
++ :
+ fi
+
+
+@@ -39208,10 +39341,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
+ $as_echo_n "checking for SDL... " >&6; }
+
+-if test -n "$SDL_CFLAGS"; then
+- pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SDL_CFLAGS"; then
++ pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$SDL_LIBS"; then
+- pkg_cv_SDL_LIBS="$SDL_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SDL_LIBS"; then
++ pkg_cv_SDL_LIBS="$SDL_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -39253,13 +39388,15 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl >= 1.2.10" 2>&1`
++ SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sdl >= 1.2.10"`
+ else
+- SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl >= 1.2.10" 2>&1`
++ SDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sdl >= 1.2.10"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SDL_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ { $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
+ --disable-sdl." >&2;}
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ { $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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL_IMAGE" >&5
+ $as_echo_n "checking for SDL_IMAGE... " >&6; }
+
+-if test -n "$SDL_IMAGE_CFLAGS"; then
+- pkg_cv_SDL_IMAGE_CFLAGS="$SDL_IMAGE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SDL_IMAGE_CFLAGS"; then
++ pkg_cv_SDL_IMAGE_CFLAGS="$SDL_IMAGE_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$SDL_IMAGE_LIBS"; then
+- pkg_cv_SDL_IMAGE_LIBS="$SDL_IMAGE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SDL_IMAGE_LIBS"; then
++ pkg_cv_SDL_IMAGE_LIBS="$SDL_IMAGE_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -39379,21 +39516,21 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SDL_IMAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "SDL_image >= 1.2.10" 2>&1`
++ SDL_IMAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "SDL_image >= 1.2.10"`
+ else
+- SDL_IMAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors "SDL_image >= 1.2.10" 2>&1`
++ SDL_IMAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "SDL_image >= 1.2.10"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SDL_IMAGE_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The development package for SDL_image is not installed.
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ { $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.
+ You should install it alongside your SDL package." >&2;}
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+ { $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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREETYPE" >&5
+ $as_echo_n "checking for FREETYPE... " >&6; }
+
+-if test -n "$FREETYPE_CFLAGS"; then
+- pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$FREETYPE_CFLAGS"; then
++ pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$FREETYPE_LIBS"; then
+- pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$FREETYPE_LIBS"; then
++ pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -39498,13 +39637,15 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "freetype2" 2>&1`
++ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "freetype2"`
+ else
+- FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "freetype2" 2>&1`
++ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "freetype2"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$FREETYPE_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ have_freetype=no
+ if test "${enable_freetype}" = "yes"; then :
+@@ -39516,8 +39657,6 @@ from http://www.freetype.org/, or config
+ fi
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ have_freetype=no
+ if test "${enable_freetype}" = "yes"; then :
+@@ -39619,10 +39758,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FRIBIDI" >&5
+ $as_echo_n "checking for FRIBIDI... " >&6; }
+
+-if test -n "$FRIBIDI_CFLAGS"; then
+- pkg_cv_FRIBIDI_CFLAGS="$FRIBIDI_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$FRIBIDI_CFLAGS"; then
++ pkg_cv_FRIBIDI_CFLAGS="$FRIBIDI_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$FRIBIDI_LIBS"; then
+- pkg_cv_FRIBIDI_LIBS="$FRIBIDI_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$FRIBIDI_LIBS"; then
++ pkg_cv_FRIBIDI_LIBS="$FRIBIDI_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -39664,9 +39805,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fribidi" 2>&1`
++ FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "fribidi"`
+ else
+- FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --print-errors "fribidi" 2>&1`
++ FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fribidi"`
+ 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
+
+ Alternatively, you may set the environment variables FRIBIDI_CFLAGS
+ and FRIBIDI_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
++See the pkg-config man page for more details.
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML2" >&5
+ $as_echo_n "checking for LIBXML2... " >&6; }
+
+-if test -n "$LIBXML2_CFLAGS"; then
+- pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBXML2_CFLAGS"; then
++ pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LIBXML2_LIBS"; then
+- pkg_cv_LIBXML2_LIBS="$LIBXML2_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBXML2_LIBS"; then
++ pkg_cv_LIBXML2_LIBS="$LIBXML2_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -39805,14 +39947,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= 2.5" 2>&1`
++ LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0 >= 2.5"`
+ else
+- LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= 2.5" 2>&1`
++ LIBXML2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 >= 2.5"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBXML2_PKG_ERRORS" >&5
+
+- if test x"$enable_libxml2" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -39859,10 +40001,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML2" >&5
+ $as_echo_n "checking for LIBXML2... " >&6; }
+
+-if test -n "$LIBXML2_CFLAGS"; then
+- pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBXML2_CFLAGS"; then
++ pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LIBXML2_LIBS"; then
+- pkg_cv_LIBXML2_LIBS="$LIBXML2_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBXML2_LIBS"; then
++ pkg_cv_LIBXML2_LIBS="$LIBXML2_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -39904,14 +40048,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= 2.5" 2>&1`
++ LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0 >= 2.5"`
+ else
+- LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= 2.5" 2>&1`
++ LIBXML2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 >= 2.5"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBXML2_PKG_ERRORS" >&5
+
+- enable_libxml2=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -39920,8 +40066,6 @@ $as_echo "$as_me: WARNING: Library libxm
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for SVG" >&5
+ $as_echo_n "checking for SVG... " >&6; }
+
+-if test -n "$SVG_CFLAGS"; then
+- pkg_cv_SVG_CFLAGS="$SVG_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SVG_CFLAGS"; then
++ pkg_cv_SVG_CFLAGS="$SVG_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$SVG_LIBS"; then
+- pkg_cv_SVG_LIBS="$SVG_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SVG_LIBS"; then
++ pkg_cv_SVG_LIBS="$SVG_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -40048,14 +40194,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "librsvg-2.0 >= 2.9.0" 2>&1`
++ SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "librsvg-2.0 >= 2.9.0"`
+ else
+- SVG_PKG_ERRORS=`$PKG_CONFIG --print-errors "librsvg-2.0 >= 2.9.0" 2>&1`
++ SVG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "librsvg-2.0 >= 2.9.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SVG_PKG_ERRORS" >&5
+
+- if test x"$enable_svg" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -40102,10 +40248,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVG" >&5
+ $as_echo_n "checking for SVG... " >&6; }
+
+-if test -n "$SVG_CFLAGS"; then
+- pkg_cv_SVG_CFLAGS="$SVG_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SVG_CFLAGS"; then
++ pkg_cv_SVG_CFLAGS="$SVG_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$SVG_LIBS"; then
+- pkg_cv_SVG_LIBS="$SVG_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SVG_LIBS"; then
++ pkg_cv_SVG_LIBS="$SVG_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -40147,14 +40295,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "librsvg-2.0 >= 2.9.0" 2>&1`
++ SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "librsvg-2.0 >= 2.9.0"`
+ else
+- SVG_PKG_ERRORS=`$PKG_CONFIG --print-errors "librsvg-2.0 >= 2.9.0" 2>&1`
++ SVG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "librsvg-2.0 >= 2.9.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SVG_PKG_ERRORS" >&5
+
+- enable_svg=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -40163,8 +40313,6 @@ $as_echo "$as_me: WARNING: Library librs
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for DIRECTFB" >&5
+ $as_echo_n "checking for DIRECTFB... " >&6; }
+
+-if test -n "$DIRECTFB_CFLAGS"; then
+- pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DIRECTFB_CFLAGS"; then
++ pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$DIRECTFB_LIBS"; then
+- pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DIRECTFB_LIBS"; then
++ pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -40814,17 +40964,17 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "directfb" 2>&1`
++ DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "directfb"`
+ else
+- DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --print-errors "directfb" 2>&1`
++ DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "directfb"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DIRECTFB_PKG_ERRORS" >&5
+
+- have_directfb="false"
+-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; }
++ have_directfb="false"
++elif test $pkg_failed = untried; then
+ have_directfb="false"
+ else
+ DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS
+@@ -40991,10 +41141,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CACA" >&5
+ $as_echo_n "checking for CACA... " >&6; }
+
+-if test -n "$CACA_CFLAGS"; then
+- pkg_cv_CACA_CFLAGS="$CACA_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$CACA_CFLAGS"; then
++ pkg_cv_CACA_CFLAGS="$CACA_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$CACA_LIBS"; then
+- pkg_cv_CACA_LIBS="$CACA_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$CACA_LIBS"; then
++ pkg_cv_CACA_LIBS="$CACA_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -41036,14 +41188,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- CACA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "caca >= 0.99.beta14" 2>&1`
++ CACA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "caca >= 0.99.beta14"`
+ else
+- CACA_PKG_ERRORS=`$PKG_CONFIG --print-errors "caca >= 0.99.beta14" 2>&1`
++ CACA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "caca >= 0.99.beta14"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$CACA_PKG_ERRORS" >&5
+
+- if test x"$enable_caca" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -41090,10 +41242,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CACA" >&5
+ $as_echo_n "checking for CACA... " >&6; }
+
+-if test -n "$CACA_CFLAGS"; then
+- pkg_cv_CACA_CFLAGS="$CACA_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$CACA_CFLAGS"; then
++ pkg_cv_CACA_CFLAGS="$CACA_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$CACA_LIBS"; then
+- pkg_cv_CACA_LIBS="$CACA_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$CACA_LIBS"; then
++ pkg_cv_CACA_LIBS="$CACA_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -41135,14 +41289,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- CACA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "caca >= 0.99.beta14" 2>&1`
++ CACA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "caca >= 0.99.beta14"`
+ else
+- CACA_PKG_ERRORS=`$PKG_CONFIG --print-errors "caca >= 0.99.beta14" 2>&1`
++ CACA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "caca >= 0.99.beta14"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$CACA_PKG_ERRORS" >&5
+
+- enable_caca=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -41151,8 +41307,6 @@ $as_echo "$as_me: WARNING: Library caca
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for PULSE" >&5
+ $as_echo_n "checking for PULSE... " >&6; }
+
+-if test -n "$PULSE_CFLAGS"; then
+- pkg_cv_PULSE_CFLAGS="$PULSE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$PULSE_CFLAGS"; then
++ pkg_cv_PULSE_CFLAGS="$PULSE_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$PULSE_LIBS"; then
+- pkg_cv_PULSE_LIBS="$PULSE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$PULSE_LIBS"; then
++ pkg_cv_PULSE_LIBS="$PULSE_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -41373,14 +41529,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- PULSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpulse >= 0.9.11" 2>&1`
++ PULSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpulse >= 0.9.11"`
+ else
+- PULSE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpulse >= 0.9.11" 2>&1`
++ PULSE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpulse >= 0.9.11"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PULSE_PKG_ERRORS" >&5
+
+- if test x"$enable_pulse" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -41427,10 +41583,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PULSE" >&5
+ $as_echo_n "checking for PULSE... " >&6; }
+
+-if test -n "$PULSE_CFLAGS"; then
+- pkg_cv_PULSE_CFLAGS="$PULSE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$PULSE_CFLAGS"; then
++ pkg_cv_PULSE_CFLAGS="$PULSE_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$PULSE_LIBS"; then
+- pkg_cv_PULSE_LIBS="$PULSE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$PULSE_LIBS"; then
++ pkg_cv_PULSE_LIBS="$PULSE_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -41472,14 +41630,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- PULSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpulse >= 0.9.11" 2>&1`
++ PULSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpulse >= 0.9.11"`
+ else
+- PULSE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpulse >= 0.9.11" 2>&1`
++ PULSE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpulse >= 0.9.11"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PULSE_PKG_ERRORS" >&5
+
+- enable_pulse=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -41488,8 +41648,6 @@ $as_echo "$as_me: WARNING: Library libpu
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for PORTAUDIO" >&5
+ $as_echo_n "checking for PORTAUDIO... " >&6; }
+
+-if test -n "$PORTAUDIO_CFLAGS"; then
+- pkg_cv_PORTAUDIO_CFLAGS="$PORTAUDIO_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$PORTAUDIO_CFLAGS"; then
++ pkg_cv_PORTAUDIO_CFLAGS="$PORTAUDIO_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$PORTAUDIO_LIBS"; then
+- pkg_cv_PORTAUDIO_LIBS="$PORTAUDIO_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$PORTAUDIO_LIBS"; then
++ pkg_cv_PORTAUDIO_LIBS="$PORTAUDIO_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -41624,14 +41784,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "portaudio-2.0" 2>&1`
++ PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "portaudio-2.0"`
+ else
+- PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "portaudio-2.0" 2>&1`
++ PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "portaudio-2.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PORTAUDIO_PKG_ERRORS" >&5
+
+- if test x"$enable_portaudio" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -41678,10 +41838,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PORTAUDIO" >&5
+ $as_echo_n "checking for PORTAUDIO... " >&6; }
+
+-if test -n "$PORTAUDIO_CFLAGS"; then
+- pkg_cv_PORTAUDIO_CFLAGS="$PORTAUDIO_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$PORTAUDIO_CFLAGS"; then
++ pkg_cv_PORTAUDIO_CFLAGS="$PORTAUDIO_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$PORTAUDIO_LIBS"; then
+- pkg_cv_PORTAUDIO_LIBS="$PORTAUDIO_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$PORTAUDIO_LIBS"; then
++ pkg_cv_PORTAUDIO_LIBS="$PORTAUDIO_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -41723,14 +41885,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "portaudio-2.0" 2>&1`
++ PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "portaudio-2.0"`
+ else
+- PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "portaudio-2.0" 2>&1`
++ PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "portaudio-2.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PORTAUDIO_PKG_ERRORS" >&5
+
+- enable_portaudio=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -41739,8 +41903,6 @@ $as_echo "$as_me: WARNING: Library porta
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
+ $as_echo_n "checking for ALSA... " >&6; }
+
+-if test -n "$ALSA_CFLAGS"; then
+- pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$ALSA_CFLAGS"; then
++ pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$ALSA_LIBS"; then
+- pkg_cv_ALSA_LIBS="$ALSA_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$ALSA_LIBS"; then
++ pkg_cv_ALSA_LIBS="$ALSA_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -41867,14 +42031,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "alsa >= 1.0.0" 2>&1`
++ ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "alsa >= 1.0.0"`
+ else
+- ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "alsa >= 1.0.0" 2>&1`
++ ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "alsa >= 1.0.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$ALSA_PKG_ERRORS" >&5
+
+- if test x"$enable_alsa" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -41931,10 +42095,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
+ $as_echo_n "checking for ALSA... " >&6; }
+
+-if test -n "$ALSA_CFLAGS"; then
+- pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$ALSA_CFLAGS"; then
++ pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$ALSA_LIBS"; then
+- pkg_cv_ALSA_LIBS="$ALSA_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$ALSA_LIBS"; then
++ pkg_cv_ALSA_LIBS="$ALSA_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -41976,14 +42142,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "alsa >= 1.0.0" 2>&1`
++ ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "alsa >= 1.0.0"`
+ else
+- ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "alsa >= 1.0.0" 2>&1`
++ ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "alsa >= 1.0.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$ALSA_PKG_ERRORS" >&5
+
+- enable_alsa=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -41992,8 +42160,6 @@ $as_echo "$as_me: WARNING: Library alsa
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
+ $as_echo_n "checking for JACK... " >&6; }
+
+-if test -n "$JACK_CFLAGS"; then
+- pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$JACK_CFLAGS"; then
++ pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$JACK_LIBS"; then
+- pkg_cv_JACK_LIBS="$JACK_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$JACK_LIBS"; then
++ pkg_cv_JACK_LIBS="$JACK_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -42280,14 +42448,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "jack" 2>&1`
++ JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "jack"`
+ else
+- JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors "jack" 2>&1`
++ JACK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "jack"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$JACK_PKG_ERRORS" >&5
+
+- if test x"$enable_jack" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -42344,10 +42512,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
+ $as_echo_n "checking for JACK... " >&6; }
+
+-if test -n "$JACK_CFLAGS"; then
+- pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$JACK_CFLAGS"; then
++ pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$JACK_LIBS"; then
+- pkg_cv_JACK_LIBS="$JACK_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$JACK_LIBS"; then
++ pkg_cv_JACK_LIBS="$JACK_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -42389,14 +42559,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "jack" 2>&1`
++ JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "jack"`
+ else
+- JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors "jack" 2>&1`
++ JACK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "jack"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$JACK_PKG_ERRORS" >&5
+
+- enable_jack=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -42405,8 +42577,6 @@ $as_echo "$as_me: WARNING: Library jack
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for UPNP" >&5
+ $as_echo_n "checking for UPNP... " >&6; }
+
+-if test -n "$UPNP_CFLAGS"; then
+- pkg_cv_UPNP_CFLAGS="$UPNP_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$UPNP_CFLAGS"; then
++ pkg_cv_UPNP_CFLAGS="$UPNP_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$UPNP_LIBS"; then
+- pkg_cv_UPNP_LIBS="$UPNP_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$UPNP_LIBS"; then
++ pkg_cv_UPNP_LIBS="$UPNP_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -42687,14 +42859,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- UPNP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libupnp" 2>&1`
++ UPNP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libupnp"`
+ else
+- UPNP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libupnp" 2>&1`
++ UPNP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libupnp"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$UPNP_PKG_ERRORS" >&5
+
+- if test x"$enable_upnp" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -42741,10 +42913,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UPNP" >&5
+ $as_echo_n "checking for UPNP... " >&6; }
+
+-if test -n "$UPNP_CFLAGS"; then
+- pkg_cv_UPNP_CFLAGS="$UPNP_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$UPNP_CFLAGS"; then
++ pkg_cv_UPNP_CFLAGS="$UPNP_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$UPNP_LIBS"; then
+- pkg_cv_UPNP_LIBS="$UPNP_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$UPNP_LIBS"; then
++ pkg_cv_UPNP_LIBS="$UPNP_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -42786,14 +42960,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- UPNP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libupnp" 2>&1`
++ UPNP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libupnp"`
+ else
+- UPNP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libupnp" 2>&1`
++ UPNP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libupnp"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$UPNP_PKG_ERRORS" >&5
+
+- enable_upnp=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -42802,8 +42978,6 @@ $as_echo "$as_me: WARNING: Library libup
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for HILDON" >&5
+ $as_echo_n "checking for HILDON... " >&6; }
+
+-if test -n "$HILDON_CFLAGS"; then
+- pkg_cv_HILDON_CFLAGS="$HILDON_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$HILDON_CFLAGS"; then
++ pkg_cv_HILDON_CFLAGS="$HILDON_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$HILDON_LIBS"; then
+- pkg_cv_HILDON_LIBS="$HILDON_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$HILDON_LIBS"; then
++ pkg_cv_HILDON_LIBS="$HILDON_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -43030,13 +43206,15 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- HILDON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hildon-1" 2>&1`
++ HILDON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hildon-1"`
+ else
+- HILDON_PKG_ERRORS=`$PKG_CONFIG --print-errors "hildon-1" 2>&1`
++ HILDON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hildon-1"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$HILDON_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if test "${enable_hildon}" = "yes"; then :
+
+@@ -43046,8 +43224,6 @@ fi
+ enable_hildon="no"
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if test "${enable_hildon}" = "yes"; then :
+
+@@ -43067,10 +43243,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HILDON_FM" >&5
+ $as_echo_n "checking for HILDON_FM... " >&6; }
+
+-if test -n "$HILDON_FM_CFLAGS"; then
+- pkg_cv_HILDON_FM_CFLAGS="$HILDON_FM_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$HILDON_FM_CFLAGS"; then
++ pkg_cv_HILDON_FM_CFLAGS="$HILDON_FM_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$HILDON_FM_LIBS"; then
+- pkg_cv_HILDON_FM_LIBS="$HILDON_FM_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$HILDON_FM_LIBS"; then
++ pkg_cv_HILDON_FM_LIBS="$HILDON_FM_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -43112,20 +43290,20 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- HILDON_FM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hildon-fm-2" 2>&1`
++ HILDON_FM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hildon-fm-2"`
+ else
+- HILDON_FM_PKG_ERRORS=`$PKG_CONFIG --print-errors "hildon-fm-2" 2>&1`
++ HILDON_FM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hildon-fm-2"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$HILDON_FM_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ { $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;}
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ { $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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT4" >&5
+ $as_echo_n "checking for QT4... " >&6; }
+
+-if test -n "$QT4_CFLAGS"; then
+- pkg_cv_QT4_CFLAGS="$QT4_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$QT4_CFLAGS"; then
++ pkg_cv_QT4_CFLAGS="$QT4_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$QT4_LIBS"; then
+- pkg_cv_QT4_LIBS="$QT4_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$QT4_LIBS"; then
++ pkg_cv_QT4_LIBS="$QT4_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -43247,13 +43427,15 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- QT4_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "QtCore QtGui >= 4.4.0" 2>&1`
++ QT4_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "QtCore QtGui >= 4.4.0"`
+ else
+- QT4_PKG_ERRORS=`$PKG_CONFIG --print-errors "QtCore QtGui >= 4.4.0" 2>&1`
++ QT4_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtCore QtGui >= 4.4.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$QT4_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if test "${enable_qt4}" = "yes"; then :
+
+@@ -43268,8 +43450,6 @@ fi
+ enable_qt4="no"
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if test "${enable_qt4}" = "yes"; then :
+
+@@ -44258,10 +44438,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOOM" >&5
+ $as_echo_n "checking for GOOM... " >&6; }
+
+-if test -n "$GOOM_CFLAGS"; then
+- pkg_cv_GOOM_CFLAGS="$GOOM_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GOOM_CFLAGS"; then
++ pkg_cv_GOOM_CFLAGS="$GOOM_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$GOOM_LIBS"; then
+- pkg_cv_GOOM_LIBS="$GOOM_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GOOM_LIBS"; then
++ pkg_cv_GOOM_LIBS="$GOOM_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -44303,14 +44485,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GOOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoom2" 2>&1`
++ GOOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgoom2"`
+ else
+- GOOM_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoom2" 2>&1`
++ GOOM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoom2"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GOOM_PKG_ERRORS" >&5
+
+- if test x"$enable_goom" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -44357,10 +44539,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOOM" >&5
+ $as_echo_n "checking for GOOM... " >&6; }
+
+-if test -n "$GOOM_CFLAGS"; then
+- pkg_cv_GOOM_CFLAGS="$GOOM_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GOOM_CFLAGS"; then
++ pkg_cv_GOOM_CFLAGS="$GOOM_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$GOOM_LIBS"; then
+- pkg_cv_GOOM_LIBS="$GOOM_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GOOM_LIBS"; then
++ pkg_cv_GOOM_LIBS="$GOOM_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -44402,14 +44586,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GOOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoom2" 2>&1`
++ GOOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgoom2"`
+ else
+- GOOM_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoom2" 2>&1`
++ GOOM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoom2"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GOOM_PKG_ERRORS" >&5
+
+- enable_goom=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -44418,8 +44604,6 @@ $as_echo "$as_me: WARNING: Library libgo
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for PROJECTM" >&5
+ $as_echo_n "checking for PROJECTM... " >&6; }
+
+-if test -n "$PROJECTM_CFLAGS"; then
+- pkg_cv_PROJECTM_CFLAGS="$PROJECTM_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$PROJECTM_CFLAGS"; then
++ pkg_cv_PROJECTM_CFLAGS="$PROJECTM_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$PROJECTM_LIBS"; then
+- pkg_cv_PROJECTM_LIBS="$PROJECTM_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$PROJECTM_LIBS"; then
++ pkg_cv_PROJECTM_LIBS="$PROJECTM_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -44527,20 +44713,20 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- PROJECTM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libprojectM" 2>&1`
++ PROJECTM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libprojectM"`
+ else
+- PROJECTM_PKG_ERRORS=`$PKG_CONFIG --print-errors "libprojectM" 2>&1`
++ PROJECTM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libprojectM"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PROJECTM_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libprojectM library not found" >&5
+ $as_echo "$as_me: WARNING: libprojectM library not found" >&2;}
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ { $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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PROJECTM2" >&5
+ $as_echo_n "checking for PROJECTM2... " >&6; }
+
+-if test -n "$PROJECTM2_CFLAGS"; then
+- pkg_cv_PROJECTM2_CFLAGS="$PROJECTM2_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$PROJECTM2_CFLAGS"; then
++ pkg_cv_PROJECTM2_CFLAGS="$PROJECTM2_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$PROJECTM2_LIBS"; then
+- pkg_cv_PROJECTM2_LIBS="$PROJECTM2_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$PROJECTM2_LIBS"; then
++ pkg_cv_PROJECTM2_LIBS="$PROJECTM2_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -44620,19 +44808,19 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- PROJECTM2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libprojectM >= 2.0.0" 2>&1`
++ PROJECTM2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libprojectM >= 2.0.0"`
+ else
+- PROJECTM2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libprojectM >= 2.0.0" 2>&1`
++ PROJECTM2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libprojectM >= 2.0.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PROJECTM2_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using libprojectM version 1 " >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using libprojectM version 1 " >&5
+ $as_echo "$as_me: WARNING: Using libprojectM version 1 " >&2;}
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+ { $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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BONJOUR" >&5
+ $as_echo_n "checking for BONJOUR... " >&6; }
+
+-if test -n "$BONJOUR_CFLAGS"; then
+- pkg_cv_BONJOUR_CFLAGS="$BONJOUR_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$BONJOUR_CFLAGS"; then
++ pkg_cv_BONJOUR_CFLAGS="$BONJOUR_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$BONJOUR_LIBS"; then
+- pkg_cv_BONJOUR_LIBS="$BONJOUR_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$BONJOUR_LIBS"; then
++ pkg_cv_BONJOUR_LIBS="$BONJOUR_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -44761,14 +44951,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- BONJOUR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "avahi-client >= 0.6" 2>&1`
++ BONJOUR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "avahi-client >= 0.6"`
+ else
+- BONJOUR_PKG_ERRORS=`$PKG_CONFIG --print-errors "avahi-client >= 0.6" 2>&1`
++ BONJOUR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "avahi-client >= 0.6"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$BONJOUR_PKG_ERRORS" >&5
+
+- if test x"$enable_bonjour" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -44815,10 +45005,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BONJOUR" >&5
+ $as_echo_n "checking for BONJOUR... " >&6; }
+
+-if test -n "$BONJOUR_CFLAGS"; then
+- pkg_cv_BONJOUR_CFLAGS="$BONJOUR_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$BONJOUR_CFLAGS"; then
++ pkg_cv_BONJOUR_CFLAGS="$BONJOUR_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$BONJOUR_LIBS"; then
+- pkg_cv_BONJOUR_LIBS="$BONJOUR_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$BONJOUR_LIBS"; then
++ pkg_cv_BONJOUR_LIBS="$BONJOUR_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -44860,14 +45052,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- BONJOUR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "avahi-client >= 0.6" 2>&1`
++ BONJOUR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "avahi-client >= 0.6"`
+ else
+- BONJOUR_PKG_ERRORS=`$PKG_CONFIG --print-errors "avahi-client >= 0.6" 2>&1`
++ BONJOUR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "avahi-client >= 0.6"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$BONJOUR_PKG_ERRORS" >&5
+
+- enable_bonjour=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -44876,8 +45070,6 @@ $as_echo "$as_me: WARNING: Library avahi
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
+ $as_echo_n "checking for UDEV... " >&6; }
+
+-if test -n "$UDEV_CFLAGS"; then
+- pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$UDEV_CFLAGS"; then
++ pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$UDEV_LIBS"; then
+- pkg_cv_UDEV_LIBS="$UDEV_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$UDEV_LIBS"; then
++ pkg_cv_UDEV_LIBS="$UDEV_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -45004,14 +45198,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libudev >= 142" 2>&1`
++ UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libudev >= 142"`
+ else
+- UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "libudev >= 142" 2>&1`
++ UDEV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libudev >= 142"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$UDEV_PKG_ERRORS" >&5
+
+- if test x"$enable_udev" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -45058,10 +45252,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
+ $as_echo_n "checking for UDEV... " >&6; }
+
+-if test -n "$UDEV_CFLAGS"; then
+- pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$UDEV_CFLAGS"; then
++ pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$UDEV_LIBS"; then
+- pkg_cv_UDEV_LIBS="$UDEV_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$UDEV_LIBS"; then
++ pkg_cv_UDEV_LIBS="$UDEV_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -45103,14 +45299,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libudev >= 142" 2>&1`
++ UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libudev >= 142"`
+ else
+- UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "libudev >= 142" 2>&1`
++ UDEV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libudev >= 142"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$UDEV_PKG_ERRORS" >&5
+
+- enable_udev=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -45119,8 +45317,6 @@ $as_echo "$as_me: WARNING: Library libud
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for MTP" >&5
+ $as_echo_n "checking for MTP... " >&6; }
+
+-if test -n "$MTP_CFLAGS"; then
+- pkg_cv_MTP_CFLAGS="$MTP_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$MTP_CFLAGS"; then
++ pkg_cv_MTP_CFLAGS="$MTP_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$MTP_LIBS"; then
+- pkg_cv_MTP_LIBS="$MTP_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$MTP_LIBS"; then
++ pkg_cv_MTP_LIBS="$MTP_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -45247,14 +45445,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- MTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libmtp >= 1.0.0" 2>&1`
++ MTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmtp >= 1.0.0"`
+ else
+- MTP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libmtp >= 1.0.0" 2>&1`
++ MTP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmtp >= 1.0.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MTP_PKG_ERRORS" >&5
+
+- if test x"$enable_mtp" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -45311,10 +45509,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MTP" >&5
+ $as_echo_n "checking for MTP... " >&6; }
+
+-if test -n "$MTP_CFLAGS"; then
+- pkg_cv_MTP_CFLAGS="$MTP_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$MTP_CFLAGS"; then
++ pkg_cv_MTP_CFLAGS="$MTP_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$MTP_LIBS"; then
+- pkg_cv_MTP_LIBS="$MTP_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$MTP_LIBS"; then
++ pkg_cv_MTP_LIBS="$MTP_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -45356,14 +45556,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- MTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libmtp >= 1.0.0" 2>&1`
++ MTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmtp >= 1.0.0"`
+ else
+- MTP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libmtp >= 1.0.0" 2>&1`
++ MTP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmtp >= 1.0.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MTP_PKG_ERRORS" >&5
+
+- enable_mtp=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -45372,8 +45574,6 @@ $as_echo "$as_me: WARNING: Library libmt
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for GNUTLS" >&5
+ $as_echo_n "checking for GNUTLS... " >&6; }
+
+-if test -n "$GNUTLS_CFLAGS"; then
+- pkg_cv_GNUTLS_CFLAGS="$GNUTLS_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GNUTLS_CFLAGS"; then
++ pkg_cv_GNUTLS_CFLAGS="$GNUTLS_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$GNUTLS_LIBS"; then
+- pkg_cv_GNUTLS_LIBS="$GNUTLS_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GNUTLS_LIBS"; then
++ pkg_cv_GNUTLS_LIBS="$GNUTLS_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -45676,13 +45878,15 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnutls >= 1.7.4" 2>&1`
++ GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnutls >= 1.7.4"`
+ else
+- GNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnutls >= 1.7.4" 2>&1`
++ GNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnutls >= 1.7.4"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GNUTLS_PKG_ERRORS" >&5
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if test "${enable_gnutls}" = "yes"; then :
+
+@@ -45691,8 +45895,6 @@ fi
+ fi
+
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if test "${enable_gnutls}" = "yes"; then :
+
+@@ -45863,10 +46065,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSSO_SCREENSAVER" >&5
+ $as_echo_n "checking for OSSO_SCREENSAVER... " >&6; }
+
+-if test -n "$OSSO_SCREENSAVER_CFLAGS"; then
+- pkg_cv_OSSO_SCREENSAVER_CFLAGS="$OSSO_SCREENSAVER_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$OSSO_SCREENSAVER_CFLAGS"; then
++ pkg_cv_OSSO_SCREENSAVER_CFLAGS="$OSSO_SCREENSAVER_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$OSSO_SCREENSAVER_LIBS"; then
+- pkg_cv_OSSO_SCREENSAVER_LIBS="$OSSO_SCREENSAVER_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$OSSO_SCREENSAVER_LIBS"; then
++ pkg_cv_OSSO_SCREENSAVER_LIBS="$OSSO_SCREENSAVER_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -45908,14 +46112,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- OSSO_SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libosso" 2>&1`
++ OSSO_SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libosso"`
+ else
+- OSSO_SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --print-errors "libosso" 2>&1`
++ OSSO_SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libosso"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$OSSO_SCREENSAVER_PKG_ERRORS" >&5
+
+- if test x"$enable_osso_screensaver" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -45962,10 +46166,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSSO_SCREENSAVER" >&5
+ $as_echo_n "checking for OSSO_SCREENSAVER... " >&6; }
+
+-if test -n "$OSSO_SCREENSAVER_CFLAGS"; then
+- pkg_cv_OSSO_SCREENSAVER_CFLAGS="$OSSO_SCREENSAVER_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$OSSO_SCREENSAVER_CFLAGS"; then
++ pkg_cv_OSSO_SCREENSAVER_CFLAGS="$OSSO_SCREENSAVER_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$OSSO_SCREENSAVER_LIBS"; then
+- pkg_cv_OSSO_SCREENSAVER_LIBS="$OSSO_SCREENSAVER_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$OSSO_SCREENSAVER_LIBS"; then
++ pkg_cv_OSSO_SCREENSAVER_LIBS="$OSSO_SCREENSAVER_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -46007,14 +46213,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- OSSO_SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libosso" 2>&1`
++ OSSO_SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libosso"`
+ else
+- OSSO_SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --print-errors "libosso" 2>&1`
++ OSSO_SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libosso"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$OSSO_SCREENSAVER_PKG_ERRORS" >&5
+
+- enable_osso_screensaver=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -46023,8 +46231,6 @@ $as_echo "$as_me: WARNING: Library libos
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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_echo "$as_me:${as_lineno-$LINENO}: checking for SQLITE" >&5
+ $as_echo_n "checking for SQLITE... " >&6; }
+
+-if test -n "$SQLITE_CFLAGS"; then
+- pkg_cv_SQLITE_CFLAGS="$SQLITE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SQLITE_CFLAGS"; then
++ pkg_cv_SQLITE_CFLAGS="$SQLITE_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$SQLITE_LIBS"; then
+- pkg_cv_SQLITE_LIBS="$SQLITE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SQLITE_LIBS"; then
++ pkg_cv_SQLITE_LIBS="$SQLITE_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -46195,14 +46403,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SQLITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sqlite3 >= 3.6.0" 2>&1`
++ SQLITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sqlite3 >= 3.6.0"`
+ else
+- SQLITE_PKG_ERRORS=`$PKG_CONFIG --print-errors "sqlite3 >= 3.6.0" 2>&1`
++ SQLITE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sqlite3 >= 3.6.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SQLITE_PKG_ERRORS" >&5
+
+- if test x"$enable_sqlite" = "xyes"; 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
+ 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
+
+ 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
+ else
+@@ -46249,10 +46457,11 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLITE" >&5
+ $as_echo_n "checking for SQLITE... " >&6; }
+
+-if test -n "$SQLITE_CFLAGS"; then
+- pkg_cv_SQLITE_CFLAGS="$SQLITE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SQLITE_CFLAGS"; then
++ pkg_cv_SQLITE_CFLAGS="$SQLITE_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$SQLITE_LIBS"; then
+- pkg_cv_SQLITE_LIBS="$SQLITE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SQLITE_LIBS"; then
++ pkg_cv_SQLITE_LIBS="$SQLITE_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -46294,14 +46504,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SQLITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sqlite3 >= 3.6.0" 2>&1`
++ SQLITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sqlite3 >= 3.6.0"`
+ else
+- SQLITE_PKG_ERRORS=`$PKG_CONFIG --print-errors "sqlite3 >= 3.6.0" 2>&1`
++ SQLITE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sqlite3 >= 3.6.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SQLITE_PKG_ERRORS" >&5
+
+- enable_sqlite=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
+ else
+@@ -46310,8 +46522,6 @@ $as_echo "$as_me: WARNING: Library sqlit
+
+ fi
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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"
+ if test -n "$i"
+ then
+ echo "Trying to find $i package" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $i >= 1.9.2" >&5
+-$as_echo_n "checking for $i >= 1.9.2... " >&6; }
+- if $PKG_CONFIG --exists --print-errors "$i >= 1.9.2" 2>&5
++ if $PKG_CONFIG --exists --print-errors "$i" 2>&5
+ then
+ echo "Using $i pkg-config package." >&5
+ echo "Using $i package." >&6
+ found=1
+ MOZILLA_CFLAGS=$(eval $PKG_CONFIG --cflags "$i" )
+ MOZILLA_LIBS=$(eval $PKG_CONFIG --libs "$i" )
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+ break
+ fi
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+ fi
+- done
++ done
+ fi
+ fi
+ if test $found = 1; then :
+
+ CPPFLAGS="${CPPFLAGS_save} ${MOZILLA_CFLAGS}"
+ MOZILLA_REQUIRED_HEADERS=1
++ for ac_header in npfunctions.h
++do :
++ ac_fn_cxx_check_header_mongrel "$LINENO" "npfunctions.h" "ac_cv_header_npfunctions_h" "$ac_includes_default"
++if test "x$ac_cv_header_npfunctions_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_NPFUNCTIONS_H 1
++_ACEOF
++
++fi
++
++done
++
+ 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
+ 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; 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
+
+
+
+- eval "CPPFLAGS_mozilla="'"$'"{CPPFLAGS_mozilla} -DXP_UNIX"'"'
++
++ eval "CPPFLAGS_mozilla="'"$'"{CPPFLAGS_mozilla} -DXP_UNIX -DOJI"'"'
+ am_modules_with_cppflags="${am_modules_with_cppflags} mozilla"
+
+
+- if test "${SYS}" != "darwin"; then :
++ if test "${SYS}" != "darwin"; then :
+
+
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPM" >&5
+ $as_echo_n "checking for XPM... " >&6; }
+
+-if test -n "$XPM_CFLAGS"; then
+- pkg_cv_XPM_CFLAGS="$XPM_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XPM_CFLAGS"; then
++ pkg_cv_XPM_CFLAGS="$XPM_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$XPM_LIBS"; then
+- pkg_cv_XPM_LIBS="$XPM_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XPM_LIBS"; then
++ pkg_cv_XPM_LIBS="$XPM_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { { $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
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -47175,21 +47394,21 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- XPM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xpm xt" 2>&1`
++ XPM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xpm xt"`
+ else
+- XPM_PKG_ERRORS=`$PKG_CONFIG --print-errors "xpm xt" 2>&1`
++ XPM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xpm xt"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$XPM_PKG_ERRORS" >&5
+
++ { $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
+
+ 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
+
+ else
+ XPM_CFLAGS=$pkg_cv_XPM_CFLAGS
+@@ -47205,11 +47424,6 @@ $as_echo "yes" >&6; }
+
+
+ fi
+- if test "${have_xcb_keysyms}" != "yes"; then :
+-
+- as_fn_error "Please install xcb-keysyms from xcb-utils." "$LINENO" 5
+-
+-fi
+
+ fi
+
+@@ -47285,7 +47499,7 @@ fi
+ 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. mozilla-config was not found." "$LINENO" 5
+
+
+ fi
+@@ -47543,8 +47757,22 @@ fi
+ fi
+
+ real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`"
+- CPPFLAGS="${CPPFLAGS_save} -I${real_mozilla_sdk}/include"
++ CPPFLAGS="${CPPFLAGS_save} -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include"
+ MOZILLA_REQUIRED_HEADERS=1
++ for ac_header in mozilla-config.h
++do :
++ ac_fn_cxx_check_header_mongrel "$LINENO" "mozilla-config.h" "ac_cv_header_mozilla_config_h" "$ac_includes_default"
++if test "x$ac_cv_header_mozilla_config_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_MOZILLA_CONFIG_H 1
++_ACEOF
++
++else
++ MOZILLA_REQUIRED_HEADERS=0
++fi
++
++done
++
+ 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
+ PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
+
+
+- eval "CPPFLAGS_mozilla="'"$'"{CPPFLAGS_mozilla} -DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk}/include"'"'
++ eval "CPPFLAGS_mozilla="'"$'"{CPPFLAGS_mozilla} -DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include"'"'
+ am_modules_with_cppflags="${am_modules_with_cppflags} mozilla"
+
+
++ if ${need_xpcom_libs}; then
++
++
++ eval "LIBS_mozilla="'"'"-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 -lxpcomglue "'$'"{LIBS_mozilla}"'"'
++ am_modules_with_libs="${am_modules_with_libs} mozilla"
++
++
++ if test "${SYS}" = "mingw32"; then
++ if test -d "${real_mozilla_sdk}/embedstring/bin"
++ then
++
++
++ eval "LIBS_mozilla="'"'"-lembedstring "'$'"{LIBS_mozilla}"'"'
++ am_modules_with_libs="${am_modules_with_libs} mozilla"
++
++
++ fi
++ fi
++ fi
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+-# serial 1 (pkg-config-0.24)
+ #
+ # Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
+ #
+@@ -48,10 +47,7 @@ To do so, use the procedure documented b
+ AC_DEFUN([PKG_PROG_PKG_CONFIG],
+ [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+ m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+-
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+ 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
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
++
+ fi[]dnl
+ ])# PKG_PROG_PKG_CONFIG
+
+@@ -72,31 +69,34 @@ fi[]dnl
+ # Check to see whether a particular set of modules exists. Similar
+ # to PKG_CHECK_MODULES(), but does not set variables or print errors.
+ #
+-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+-# only at the first occurence in configure.ac, so if the first place
+-# it's called might be skipped (such as if it is within an "if", you
+-# have to call PKG_CHECK_EXISTS manually
++#
++# Similar to PKG_CHECK_MODULES, make sure that the first instance of
++# this or PKG_CHECK_MODULES is called, or make sure to call
++# PKG_CHECK_EXISTS manually
+ # --------------------------------------------------------------
+ AC_DEFUN([PKG_CHECK_EXISTS],
+ [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+ if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+- m4_default([$2], [:])
++ m4_ifval([$2], [$2], [:])
+ m4_ifvaln([$3], [else
+ $3])dnl
+ fi])
+
++
+ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+ # ---------------------------------------------
+ m4_define([_PKG_CONFIG],
+-[if test -n "$$1"; then
+- pkg_cv_[]$1="$$1"
+- elif test -n "$PKG_CONFIG"; then
+- PKG_CHECK_EXISTS([$3],
+- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+- [pkg_failed=yes])
+- else
+- pkg_failed=untried
++[if test -n "$PKG_CONFIG"; then
++ if test -n "$$1"; then
++ pkg_cv_[]$1="$$1"
++ else
++ PKG_CHECK_EXISTS([$3],
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++ [pkg_failed=yes])
++ fi
++else
++ pkg_failed=untried
+ fi[]dnl
+ ])# _PKG_CONFIG
+
+@@ -138,17 +138,16 @@ and $1[]_LIBS to avoid the need to call
+ See the pkg-config man page for more details.])
+
+ if test $pkg_failed = yes; then
+- AC_MSG_RESULT([no])
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ else
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+- m4_default([$4], [AC_MSG_ERROR(
++ ifelse([$4], , [AC_MSG_ERROR(dnl
+ [Package requirements ($2) were not met:
+
+ $$1_PKG_ERRORS
+@@ -156,24 +155,25 @@ $$1_PKG_ERRORS
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-_PKG_TEXT])dnl
+- ])
++_PKG_TEXT
++])],
++ [AC_MSG_RESULT([no])
++ $4])
+ elif test $pkg_failed = untried; then
+- AC_MSG_RESULT([no])
+- m4_default([$4], [AC_MSG_FAILURE(
++ ifelse([$4], , [AC_MSG_FAILURE(dnl
+ [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.
+
+ _PKG_TEXT
+
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
+- ])
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
++ [$4])
+ else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+- $3
++ ifelse([$3], , :, [$3])
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
+ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
+@@ -740,7 +739,8 @@ DIST_sources = $(SOURCES_mozilla_common)
+ @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 \
+- at BUILD_MOZILLA_TRUE@@HAVE_DARWIN_TRUE@@HAVE_WIN32_FALSE@ -DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0
++ at BUILD_MOZILLA_TRUE@@HAVE_DARWIN_TRUE@@HAVE_WIN32_FALSE@ -DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0 \
++ at BUILD_MOZILLA_TRUE@@HAVE_DARWIN_TRUE@@HAVE_WIN32_FALSE@ -include mozilla-config.h
+
+ @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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 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@
+ PEFLAGS = @PEFLAGS@
+ PKGDIR = @PKGDIR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
+ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
diff --git a/debian/patches/series b/debian/patches/series
index b6bad6f..458ba8d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
200_osdmenu_paths.diff
501_decrease_alsa_buffer.diff
502_xulrunner_191.diff
+503_autoreconf.diff
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list