r25232 - in /desktop/unstable/gvfs/debian: changelog patches/01_maintainer_mode.patch patches/90_relibtoolize.patch
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Fri Oct 1 11:08:38 UTC 2010
Author: ah
Date: Fri Oct 1 11:08:20 2010
New Revision: 25232
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25232
Log:
New upstream release (1.6.4)
Modified:
desktop/unstable/gvfs/debian/changelog
desktop/unstable/gvfs/debian/patches/01_maintainer_mode.patch
desktop/unstable/gvfs/debian/patches/90_relibtoolize.patch
Modified: desktop/unstable/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/changelog?rev=25232&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gvfs/debian/changelog [utf-8] Fri Oct 1 11:08:20 2010
@@ -1,3 +1,9 @@
+gvfs (1.6.4-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Andreas Henriksson <andreas at fatal.se> Fri, 01 Oct 2010 12:52:33 +0200
+
gvfs (1.6.3-2) unstable; urgency=low
* Depend on fuse-utils 2.8.4. Closes: #585648.
Modified: desktop/unstable/gvfs/debian/patches/01_maintainer_mode.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/01_maintainer_mode.patch?rev=25232&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/01_maintainer_mode.patch [utf-8] (original)
+++ desktop/unstable/gvfs/debian/patches/01_maintainer_mode.patch [utf-8] Fri Oct 1 11:08:20 2010
@@ -5,7 +5,7 @@
@@ -1,6 +1,7 @@
AC_INIT(client/gdaemonvfs.h)
- AM_INIT_AUTOMAKE(gvfs, 1.6.3)
+ AM_INIT_AUTOMAKE(gvfs, 1.6.4)
+AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
Modified: desktop/unstable/gvfs/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/90_relibtoolize.patch?rev=25232&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/gvfs/debian/patches/90_relibtoolize.patch [utf-8] Fri Oct 1 11:08:20 2010
@@ -6,22 +6,22 @@
rm -rf autom4te.cache/
diff '-x*config.guess' '-x*config.sub' -Naur gvfs-1.6.2.old/aclocal.m4 gvfs-1.6.2/aclocal.m4
-Index: gvfs-1.6.3/aclocal.m4
+Index: quilt-UA6TYS/aclocal.m4
===================================================================
---- gvfs-1.6.3.orig/aclocal.m4 2010-07-19 18:36:38.202746775 +0200
-+++ gvfs-1.6.3/aclocal.m4 2010-07-19 18:35:13.390748676 +0200
+--- quilt-UA6TYS.orig/aclocal.m4 2010-09-27 16:52:38.000000000 +0200
++++ quilt-UA6TYS/aclocal.m4 2010-10-01 13:00:01.000000000 +0200
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
-[m4_warning([this file was generated for autoconf 2.66.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-+[m4_warning([this file was generated for autoconf 2.65.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
++[m4_warning([this file was generated for autoconf 2.67.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -711,8 +711,7 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_IN
+@@ -711,8 +711,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -31,7 +31,7 @@
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
-@@ -721,8 +720,7 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_IN
+@@ -721,8 +720,7 @@
m4_define([_LT_COPYING], [dnl
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -41,7 +41,7 @@
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
-@@ -749,7 +747,7 @@ m4_define([_LT_COPYING], [dnl
+@@ -749,7 +747,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
])
@@ -50,7 +50,7 @@
# LT_PREREQ(VERSION)
-@@ -778,7 +776,6 @@ esac
+@@ -778,7 +776,6 @@
# ------------------
AC_DEFUN([LT_INIT],
[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
@@ -58,7 +58,7 @@
AC_BEFORE([$0], [LT_LANG])dnl
AC_BEFORE([$0], [LT_OUTPUT])dnl
AC_BEFORE([$0], [LTDL_INIT])dnl
-@@ -795,8 +792,6 @@ AC_REQUIRE([LTVERSION_VERSION])dnl
+@@ -795,8 +792,6 @@
AC_REQUIRE([LTOBSOLETE_VERSION])dnl
m4_require([_LT_PROG_LTMAIN])dnl
@@ -67,7 +67,7 @@
dnl Parse OPTIONS
_LT_SET_OPTIONS([$0], [$1])
-@@ -833,7 +828,7 @@ m4_defun([_LT_CC_BASENAME],
+@@ -833,7 +828,7 @@
*) break;;
esac
done
@@ -76,7 +76,7 @@
])
-@@ -853,9 +848,6 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],
+@@ -853,9 +848,6 @@
m4_defun([_LT_SETUP],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
@@ -86,7 +86,7 @@
_LT_DECL([], [host_alias], [0], [The host system])dnl
_LT_DECL([], [host], [0])dnl
_LT_DECL([], [host_os], [0])dnl
-@@ -897,6 +889,7 @@ fi
+@@ -897,6 +889,7 @@
_LT_CHECK_OBJDIR
m4_require([_LT_TAG_COMPILER])dnl
@@ -94,7 +94,7 @@
case $host_os in
aix3*)
-@@ -910,6 +903,23 @@ aix3*)
+@@ -910,6 +903,23 @@
;;
esac
@@ -118,7 +118,7 @@
# Global variables:
ofile=libtool
can_build_shared=yes
-@@ -950,28 +960,6 @@ _LT_CONFIG_COMMANDS
+@@ -950,28 +960,6 @@
])# _LT_SETUP
@@ -147,7 +147,7 @@
# _LT_PROG_LTMAIN
# ---------------
# Note that this code is called both from `configure', and `config.status'
-@@ -1124,7 +1112,7 @@ m4_define([_lt_decl_all_varnames],
+@@ -1124,7 +1112,7 @@
# declaration there will have the same value as in `configure'. VARNAME
# must have a single quote delimited value for this to work.
m4_define([_LT_CONFIG_STATUS_DECLARE],
@@ -156,7 +156,7 @@
# _LT_CONFIG_STATUS_DECLARATIONS
-@@ -1134,7 +1122,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],
+@@ -1134,7 +1122,7 @@
# embedded single quotes properly. In configure, this macro expands
# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
#
@@ -165,7 +165,7 @@
m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
[m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-@@ -1233,20 +1221,12 @@ LTCC='$LTCC'
+@@ -1233,20 +1221,12 @@
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
@@ -188,7 +188,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -1257,9 +1237,9 @@ done
+@@ -1257,9 +1237,9 @@
# Double-quote double-evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
@@ -200,7 +200,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -1267,38 +1247,16 @@ for var in lt_decl_all_varnames([[ \
+@@ -1267,38 +1247,16 @@
esac
done
@@ -246,7 +246,7 @@
# LT_OUTPUT
# ---------
-@@ -1308,11 +1266,20 @@ m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_
+@@ -1308,11 +1266,20 @@
AC_DEFUN([LT_OUTPUT],
[: ${CONFIG_LT=./config.lt}
AC_MSG_NOTICE([creating $CONFIG_LT])
@@ -270,7 +270,7 @@
exec AS_MESSAGE_LOG_FD>>config.log
{
echo
-@@ -1338,7 +1305,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_
+@@ -1338,7 +1305,7 @@
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
configured by $[0], generated by m4_PACKAGE_STRING.
@@ -279,7 +279,7 @@
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
-@@ -1383,13 +1350,15 @@ chmod +x "$CONFIG_LT"
+@@ -1383,13 +1350,15 @@
# appending to config.log, which fails on DOS, as config.log is still kept
# open by configure. Here we exec the FD to /dev/null, effectively closing
# config.log, so it can be properly (re)opened and appended to by config.lt.
@@ -302,7 +302,7 @@
])# LT_OUTPUT
-@@ -1566,13 +1535,11 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)
+@@ -1566,13 +1535,11 @@
AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
@@ -316,7 +316,7 @@
# _LT_TAG_COMPILER
-@@ -1677,31 +1644,6 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECK
+@@ -1677,31 +1644,6 @@
[lt_cv_ld_exported_symbols_list=no])
LDFLAGS="$save_LDFLAGS"
])
@@ -348,7 +348,7 @@
case $host_os in
rhapsody* | darwin1.[[012]])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -1729,7 +1671,7 @@ _LT_EOF
+@@ -1729,7 +1671,7 @@
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
@@ -357,7 +357,7 @@
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
-@@ -1749,11 +1691,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+@@ -1749,11 +1691,7 @@
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -370,7 +370,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -1761,7 +1699,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+@@ -1761,7 +1699,7 @@
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -379,7 +379,7 @@
_LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
_LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
_LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -1807,65 +1745,170 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -1807,65 +1745,170 @@
# _LT_SHELL_INIT(ARG)
# -------------------
m4_define([_LT_SHELL_INIT],
@@ -597,7 +597,7 @@
])# _LT_PROG_ECHO_BACKSLASH
-@@ -1897,7 +1940,7 @@ ia64-*-hpux*)
+@@ -1897,7 +1940,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -606,7 +606,7 @@
if AC_TRY_EVAL(ac_compile); then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
-@@ -2049,19 +2092,10 @@ if test -n "$RANLIB"; then
+@@ -2049,19 +2092,10 @@
esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -626,7 +626,7 @@
])# _LT_CMD_OLD_ARCHIVE
-@@ -2086,15 +2120,15 @@ AC_CACHE_CHECK([$1], [$2],
+@@ -2086,15 +2120,15 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -645,7 +645,7 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
-@@ -2134,7 +2168,7 @@ AC_CACHE_CHECK([$1], [$2],
+@@ -2134,7 +2168,7 @@
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&AS_MESSAGE_LOG_FD
@@ -654,7 +654,7 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
-@@ -2197,11 +2231,6 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
+@@ -2197,11 +2231,6 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -666,7 +666,7 @@
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
-@@ -2266,8 +2295,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
+@@ -2266,8 +2295,8 @@
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
@@ -677,7 +677,7 @@
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
-@@ -2318,7 +2347,7 @@ else
+@@ -2318,7 +2347,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -686,7 +686,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -2359,13 +2388,7 @@ else
+@@ -2359,13 +2388,7 @@
# endif
#endif
@@ -701,7 +701,7 @@
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -2374,11 +2397,7 @@ int main ()
+@@ -2374,11 +2397,7 @@
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -714,7 +714,7 @@
/* dlclose (self); */
}
else
-@@ -2554,16 +2573,16 @@ AC_CACHE_CHECK([if $compiler supports -c
+@@ -2554,16 +2573,16 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -734,7 +734,7 @@
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-@@ -2722,7 +2741,6 @@ m4_require([_LT_DECL_EGREP])dnl
+@@ -2722,7 +2741,6 @@
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_OBJDUMP])dnl
m4_require([_LT_DECL_SED])dnl
@@ -742,7 +742,7 @@
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
-@@ -2731,23 +2749,16 @@ if test "$GCC" = yes; then
+@@ -2731,23 +2749,16 @@
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
@@ -772,7 +772,7 @@
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
-@@ -2760,7 +2771,7 @@ if test "$GCC" = yes; then
+@@ -2760,7 +2771,7 @@
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
@@ -781,7 +781,7 @@
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
-@@ -2780,13 +2791,7 @@ BEGIN {RS=" "; FS="/|\n";} {
+@@ -2780,13 +2791,7 @@
if (lt_foo != "") { lt_freq[[lt_foo]]++; }
if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
}'`
@@ -796,7 +796,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi])
-@@ -2874,7 +2879,7 @@ amigaos*)
+@@ -2874,7 +2879,7 @@
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -805,7 +805,7 @@
;;
esac
;;
-@@ -2927,12 +2932,23 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -2927,12 +2932,23 @@
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
@@ -831,7 +831,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
-@@ -3032,19 +3048,6 @@ gnu*)
+@@ -3032,19 +3048,6 @@
hardcode_into_libs=yes
;;
@@ -851,7 +851,7 @@
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
-@@ -3087,10 +3090,8 @@ hpux9* | hpux10* | hpux11*)
+@@ -3087,10 +3090,8 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -863,7 +863,7 @@
;;
interix[[3-9]]*)
-@@ -3157,35 +3158,26 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -3157,35 +3158,26 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -910,7 +910,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -3197,6 +3189,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -3197,6 +3189,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -929,7 +929,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -3417,8 +3421,6 @@ _LT_DECL([], [library_names_spec], [1],
+@@ -3417,8 +3421,6 @@
The last name is the one that the linker finds with -lNAME]])
_LT_DECL([], [soname_spec], [1],
[[The coded name of the library, if different from the real name]])
@@ -938,7 +938,7 @@
_LT_DECL([], [postinstall_cmds], [2],
[Command to use after installation of a shared archive])
_LT_DECL([], [postuninstall_cmds], [2],
-@@ -3531,7 +3533,6 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+@@ -3531,7 +3533,6 @@
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
m4_require([_LT_DECL_SED])dnl
m4_require([_LT_DECL_EGREP])dnl
@@ -946,7 +946,7 @@
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
-@@ -3661,8 +3662,8 @@ case $host_os in
+@@ -3661,8 +3662,8 @@
fi
;;
esac
@@ -957,7 +957,7 @@
])# _LT_CMD_RELOAD
-@@ -3714,18 +3715,16 @@ mingw* | pw32*)
+@@ -3714,18 +3715,16 @@
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
@@ -979,7 +979,7 @@
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
-@@ -3755,10 +3754,6 @@ gnu*)
+@@ -3755,10 +3754,6 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -990,7 +990,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
-@@ -3767,11 +3762,11 @@ hpux10.20* | hpux11*)
+@@ -3767,11 +3762,11 @@
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
@@ -1004,7 +1004,7 @@
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
-@@ -3797,7 +3792,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -3797,7 +3792,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -1013,7 +1013,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -3935,19 +3930,7 @@ if test "$lt_cv_path_NM" != "no"; then
+@@ -3935,19 +3930,7 @@
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
@@ -1034,7 +1034,7 @@
AC_SUBST([DUMPBIN])
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
-@@ -3960,13 +3943,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-co
+@@ -3960,13 +3943,13 @@
AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
[lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
@@ -1051,7 +1051,7 @@
cat conftest.out >&AS_MESSAGE_LOG_FD
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -3989,7 +3972,7 @@ AC_DEFUN([LT_LIB_M],
+@@ -3989,7 +3972,7 @@
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
@@ -1060,7 +1060,7 @@
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
-@@ -4017,12 +4000,7 @@ m4_defun([_LT_COMPILER_NO_RTTI],
+@@ -4017,12 +4000,7 @@
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
if test "$GCC" = yes; then
@@ -1074,7 +1074,7 @@
_LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
lt_cv_prog_compiler_rtti_exceptions,
-@@ -4039,7 +4017,6 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_
+@@ -4039,7 +4017,6 @@
m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_PROG_CC])dnl
@@ -1082,7 +1082,7 @@
AC_REQUIRE([LT_PATH_NM])dnl
AC_REQUIRE([LT_PATH_LD])dnl
m4_require([_LT_DECL_SED])dnl
-@@ -4165,7 +4142,7 @@ _LT_EOF
+@@ -4165,7 +4142,7 @@
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
@@ -1091,7 +1091,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -4327,11 +4304,6 @@ m4_if([$1], [CXX], [
+@@ -4327,11 +4304,6 @@
# DJGPP does not support shared libraries at all
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -1103,7 +1103,7 @@
interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
-@@ -4470,8 +4442,8 @@ m4_if([$1], [CXX], [
+@@ -4470,8 +4442,8 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -1114,7 +1114,7 @@
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-@@ -4501,7 +4473,7 @@ m4_if([$1], [CXX], [
+@@ -4501,7 +4473,7 @@
;;
esac
;;
@@ -1123,7 +1123,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -4533,7 +4505,7 @@ m4_if([$1], [CXX], [
+@@ -4533,7 +4505,7 @@
;;
solaris*)
case $cc_basename in
@@ -1132,7 +1132,7 @@
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4637,12 +4609,6 @@ m4_if([$1], [CXX], [
+@@ -4637,12 +4609,6 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -1145,7 +1145,7 @@
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
-@@ -4685,13 +4651,6 @@ m4_if([$1], [CXX], [
+@@ -4685,13 +4651,6 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
esac
@@ -1159,7 +1159,7 @@
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
-@@ -4755,7 +4714,7 @@ m4_if([$1], [CXX], [
+@@ -4755,7 +4714,7 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
;;
@@ -1168,7 +1168,7 @@
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -4767,26 +4726,26 @@ m4_if([$1], [CXX], [
+@@ -4767,26 +4726,26 @@
# All Alpha code is PIC.
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -1203,7 +1203,7 @@
esac
;;
esac
-@@ -4817,7 +4776,7 @@ m4_if([$1], [CXX], [
+@@ -4817,7 +4776,7 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
case $cc_basename in
@@ -1212,7 +1212,7 @@
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-@@ -4927,10 +4886,8 @@ m4_if([$1], [CXX], [
+@@ -4927,10 +4886,8 @@
aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -1224,7 +1224,7 @@
else
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
-@@ -4941,6 +4898,9 @@ m4_if([$1], [CXX], [
+@@ -4941,6 +4898,9 @@
cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -1234,7 +1234,7 @@
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -5005,36 +4965,13 @@ dnl Note also adjust exclude_expsyms for
+@@ -5005,36 +4965,13 @@
openbsd*)
with_gnu_ld=no
;;
@@ -1274,7 +1274,7 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-@@ -5068,12 +5005,11 @@ dnl Note also adjust exclude_expsyms for
+@@ -5068,12 +5005,11 @@
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
@@ -1290,7 +1290,7 @@
_LT_EOF
fi
-@@ -5109,7 +5045,6 @@ _LT_EOF
+@@ -5109,7 +5045,6 @@
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1298,7 +1298,7 @@
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-@@ -5131,11 +5066,6 @@ _LT_EOF
+@@ -5131,11 +5066,6 @@
fi
;;
@@ -1310,7 +1310,7 @@
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -5165,12 +5095,11 @@ _LT_EOF
+@@ -5165,12 +5095,11 @@
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
@@ -1326,7 +1326,7 @@
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
-@@ -5181,17 +5110,13 @@ _LT_EOF
+@@ -5181,17 +5110,13 @@
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
@@ -1346,7 +1346,7 @@
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
-@@ -5207,17 +5132,17 @@ _LT_EOF
+@@ -5207,17 +5132,17 @@
fi
case $cc_basename in
@@ -1367,7 +1367,7 @@
fi
;;
esac
-@@ -5226,7 +5151,7 @@ _LT_EOF
+@@ -5226,7 +5151,7 @@
fi
;;
@@ -1376,7 +1376,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -5338,10 +5263,8 @@ _LT_EOF
+@@ -5338,10 +5263,8 @@
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -1388,7 +1388,7 @@
else
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
-@@ -5403,6 +5326,7 @@ _LT_EOF
+@@ -5403,6 +5326,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -1396,7 +1396,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -5430,7 +5354,7 @@ _LT_EOF
+@@ -5430,7 +5354,7 @@
# empty executable.
_LT_SYS_MODULE_PATH_AIX
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1405,7 +1405,7 @@
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-@@ -5445,13 +5369,8 @@ _LT_EOF
+@@ -5445,13 +5369,8 @@
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1421,7 +1421,7 @@
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared libraries.
_LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-@@ -5490,7 +5409,7 @@ _LT_EOF
+@@ -5490,7 +5409,7 @@
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
@@ -1430,7 +1430,7 @@
# The linker will automatically build a .lib file if we build a DLL.
_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
-@@ -5557,7 +5476,7 @@ _LT_EOF
+@@ -5557,7 +5476,7 @@
;;
hpux10*)
@@ -1439,7 +1439,7 @@
_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-@@ -5576,7 +5495,7 @@ _LT_EOF
+@@ -5576,7 +5495,7 @@
;;
hpux11*)
@@ -1448,7 +1448,7 @@
case $host_cpu in
hppa*64*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -5597,14 +5516,7 @@ _LT_EOF
+@@ -5597,14 +5516,7 @@
_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -1464,7 +1464,7 @@
;;
esac
fi
-@@ -5632,19 +5544,19 @@ _LT_EOF
+@@ -5632,19 +5544,19 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1488,7 +1488,7 @@
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-@@ -5653,7 +5565,7 @@ _LT_EOF
+@@ -5653,7 +5565,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1497,7 +1497,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -5706,17 +5618,17 @@ _LT_EOF
+@@ -5706,17 +5618,17 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_TAGVAR(hardcode_minus_L, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -1518,7 +1518,7 @@
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-@@ -5726,13 +5638,13 @@ _LT_EOF
+@@ -5726,13 +5638,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1535,7 +1535,7 @@
# Both c and cxx compiler support -rpath directly
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -5923,38 +5835,36 @@ x|xyes)
+@@ -5923,38 +5835,36 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -1604,7 +1604,7 @@
;;
esac
fi
-@@ -6120,14 +6030,14 @@ CC="$lt_save_CC"
+@@ -6120,14 +6030,14 @@
])# _LT_LANG_C_CONFIG
@@ -1627,7 +1627,7 @@
if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
(test "X$CXX" != "Xg++"))) ; then
-@@ -6135,6 +6045,22 @@ if test -n "$CXX" && ( test "X$CXX" != "
+@@ -6135,6 +6045,22 @@
else
_lt_caught_CXX_error=yes
fi
@@ -1650,7 +1650,7 @@
AC_LANG_PUSH(C++)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-@@ -6156,8 +6082,6 @@ _LT_TAGVAR(module_cmds, $1)=
+@@ -6156,8 +6082,6 @@
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -1659,7 +1659,7 @@
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -6260,7 +6184,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6260,7 +6184,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -1668,7 +1668,7 @@
else
GXX=no
-@@ -6372,7 +6296,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6372,7 +6296,7 @@
_LT_SYS_MODULE_PATH_AIX
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1677,7 +1677,7 @@
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-@@ -6387,13 +6311,8 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6387,13 +6311,8 @@
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1693,7 +1693,7 @@
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
-@@ -6426,7 +6345,6 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6426,7 +6345,6 @@
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1701,7 +1701,7 @@
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-@@ -6487,11 +6405,6 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6487,11 +6405,6 @@
gnu*)
;;
@@ -1713,7 +1713,7 @@
hpux9*)
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -6516,7 +6429,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6516,7 +6429,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1722,7 +1722,7 @@
;;
*)
if test "$GXX" = yes; then
-@@ -6581,7 +6494,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6581,7 +6494,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1731,7 +1731,7 @@
;;
*)
if test "$GXX" = yes; then
-@@ -6624,7 +6537,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6624,7 +6537,7 @@
case $cc_basename in
CC*)
# SGI C++
@@ -1740,7 +1740,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -6635,9 +6548,9 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6635,9 +6548,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -1752,7 +1752,7 @@
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
-@@ -6666,7 +6579,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6666,7 +6579,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1761,7 +1761,7 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -6703,26 +6616,26 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6703,26 +6616,26 @@
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
@@ -1794,7 +1794,7 @@
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
-@@ -6730,7 +6643,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6730,7 +6643,7 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -1803,7 +1803,7 @@
;;
cxx*)
# Compaq C++
-@@ -6749,9 +6662,9 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6749,9 +6662,9 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1815,7 +1815,7 @@
# IBM XL 8.0 on PPC, with GNU ld
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -6771,13 +6684,13 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6771,13 +6684,13 @@
_LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
@@ -1831,7 +1831,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -6846,7 +6759,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6846,7 +6759,7 @@
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
_LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
@@ -1840,7 +1840,7 @@
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -6881,15 +6794,15 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6881,15 +6794,15 @@
case $host in
osf3*)
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1859,7 +1859,7 @@
$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
-@@ -6905,17 +6818,17 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6905,17 +6818,17 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1880,7 +1880,7 @@
;;
esac
-@@ -6925,7 +6838,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6925,7 +6838,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -1889,7 +1889,7 @@
else
# FIXME: insert proper C++ library support
-@@ -6961,7 +6874,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6961,7 +6874,7 @@
solaris*)
case $cc_basename in
@@ -1898,7 +1898,7 @@
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-@@ -6982,7 +6895,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6982,7 +6895,7 @@
esac
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -1907,7 +1907,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -7009,7 +6922,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -7009,7 +6922,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -1916,7 +1916,7 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
-@@ -7020,7 +6933,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -7020,7 +6933,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -1925,7 +1925,7 @@
fi
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-@@ -7074,10 +6987,6 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -7074,10 +6987,6 @@
CC*)
_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -1936,7 +1936,7 @@
;;
*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -7324,7 +7233,7 @@ linux*)
+@@ -7324,7 +7233,7 @@
solaris*)
case $cc_basename in
@@ -1945,7 +1945,7 @@
# The more standards-conforming stlport4 library is
# incompatible with the Cstd library. Avoid specifying
# it if it's in CXXFLAGS. Ignore libCrun as
-@@ -7368,16 +7277,32 @@ _LT_TAGDECL([], [compiler_lib_search_pat
+@@ -7368,16 +7277,32 @@
])# _LT_SYS_HIDDEN_LIBDEPS
@@ -1982,7 +1982,7 @@
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -7396,8 +7321,6 @@ _LT_TAGVAR(module_cmds, $1)=
+@@ -7396,8 +7321,6 @@
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -1991,7 +1991,7 @@
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -7497,17 +7420,32 @@ AC_LANG_POP
+@@ -7497,17 +7420,32 @@
])# _LT_LANG_F77_CONFIG
@@ -2029,7 +2029,7 @@
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -7526,8 +7464,6 @@ _LT_TAGVAR(module_cmds, $1)=
+@@ -7526,8 +7464,6 @@
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -2038,7 +2038,7 @@
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -7673,8 +7609,6 @@ _LT_CC_BASENAME([$compiler])
+@@ -7673,8 +7609,6 @@
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -2047,7 +2047,7 @@
if test -n "$compiler"; then
_LT_COMPILER_NO_RTTI($1)
-@@ -8036,7 +7970,7 @@ _LT_EOF
+@@ -8036,7 +7970,7 @@
func_dirname ()
{
# Extract subdirectory from the argument.
@@ -2056,7 +2056,7 @@
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
-@@ -8047,7 +7981,7 @@ func_dirname ()
+@@ -8047,7 +7981,7 @@
# func_basename file
func_basename ()
{
@@ -2065,7 +2065,7 @@
}
dnl func_dirname_and_basename
-@@ -8063,8 +7997,10 @@ dnl so there is no need for it here.
+@@ -8063,8 +7997,10 @@
func_stripname ()
{
case ${2} in
@@ -2078,7 +2078,7 @@
esac
}
-@@ -8075,20 +8011,20 @@ my_sed_long_arg='1s/^-[[^=]]*=//'
+@@ -8075,20 +8011,20 @@
# func_opt_split
func_opt_split ()
{
@@ -2103,7 +2103,7 @@
}
# func_arith arithmetic-term...
-@@ -8136,15 +8072,14 @@ _LT_EOF
+@@ -8136,15 +8072,14 @@
# Helper functions for option handling. -*- Autoconf -*-
#
@@ -2121,7 +2121,7 @@
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-@@ -8259,7 +8194,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+@@ -8259,7 +8194,7 @@
[enable_win32_dll=yes
case $host in
@@ -2130,7 +2130,7 @@
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
-@@ -8267,13 +8202,13 @@ case $host in
+@@ -8267,13 +8202,13 @@
esac
test -z "$AS" && AS=as
@@ -2147,7 +2147,7 @@
])# win32-dll
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-@@ -8633,29 +8568,29 @@ m4_define([lt_dict_filter],
+@@ -8633,29 +8568,29 @@
# Generated from ltversion.in.
@@ -2184,7 +2184,7 @@
# These exist entirely to fool aclocal when bootstrapping libtool.
#
-@@ -8725,6 +8660,7 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC
+@@ -8725,6 +8660,7 @@
m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
@@ -2192,7 +2192,7 @@
m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-@@ -8737,13 +8673,6 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [
+@@ -8737,13 +8673,6 @@
m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
@@ -2206,62 +2206,7 @@
# nls.m4 serial 5 (gettext-0.18)
dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
-@@ -8823,7 +8752,7 @@ if test -n "$PKG_CONFIG"; then
- AC_MSG_RESULT([no])
- PKG_CONFIG=""
- fi
--fi[]
-+fi[]dnl
- ])# PKG_PROG_PKG_CONFIG
-
- # PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-@@ -8837,12 +8766,12 @@ fi[]
- # have to call PKG_CHECK_EXISTS manually
- # --------------------------------------------------------------
- AC_DEFUN([PKG_CHECK_EXISTS],
--[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+[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_ifvaln([$3], [else
-- $3])
-+ $3])dnl
- fi])
-
- # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-@@ -8856,7 +8785,7 @@ m4_define([_PKG_CONFIG],
- [pkg_failed=yes])
- else
- pkg_failed=untried
--fi[]
-+fi[]dnl
- ])# _PKG_CONFIG
-
- # _PKG_SHORT_ERRORS_SUPPORTED
-@@ -8867,7 +8796,7 @@ if $PKG_CONFIG --atleast-pkgconfig-versi
- _pkg_short_errors_supported=yes
- else
- _pkg_short_errors_supported=no
--fi[]
-+fi[]dnl
- ])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-@@ -8882,9 +8811,9 @@ fi[]
- #
- # --------------------------------------------------------------
- AC_DEFUN([PKG_CHECK_MODULES],
--[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
--AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])
--AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
- pkg_failed=no
- AC_MSG_CHECKING([for $1])
-@@ -8915,7 +8844,7 @@ $$1_PKG_ERRORS
+@@ -8915,7 +8844,7 @@
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
@@ -2270,7 +2215,7 @@
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
-@@ -8926,14 +8855,14 @@ path to pkg-config.
+@@ -8926,7 +8855,7 @@
_PKG_TEXT
@@ -2279,15 +2224,7 @@
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
- AC_MSG_RESULT([yes])
- $3
--fi[]
-+fi[]dnl
- ])# PKG_CHECK_MODULES
-
- # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-@@ -9516,6 +9445,46 @@ fi
+@@ -9516,6 +9445,46 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
@@ -2334,11 +2271,11 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
-Index: gvfs-1.6.3/client/Makefile.in
+Index: quilt-UA6TYS/client/Makefile.in
===================================================================
---- gvfs-1.6.3.orig/client/Makefile.in 2010-07-12 17:32:42.000000000 +0200
-+++ gvfs-1.6.3/client/Makefile.in 2010-07-19 18:35:24.714248877 +0200
-@@ -45,7 +45,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+--- quilt-UA6TYS.orig/client/Makefile.in 2010-09-27 16:52:39.000000000 +0200
++++ quilt-UA6TYS/client/Makefile.in 2010-10-01 13:00:04.000000000 +0200
+@@ -45,7 +45,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -2347,7 +2284,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -244,6 +244,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
+@@ -244,6 +244,7 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2355,7 +2292,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -323,6 +324,7 @@ libdir = @libdir@
+@@ -323,6 +324,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -2363,7 +2300,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -344,7 +346,7 @@ INCLUDES = -I$(top_srcdir) \
+@@ -344,7 +346,7 @@
-I$(top_srcdir)/metadata \
-I$(top_srcdir)/common \
$(GLIB_CFLAGS) $(DBUS_CFLAGS) \
@@ -2372,7 +2309,7 @@
-DGVFS_MODULE_DIR=\"$(libdir)/gvfs/modules\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
-DDBUS_API_SUBJECT_TO_CHANGE
-@@ -396,7 +398,7 @@ test_uri_utils_CFLAGS = $(INCLUDES)
+@@ -396,7 +398,7 @@
@USE_FUSE_TRUE@ -I$(top_srcdir) \
@USE_FUSE_TRUE@ -I$(top_srcdir)/common \
@USE_FUSE_TRUE@ $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(FUSE_CFLAGS) \
@@ -2381,7 +2318,7 @@
@USE_FUSE_TRUE@ -DDBUS_API_SUBJECT_TO_CHANGE
@USE_FUSE_TRUE at gvfs_fuse_daemon_LDADD = \
-@@ -407,7 +409,7 @@ all: all-am
+@@ -407,7 +409,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -2390,7 +2327,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -432,9 +434,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -432,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2402,11 +2339,11 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-giomodulesLTLIBRARIES: $(giomodules_LTLIBRARIES)
-Index: gvfs-1.6.3/common/Makefile.in
+Index: quilt-UA6TYS/common/Makefile.in
===================================================================
---- gvfs-1.6.3.orig/common/Makefile.in 2010-07-12 17:32:42.000000000 +0200
-+++ gvfs-1.6.3/common/Makefile.in 2010-07-19 18:35:24.898746269 +0200
-@@ -41,7 +41,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+--- quilt-UA6TYS.orig/common/Makefile.in 2010-09-27 16:52:39.000000000 +0200
++++ quilt-UA6TYS/common/Makefile.in 2010-10-01 13:00:04.000000000 +0200
+@@ -41,7 +41,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -2415,7 +2352,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -66,8 +66,8 @@ am__nobase_list = $(am__nobase_strip_set
+@@ -66,8 +66,8 @@
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
@@ -2426,7 +2363,7 @@
am__DEPENDENCIES_1 =
@HAVE_AVAHI_TRUE at libgvfscommon_dnssd_la_DEPENDENCIES = \
@HAVE_AVAHI_TRUE@ libgvfscommon.la $(am__DEPENDENCIES_1) \
-@@ -85,9 +85,10 @@ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERB
+@@ -85,9 +85,10 @@
am__v_lt_0 = --silent
libgvfscommon_dnssd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -2440,7 +2377,7 @@
libgvfscommon_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libgvfscommon_la_OBJECTS = gsysutils.lo gvfsdbusutils.lo \
-@@ -225,6 +226,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
+@@ -225,6 +226,7 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2448,7 +2385,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -304,6 +306,7 @@ libdir = @libdir@
+@@ -304,6 +306,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -2456,7 +2393,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -320,11 +323,12 @@ top_build_prefix = @top_build_prefix@
+@@ -320,11 +323,12 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
NULL =
@@ -2471,7 +2408,7 @@
-DDBUS_API_SUBJECT_TO_CHANGE
libgvfscommon_la_SOURCES = \
-@@ -342,7 +346,7 @@ libgvfscommon_la_SOURCES = \
+@@ -342,7 +346,7 @@
# needed by cygwin (see bug #564003)
@@ -2480,7 +2417,7 @@
libgvfscommon_la_LIBADD = \
$(DBUS_LIBS) \
$(GLIB_LIBS) \
-@@ -356,6 +360,7 @@ libgvfscommon_la_LIBADD = \
+@@ -356,6 +360,7 @@
@HAVE_AVAHI_TRUE at libgvfscommon_dnssd_la_CFLAGS = \
@HAVE_AVAHI_TRUE@ $(AVAHI_CFLAGS)
@@ -2488,7 +2425,7 @@
@HAVE_AVAHI_TRUE at libgvfscommon_dnssd_la_LIBADD = \
@HAVE_AVAHI_TRUE@ libgvfscommon.la \
@HAVE_AVAHI_TRUE@ $(AVAHI_LIBS) \
-@@ -365,7 +370,7 @@ all: all-am
+@@ -365,7 +370,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -2497,7 +2434,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -390,37 +395,37 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -390,37 +395,37 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2549,7 +2486,7 @@
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
-@@ -429,7 +434,7 @@ clean-libLTLIBRARIES:
+@@ -429,7 +434,7 @@
libgvfscommon-dnssd.la: $(libgvfscommon_dnssd_la_OBJECTS) $(libgvfscommon_dnssd_la_DEPENDENCIES)
$(AM_V_CCLD)$(libgvfscommon_dnssd_la_LINK) $(am_libgvfscommon_dnssd_la_rpath) $(libgvfscommon_dnssd_la_OBJECTS) $(libgvfscommon_dnssd_la_LIBADD) $(LIBS)
libgvfscommon.la: $(libgvfscommon_la_OBJECTS) $(libgvfscommon_la_DEPENDENCIES)
@@ -2558,7 +2495,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -582,7 +587,7 @@ check-am: all-am
+@@ -582,7 +587,7 @@
check: check-am
all-am: Makefile $(LTLIBRARIES)
installdirs:
@@ -2567,7 +2504,7 @@
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
-@@ -612,7 +617,7 @@ maintainer-clean-generic:
+@@ -612,7 +617,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
@@ -2576,7 +2513,7 @@
mostlyclean-am
distclean: distclean-am
-@@ -633,13 +638,13 @@ info: info-am
+@@ -633,13 +638,13 @@
info-am:
@@ -2592,7 +2529,7 @@
install-html: install-html-am
-@@ -679,23 +684,23 @@ ps: ps-am
+@@ -679,23 +684,23 @@
ps-am:
@@ -2621,26 +2558,19 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-Index: gvfs-1.6.3/configure
+Index: quilt-UA6TYS/configure
===================================================================
---- gvfs-1.6.3.orig/configure 2010-07-12 17:32:46.000000000 +0200
-+++ gvfs-1.6.3/configure 2010-07-19 18:35:59.634744280 +0200
-@@ -1,11 +1,11 @@
+--- quilt-UA6TYS.orig/configure 2010-09-27 16:52:42.000000000 +0200
++++ quilt-UA6TYS/configure 2010-10-01 13:00:08.000000000 +0200
+@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.66.
-+# Generated by GNU Autoconf 2.65.
++# Generated by GNU Autoconf 2.67.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
--# Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-+# Inc.
- #
- #
- # This configure script is free software; the Free Software Foundation
-@@ -171,14 +171,6 @@ test x\$exitcode = x0 || exit 1"
+@@ -171,14 +171,6 @@
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
@@ -2655,44 +2585,7 @@
test \$(( 1 + 1 )) = 2 || exit 1"
if (eval "$as_required") 2>/dev/null; then :
as_have_required=yes
-@@ -324,7 +316,7 @@ $as_echo X"$as_dir" |
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
-- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
- } # as_fn_mkdir_p
-@@ -364,19 +356,19 @@ else
- fi # as_fn_arith
-
-
--# as_fn_error STATUS ERROR [LINENO LOG_FD]
--# ----------------------------------------
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
- # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
--# script with STATUS, using 1 if that was 0.
-+# script with status $?, using 1 if that was 0.
- as_fn_error ()
- {
-- as_status=$1; test $as_status -eq 0 && as_status=1
-- if test "$4"; then
-- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-+ as_status=$?; test $as_status -eq 0 && as_status=1
-+ if test "$3"; then
-+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
- fi
-- $as_echo "$as_me: error: $2" >&2
-+ $as_echo "$as_me: error: $1" >&2
- as_fn_exit $as_status
- } # as_fn_error
-
-@@ -533,14 +525,161 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+@@ -533,8 +525,155 @@
# Sed expression to map a string onto a valid variable name.
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -2848,14 +2741,7 @@
test -n "$DJDIR" || exec 7<&0 </dev/null
exec 6>&1
-
- # Name of the host.
--# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
- # so uname gets run too.
- ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-@@ -749,6 +888,7 @@ OTOOL
+@@ -749,6 +888,7 @@
LIPO
NMEDIT
DSYMUTIL
@@ -2863,7 +2749,7 @@
RANLIB
AR
OBJDUMP
-@@ -787,6 +927,9 @@ CPPFLAGS
+@@ -787,6 +927,9 @@
LDFLAGS
CFLAGS
CC
@@ -2873,7 +2759,7 @@
am__untar
am__tar
AMTAR
-@@ -851,6 +994,7 @@ SHELL'
+@@ -851,6 +994,7 @@
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -2881,134 +2767,32 @@
enable_dependency_tracking
enable_static
enable_shared
-@@ -1040,7 +1184,7 @@ do
- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-- as_fn_error $? "invalid feature name: $ac_useropt"
-+ as_fn_error "invalid feature name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
-@@ -1066,7 +1210,7 @@ do
- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-- as_fn_error $? "invalid feature name: $ac_useropt"
-+ as_fn_error "invalid feature name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
-@@ -1270,7 +1414,7 @@ do
- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-- as_fn_error $? "invalid package name: $ac_useropt"
-+ as_fn_error "invalid package name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
-@@ -1286,7 +1430,7 @@ do
- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-- as_fn_error $? "invalid package name: $ac_useropt"
-+ as_fn_error "invalid package name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
-@@ -1316,8 +1460,8 @@ do
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries=$ac_optarg ;;
-
-- -*) as_fn_error $? "unrecognized option: \`$ac_option'
--Try \`$0 --help' for more information"
-+ -*) as_fn_error "unrecognized option: \`$ac_option'
-+Try \`$0 --help' for more information."
- ;;
-
- *=*)
-@@ -1325,7 +1469,7 @@ Try \`$0 --help' for more information"
- # Reject names that are not valid shell variable names.
- case $ac_envvar in #(
- '' | [0-9]* | *[!_$as_cr_alnum]* )
-- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
- esac
- eval $ac_envvar=\$ac_optarg
- export $ac_envvar ;;
-@@ -1343,13 +1487,13 @@ done
-
- if test -n "$ac_prev"; then
- ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-- as_fn_error $? "missing argument to $ac_option"
-+ as_fn_error "missing argument to $ac_option"
- fi
-
- if test -n "$ac_unrecognized_opts"; then
- case $enable_option_checking in
- no) ;;
-- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+@@ -896,12 +1040,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CC
+-LDFLAGS
+-LIBS
+-CPPFLAGS
+ CPP
+-CPPFLAGS
+ PKG_CONFIG
+ PKG_CONFIG_PATH
+ PKG_CONFIG_LIBDIR
+@@ -999,8 +1138,9 @@
+ fi
+
+ case $ac_option in
+- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+- *) ac_optarg=yes ;;
++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++ *=) ac_optarg= ;;
++ *) ac_optarg=yes ;;
esac
- fi
-@@ -1372,7 +1516,7 @@ do
- [\\/$]* | ?:[\\/]* ) continue;;
- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
- esac
-- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
- done
-
- # There might be people who depend on the old broken behavior: `$host'
-@@ -1386,8 +1530,8 @@ target=$target_alias
- if test "x$host_alias" != x; then
- if test "x$build_alias" = x; then
- cross_compiling=maybe
-- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-- If a cross compiler is detected then cross compile mode will be used" >&2
-+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+ If a cross compiler is detected then cross compile mode will be used." >&2
- elif test "x$build_alias" != "x$host_alias"; then
- cross_compiling=yes
- fi
-@@ -1402,9 +1546,9 @@ test "$silent" = yes && exec 6>/dev/null
- ac_pwd=`pwd` && test -n "$ac_pwd" &&
- ac_ls_di=`ls -di .` &&
- ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-- as_fn_error $? "working directory cannot be determined"
-+ as_fn_error "working directory cannot be determined"
- test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-- as_fn_error $? "pwd does not report name of working directory"
-+ as_fn_error "pwd does not report name of working directory"
-
-
- # Find the source files, if location was not specified.
-@@ -1443,11 +1587,11 @@ else
- fi
- if test ! -r "$srcdir/$ac_unique_file"; then
- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
- fi
- ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
- ac_abs_confdir=`(
-- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
- pwd)`
- # When building in place, set srcdir=.
- if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1487,7 +1631,7 @@ Configuration:
- --help=short display options specific to this package
- --help=recursive display the short help of all the included packages
- -V, --version display version information and exit
-- -q, --quiet, --silent do not print \`checking ...' messages
-+ -q, --quiet, --silent do not print \`checking...' messages
- --cache-file=FILE cache test results in FILE [disabled]
- -C, --config-cache alias for \`--cache-file=config.cache'
- -n, --no-create do not create output files
-@@ -1549,6 +1693,8 @@ Optional Features:
+
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+@@ -1554,6 +1694,8 @@
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
@@ -3017,268 +2801,66 @@
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--enable-static[=PKGS] build static libraries [default=no]
-@@ -1726,9 +1872,9 @@ test -n "$ac_init_help" && exit $ac_stat
+@@ -1731,7 +1873,7 @@
if $ac_init_version; then
cat <<\_ACEOF
configure
-generated by GNU Autoconf 2.66
-+generated by GNU Autoconf 2.65
-
--Copyright (C) 2010 Free Software Foundation, Inc.
-+Copyright (C) 2009 Free Software Foundation, Inc.
++generated by GNU Autoconf 2.67
+
+ Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1869,7 +2015,7 @@ ac_fn_c_check_header_compile ()
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
+@@ -1849,7 +1991,7 @@
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } >/dev/null && {
++ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+@@ -2163,7 +2305,7 @@
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -1941,7 +2087,7 @@ ac_fn_c_check_func ()
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2009,7 +2155,7 @@ ac_fn_c_check_type ()
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
- eval "$3=no"
-@@ -2063,7 +2209,7 @@ ac_fn_c_check_member ()
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
- $as_echo_n "checking for $2.$3... " >&6; }
--if eval "test \"\${$4+set}\"" = set; then :
-+if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2119,10 +2265,10 @@ $as_echo "$ac_res" >&6; }
- ac_fn_c_check_header_mongrel ()
- {
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-- if eval "test \"\${$3+set}\"" = set; then :
-+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
+ ac_header_preproc=no
fi
- eval ac_res=\$$3
-@@ -2185,7 +2331,7 @@ $as_echo "$as_me: WARNING: $2: proceedin
- esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
- eval "$3=\$ac_header_compiler"
-@@ -2202,7 +2348,7 @@ This file contains any messages produced
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+ $as_echo "$ac_header_preproc" >&6; }
+
+@@ -2207,7 +2349,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.66. Invocation command line was
-+generated by GNU Autoconf 2.65. Invocation command line was
++generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
-@@ -2312,9 +2458,11 @@ trap 'exit_status=$?
- {
- echo
-
-- $as_echo "## ---------------- ##
-+ cat <<\_ASBOX
-+## ---------------- ##
- ## Cache variables. ##
--## ---------------- ##"
-+## ---------------- ##
-+_ASBOX
- echo
- # The following way of writing the cache mishandles newlines in values,
- (
-@@ -2348,9 +2496,11 @@ $as_echo "$as_me: WARNING: cache variabl
- )
- echo
-
-- $as_echo "## ----------------- ##
-+ cat <<\_ASBOX
-+## ----------------- ##
- ## Output variables. ##
--## ----------------- ##"
-+## ----------------- ##
-+_ASBOX
- echo
- for ac_var in $ac_subst_vars
- do
-@@ -2363,9 +2513,11 @@ $as_echo "$as_me: WARNING: cache variabl
- echo
-
- if test -n "$ac_subst_files"; then
-- $as_echo "## ------------------- ##
-+ cat <<\_ASBOX
-+## ------------------- ##
- ## File substitutions. ##
--## ------------------- ##"
-+## ------------------- ##
-+_ASBOX
- echo
- for ac_var in $ac_subst_files
- do
-@@ -2379,9 +2531,11 @@ $as_echo "$as_me: WARNING: cache variabl
- fi
-
- if test -s confdefs.h; then
-- $as_echo "## ----------- ##
-+ cat <<\_ASBOX
-+## ----------- ##
- ## confdefs.h. ##
--## ----------- ##"
-+## ----------- ##
-+_ASBOX
- echo
- cat confdefs.h
- echo
-@@ -2436,12 +2590,7 @@ _ACEOF
- ac_site_file1=NONE
- ac_site_file2=NONE
- if test -n "$CONFIG_SITE"; then
-- # We do not want a PATH search for config.site.
-- case $CONFIG_SITE in #((
-- -*) ac_site_file1=./$CONFIG_SITE;;
-- */*) ac_site_file1=$CONFIG_SITE;;
-- *) ac_site_file1=./$CONFIG_SITE;;
-- esac
-+ ac_site_file1=$CONFIG_SITE
- elif test "x$prefix" != xNONE; then
- ac_site_file1=$prefix/share/config.site
- ac_site_file2=$prefix/etc/config.site
-@@ -2456,11 +2605,7 @@ do
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
- $as_echo "$as_me: loading site script $ac_site_file" >&6;}
- sed 's/^/| /' "$ac_site_file" >&5
-- . "$ac_site_file" \
-- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "failed to load site script $ac_site_file
+@@ -2465,7 +2607,7 @@
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
-+ . "$ac_site_file"
++See \`config.log' for more details" "$LINENO" 5 ; }
fi
done
-@@ -2536,7 +2681,7 @@ if $ac_cache_corrupted; then
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
- $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
- fi
- ## -------------------- ##
- ## Main body of script. ##
-@@ -2554,22 +2699,16 @@ am__api_version='1.11'
-
- ac_aux_dir=
- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-- if test -f "$ac_dir/install-sh"; then
-- ac_aux_dir=$ac_dir
-- ac_install_sh="$ac_aux_dir/install-sh -c"
-- break
-- elif test -f "$ac_dir/install.sh"; then
-- ac_aux_dir=$ac_dir
-- ac_install_sh="$ac_aux_dir/install.sh -c"
-- break
-- elif test -f "$ac_dir/shtool"; then
-- ac_aux_dir=$ac_dir
-- ac_install_sh="$ac_aux_dir/shtool install -c"
-- break
-- fi
-+ for ac_t in install-sh install.sh shtool; do
-+ if test -f "$ac_dir/$ac_t"; then
-+ ac_aux_dir=$ac_dir
-+ ac_install_sh="$ac_aux_dir/$ac_t -c"
-+ break 2
-+ fi
-+ done
- done
- if test -z "$ac_aux_dir"; then
-- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
- fi
-
- # These three variables are undocumented and unsupported,
-@@ -2685,11 +2824,11 @@ am_lf='
+@@ -2690,11 +2832,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2711,7 +2850,7 @@ if (
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
-- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
-+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
- alias in your environment" "$LINENO" 5
- fi
-
-@@ -2721,7 +2860,7 @@ then
- # Ok.
- :
- else
-- as_fn_error $? "newly created file is older than distributed files!
-+ as_fn_error "newly created file is older than distributed files!
- Check your system clock" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -2959,7 +3098,7 @@ done
- $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
- set x ${MAKE-make}
- ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
- cat >conftest.make <<\_ACEOF
-@@ -2967,7 +3106,7 @@ SHELL = /bin/sh
- all:
- @echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
--# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- case `${MAKE-make} -f conftest.make 2>/dev/null` in
- *@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
-@@ -3001,7 +3140,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
- am__isrc=' -I$(srcdir)'
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
-- as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
- fi
- fi
-
-@@ -3057,6 +3196,29 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+@@ -3062,6 +3204,29 @@
@@ -3308,136 +2890,129 @@
ac_config_headers="$ac_config_headers config.h"
-@@ -3071,11 +3233,11 @@ am_lf='
+@@ -3076,11 +3241,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -3097,7 +3259,7 @@ if (
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
-- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
-+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
- alias in your environment" "$LINENO" 5
- fi
-
-@@ -3107,7 +3269,7 @@ then
- # Ok.
- :
- else
-- as_fn_error $? "newly created file is older than distributed files!
-+ as_fn_error "newly created file is older than distributed files!
- Check your system clock" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -3475,8 +3637,8 @@ fi
-
+@@ -3481,7 +3646,7 @@
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "no acceptable C compiler found in \$PATH
+ as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -3590,8 +3752,9 @@ sed 's/^/| /' conftest.$ac_ext >&5
-
+@@ -3596,7 +3761,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error 77 "C compiler cannot create executables
+ as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-+{ as_fn_set_status 77
-+as_fn_error "C compiler cannot create executables
-+See \`config.log' for more details." "$LINENO" 5; }; }
++See \`config.log' for more details" "$LINENO" 5 ; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-@@ -3633,8 +3796,8 @@ done
+@@ -3639,7 +3804,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+@@ -3698,7 +3863,7 @@
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ fi
+ fi
+@@ -3750,7 +3915,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+@@ -4535,7 +4700,7 @@
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -4943,7 +5108,7 @@
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -4959,11 +5124,11 @@
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+ break
+ fi
+@@ -5002,7 +5167,7 @@
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -5018,18 +5183,18 @@
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+ as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-+as_fn_error "cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
fi
- rm -f conftest conftest$ac_cv_exeext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -3691,9 +3854,9 @@ $as_echo "$ac_try_echo"; } >&5
- else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run C compiled programs.
-+as_fn_error "cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
- fi
- fi
-@@ -3744,8 +3907,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
-
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot compute suffix of object files: cannot compile
--See \`config.log' for more details" "$LINENO" 5; }
-+as_fn_error "cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
-@@ -4529,8 +4692,8 @@ fi
-
- test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "no acceptable C compiler found in \$PATH
--See \`config.log' for more details" "$LINENO" 5; }
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
-
- # Provide some information about the compiler.
- $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -5023,8 +5186,8 @@ if $ac_preproc_ok; then :
- else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details" "$LINENO" 5; }
-+as_fn_error "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
ac_ext=c
-@@ -5049,7 +5212,7 @@ fi
- $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
- set x ${MAKE-make}
- ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
- cat >conftest.make <<\_ACEOF
-@@ -5057,7 +5220,7 @@ SHELL = /bin/sh
- all:
- @echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
--# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- case `${MAKE-make} -f conftest.make 2>/dev/null` in
- *@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
-@@ -5115,8 +5278,8 @@ esac
+@@ -5120,8 +5285,8 @@
@@ -3448,54 +3023,25 @@
-@@ -5134,7 +5297,7 @@ ltmain="$ac_aux_dir/ltmain.sh"
-
- # Make sure we can run config.sub.
- $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
- $as_echo_n "checking build system type... " >&6; }
-@@ -5145,16 +5308,16 @@ else
- test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
- test "x$ac_build_alias" = x &&
-- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
- ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+@@ -5159,7 +5324,7 @@
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -5179,7 +5342,7 @@ else
- ac_cv_host=$ac_cv_build
- else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
- fi
-
- fi
-@@ -5187,7 +5350,7 @@ fi
+@@ -5192,7 +5357,7 @@
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -5203,75 +5366,6 @@ IFS=$ac_save_IFS
+@@ -5208,75 +5373,6 @@
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -3571,52 +3117,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
if test "${ac_cv_path_SED+set}" = set; then :
-@@ -5329,7 +5423,7 @@ esac
- done
- IFS=$as_save_IFS
- if test -z "$ac_cv_path_SED"; then
-- as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
- fi
- else
- ac_cv_path_SED=$SED
-@@ -5405,7 +5499,7 @@ esac
- done
- IFS=$as_save_IFS
- if test -z "$ac_cv_path_GREP"; then
-- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
- else
- ac_cv_path_GREP=$GREP
-@@ -5471,7 +5565,7 @@ esac
- done
- IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP"; then
-- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
- else
- ac_cv_path_EGREP=$EGREP
-@@ -5538,7 +5632,7 @@ esac
- done
- IFS=$as_save_IFS
- if test -z "$ac_cv_path_FGREP"; then
-- as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
- else
- ac_cv_path_FGREP=$FGREP
-@@ -5654,7 +5748,7 @@ else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
--test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
- $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
- if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-@@ -5737,11 +5831,8 @@ if test "$lt_cv_path_NM" != "no"; then
+@@ -5742,11 +5838,8 @@
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
@@ -3630,7 +3131,7 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-@@ -5785,7 +5876,7 @@ fi
+@@ -5790,7 +5883,7 @@
fi
if test -z "$DUMPBIN"; then
ac_ct_DUMPBIN=$DUMPBIN
@@ -3639,7 +3140,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-@@ -5840,15 +5931,6 @@ esac
+@@ -5845,15 +5938,6 @@
fi
fi
@@ -3655,24 +3156,24 @@
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
-@@ -5868,13 +5950,13 @@ if test "${lt_cv_nm_interface+set}" = se
+@@ -5873,13 +5957,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:5953: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:5960: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:5956: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:5963: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-+ (eval echo "\"\$as_me:5959: output\"" >&5)
++ (eval echo "\"\$as_me:5966: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -5920,11 +6002,6 @@ else
+@@ -5925,11 +6009,6 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -3684,7 +3185,7 @@
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
-@@ -5989,8 +6066,8 @@ else
+@@ -5994,8 +6073,8 @@
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
@@ -3695,7 +3196,7 @@
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
-@@ -6261,18 +6338,16 @@ mingw* | pw32*)
+@@ -6266,18 +6345,16 @@
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
@@ -3717,7 +3218,7 @@
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
-@@ -6302,10 +6377,6 @@ gnu*)
+@@ -6307,10 +6384,6 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3728,7 +3229,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
-@@ -6314,11 +6385,11 @@ hpux10.20* | hpux11*)
+@@ -6319,11 +6392,11 @@
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
@@ -3742,7 +3243,7 @@
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
-@@ -6344,7 +6415,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -6349,7 +6422,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3751,7 +3252,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -6756,18 +6827,6 @@ if test -n "$RANLIB"; then
+@@ -6761,18 +6834,6 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -3770,7 +3271,7 @@
-@@ -6937,8 +6996,8 @@ _LT_EOF
+@@ -6942,8 +7003,8 @@
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
@@ -3781,16 +3282,16 @@
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && test -s "$nlist"; then
-@@ -7091,7 +7150,7 @@ ia64-*-hpux*)
+@@ -7096,7 +7157,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-+ echo '#line 7153 "configure"' > conftest.$ac_ext
++ echo '#line 7160 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7803,38 +7862,6 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -7808,38 +7869,6 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
@@ -3829,7 +3330,7 @@
case $host_os in
rhapsody* | darwin1.[012])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -7862,7 +7889,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
+@@ -7867,7 +7896,7 @@
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
@@ -3838,17 +3339,7 @@
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
-@@ -7990,7 +8017,8 @@ do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
- "
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -8015,8 +8043,6 @@ done
+@@ -8020,8 +8049,6 @@
@@ -3857,7 +3348,7 @@
# Set options
-@@ -8139,7 +8165,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+@@ -8144,7 +8171,6 @@
@@ -3865,7 +3356,7 @@
test -z "$LN_S" && LN_S="ln -s"
-@@ -8189,6 +8214,19 @@ _ACEOF
+@@ -8194,6 +8220,19 @@
@@ -3885,7 +3376,7 @@
case $host_os in
aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
-@@ -8201,6 +8239,23 @@ aix3*)
+@@ -8206,6 +8245,23 @@
;;
esac
@@ -3909,7 +3400,7 @@
# Global variables:
ofile=libtool
can_build_shared=yes
-@@ -8229,7 +8284,7 @@ for cc_temp in $compiler""; do
+@@ -8234,7 +8290,7 @@
*) break;;
esac
done
@@ -3918,7 +3409,7 @@
# Only perform the check for file, if the check method requires it
-@@ -8434,12 +8489,7 @@ if test -n "$compiler"; then
+@@ -8439,12 +8495,7 @@
lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
@@ -3932,17 +3423,17 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-@@ -8459,15 +8509,15 @@ else
+@@ -8464,15 +8515,15 @@
-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:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8512: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8518: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:8516: \$? = $ac_status" >&5
++ echo "$as_me:8522: \$? = $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.
@@ -3951,7 +3442,7 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
-@@ -8545,12 +8595,6 @@ $as_echo_n "checking for $compiler optio
+@@ -8550,12 +8601,6 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -3964,7 +3455,7 @@
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
-@@ -8593,13 +8637,6 @@ $as_echo_n "checking for $compiler optio
+@@ -8598,13 +8643,6 @@
lt_prog_compiler_pic='-fPIC'
;;
esac
@@ -3978,7 +3469,7 @@
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
-@@ -8662,7 +8699,7 @@ $as_echo_n "checking for $compiler optio
+@@ -8667,7 +8705,7 @@
lt_prog_compiler_pic='--shared'
lt_prog_compiler_static='--static'
;;
@@ -3987,7 +3478,7 @@
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
-@@ -8674,26 +8711,26 @@ $as_echo_n "checking for $compiler optio
+@@ -8679,26 +8717,26 @@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -4022,7 +3513,7 @@
esac
;;
esac
-@@ -8724,7 +8761,7 @@ $as_echo_n "checking for $compiler optio
+@@ -8729,7 +8767,7 @@
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
case $cc_basename in
@@ -4031,17 +3522,17 @@
lt_prog_compiler_wl='-Qoption ld ';;
*)
lt_prog_compiler_wl='-Wl,';;
-@@ -8811,15 +8848,15 @@ else
+@@ -8816,15 +8854,15 @@
-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:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8851: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8857: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:8855: \$? = $ac_status" >&5
++ echo "$as_me:8861: \$? = $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.
@@ -4050,7 +3541,7 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works=yes
-@@ -8867,7 +8904,7 @@ else
+@@ -8872,7 +8910,7 @@
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
@@ -4059,17 +3550,17 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works=yes
-@@ -8916,16 +8953,16 @@ else
+@@ -8921,16 +8959,16 @@
-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:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8956: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8962: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:8960: \$? = $ac_status" >&5
++ echo "$as_me:8966: \$? = $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
@@ -4079,17 +3570,17 @@
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
-@@ -8971,16 +9008,16 @@ else
+@@ -8976,16 +9014,16 @@
-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:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9011: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9017: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:9015: \$? = $ac_status" >&5
++ echo "$as_me:9021: \$? = $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
@@ -4099,7 +3590,7 @@
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
-@@ -9090,36 +9127,13 @@ $as_echo_n "checking whether the $compil
+@@ -9095,36 +9133,13 @@
openbsd*)
with_gnu_ld=no
;;
@@ -4139,7 +3630,7 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-@@ -9153,12 +9167,11 @@ $as_echo_n "checking whether the $compil
+@@ -9158,12 +9173,11 @@
ld_shlibs=no
cat <<_LT_EOF 1>&2
@@ -4155,7 +3646,7 @@
_LT_EOF
fi
-@@ -9194,7 +9207,6 @@ _LT_EOF
+@@ -9199,7 +9213,6 @@
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -4163,7 +3654,7 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
-@@ -9216,11 +9228,6 @@ _LT_EOF
+@@ -9221,11 +9234,6 @@
fi
;;
@@ -4175,7 +3666,7 @@
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
-@@ -9250,12 +9257,11 @@ _LT_EOF
+@@ -9255,12 +9263,11 @@
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
@@ -4191,7 +3682,7 @@
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
-@@ -9266,17 +9272,13 @@ _LT_EOF
+@@ -9271,17 +9278,13 @@
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
@@ -4211,7 +3702,7 @@
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
-@@ -9292,17 +9294,17 @@ _LT_EOF
+@@ -9297,17 +9300,17 @@
fi
case $cc_basename in
@@ -4232,7 +3723,7 @@
fi
;;
esac
-@@ -9311,7 +9313,7 @@ _LT_EOF
+@@ -9316,7 +9319,7 @@
fi
;;
@@ -4241,7 +3732,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9423,10 +9425,8 @@ _LT_EOF
+@@ -9428,10 +9431,8 @@
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -4253,7 +3744,7 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
-@@ -9488,6 +9488,7 @@ _LT_EOF
+@@ -9493,6 +9494,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -4261,7 +3752,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9544,7 +9545,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -9549,7 +9551,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -4270,7 +3761,7 @@
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-@@ -9588,13 +9589,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9593,13 +9595,8 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -4286,7 +3777,7 @@
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds its shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-@@ -9633,7 +9629,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9638,7 +9635,7 @@
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
@@ -4295,7 +3786,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_from_new_cmds='true'
# FIXME: Should let the user specify the lib program.
-@@ -9649,11 +9645,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9654,11 +9651,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
@@ -4308,7 +3799,7 @@
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -9661,7 +9653,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9666,7 +9659,7 @@
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -4317,7 +3808,7 @@
archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -9727,7 +9719,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9732,7 +9725,7 @@
;;
hpux10*)
@@ -4326,7 +3817,7 @@
archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-@@ -9746,7 +9738,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9751,7 +9744,7 @@
;;
hpux11*)
@@ -4335,7 +3826,7 @@
case $host_cpu in
hppa*64*)
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -9767,46 +9759,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9772,46 +9765,7 @@
archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -4383,7 +3874,7 @@
;;
esac
fi
-@@ -9834,7 +9787,7 @@ fi
+@@ -9839,7 +9793,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -4392,7 +3883,7 @@
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
-@@ -9845,15 +9798,15 @@ fi
+@@ -9850,15 +9804,15 @@
int foo(void) {}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -4411,7 +3902,7 @@
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -9862,7 +9815,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -9867,7 +9821,7 @@
link_all_deplibs=yes
;;
@@ -4420,7 +3911,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9915,17 +9868,17 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -9920,17 +9874,17 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -4441,7 +3932,7 @@
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -9935,13 +9888,13 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -9940,13 +9894,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -4458,7 +3949,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10144,50 +10097,44 @@ x|xyes)
+@@ -10149,50 +10103,44 @@
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
@@ -4538,7 +4029,7 @@
;;
esac
fi
-@@ -10358,23 +10305,16 @@ if test "$GCC" = yes; then
+@@ -10363,23 +10311,16 @@
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
@@ -4568,7 +4059,7 @@
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
-@@ -10387,7 +10327,7 @@ if test "$GCC" = yes; then
+@@ -10392,7 +10333,7 @@
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
@@ -4577,7 +4068,7 @@
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
-@@ -10407,13 +10347,7 @@ BEGIN {RS=" "; FS="/|\n";} {
+@@ -10412,13 +10353,7 @@
if (lt_foo != "") { lt_freq[lt_foo]++; }
if (lt_freq[lt_foo] == 1) { print lt_foo; }
}'`
@@ -4592,7 +4083,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -10501,7 +10435,7 @@ amigaos*)
+@@ -10506,7 +10441,7 @@
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4601,7 +4092,7 @@
;;
esac
;;
-@@ -10554,12 +10488,23 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -10559,12 +10494,23 @@
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -4627,7 +4118,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
-@@ -10659,19 +10604,6 @@ gnu*)
+@@ -10664,19 +10610,6 @@
hardcode_into_libs=yes
;;
@@ -4647,7 +4138,7 @@
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
-@@ -10714,10 +10646,8 @@ hpux9* | hpux10* | hpux11*)
+@@ -10719,10 +10652,8 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -4659,7 +4150,7 @@
;;
interix[3-9]*)
-@@ -10784,17 +10714,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -10789,17 +10720,12 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -4682,7 +4173,7 @@
/* end confdefs.h. */
int
-@@ -10807,31 +10732,23 @@ main ()
+@@ -10812,31 +10738,23 @@
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
@@ -4719,7 +4210,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10843,6 +10760,18 @@ fi
+@@ -10848,6 +10766,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4738,7 +4229,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11133,11 +11062,6 @@ fi
+@@ -11138,11 +11068,6 @@
@@ -4750,16 +4241,16 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
-@@ -11468,7 +11392,7 @@ else
+@@ -11473,7 +11398,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-+#line 11395 "configure"
++#line 11401 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11509,13 +11433,7 @@ else
+@@ -11514,13 +11439,7 @@
# endif
#endif
@@ -4774,7 +4265,7 @@
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11524,11 +11442,7 @@ int main ()
+@@ -11529,11 +11448,7 @@
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -4787,16 +4278,16 @@
/* dlclose (self); */
}
else
-@@ -11574,7 +11488,7 @@ else
+@@ -11579,7 +11494,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-+#line 11491 "configure"
++#line 11497 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11615,13 +11529,7 @@ else
+@@ -11620,13 +11535,7 @@
# endif
#endif
@@ -4811,7 +4302,7 @@
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11630,11 +11538,7 @@ int main ()
+@@ -11635,11 +11544,7 @@
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -4824,125 +4315,7 @@
/* dlclose (self); */
}
else
-@@ -11902,7 +11806,7 @@ $as_echo_n "checking whether cc understa
- fi
- set dummy $CC; ac_cc=`$as_echo "$2" |
- sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
--if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
-+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -12076,7 +11980,7 @@ esac
- done
- IFS=$as_save_IFS
- if test -z "$ac_cv_path_SED"; then
-- as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
- fi
- else
- ac_cv_path_SED=$SED
-@@ -12372,7 +12276,6 @@ $as_echo "no" >&6; }
- fi
-
-
--
- # Extract the first word of "gtkdoc-check", so it can be a program name with args.
- set dummy gtkdoc-check; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-@@ -12520,8 +12423,7 @@ fi
-
-
- if test x$enable_gtk_doc = xyes; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk-doc") 2>&5
- ac_status=$?
-@@ -12529,8 +12431,7 @@ if test -n "$PKG_CONFIG" && \
- test $ac_status = 0; }; then
- :
- else
-- as_fn_error $? "gtk-doc not installed and --enable-gtk-doc requested" "$LINENO" 5
--
-+ as_fn_error "gtk-doc not installed and --enable-gtk-doc requested" "$LINENO" 5
- fi
- fi
-
-@@ -12604,9 +12505,6 @@ DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-
-
-
-
--
--
--
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
- $as_echo_n "checking for GLIB... " >&6; }
-@@ -12614,8 +12512,7 @@ $as_echo_n "checking for GLIB... " >&6;
- if test -n "$GLIB_CFLAGS"; then
- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.23.4 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0 \""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.23.4 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0 ") 2>&5
- ac_status=$?
-@@ -12624,17 +12521,14 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.23.4 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0 " 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
- fi
--
- if test -n "$GLIB_LIBS"; then
- pkg_cv_GLIB_LIBS="$GLIB_LIBS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.23.4 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0 \""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.23.4 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0 ") 2>&5
- ac_status=$?
-@@ -12643,7 +12537,6 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.23.4 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0 " 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
-@@ -12651,7 +12544,6 @@ fi
-
-
-
--
- if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -12661,7 +12553,6 @@ if $PKG_CONFIG --atleast-pkgconfig-versi
- else
- _pkg_short_errors_supported=no
- fi
--
- if test $_pkg_short_errors_supported = yes; then
- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.23.4 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0 " 2>&1`
- else
-@@ -12670,7 +12561,7 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$GLIB_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (glib-2.0 >= 2.23.4 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0 ) were not met:
-+ as_fn_error "Package requirements (glib-2.0 >= 2.23.4 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0 ) were not met:
-
- $GLIB_PKG_ERRORS
-
-@@ -12680,13 +12571,12 @@ installed software in a non-standard pre
+@@ -12672,7 +12577,6 @@
Alternatively, you may set the environment variables GLIB_CFLAGS
and GLIB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4950,97 +4323,17 @@
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
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -12695,8 +12585,7 @@ and GLIB_LIBS to avoid the need to call
+@@ -12687,8 +12591,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
else
GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
GLIB_LIBS=$pkg_cv_GLIB_LIBS
-@@ -12706,10 +12595,6 @@ $as_echo "yes" >&6; }
- fi
-
-
--
--
--
--
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
- $as_echo_n "checking for DBUS... " >&6; }
-@@ -12717,8 +12602,7 @@ $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" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
- ac_status=$?
-@@ -12727,17 +12611,14 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1" 2>/dev/null`
- else
- pkg_failed=yes
--
- 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" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
- ac_status=$?
-@@ -12746,7 +12627,6 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
-@@ -12754,7 +12634,6 @@ fi
-
-
-
--
- if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -12764,7 +12643,6 @@ if $PKG_CONFIG --atleast-pkgconfig-versi
- 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" 2>&1`
- else
-@@ -12773,7 +12651,7 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$DBUS_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (dbus-1) were not met:
-+ as_fn_error "Package requirements (dbus-1) were not met:
-
- $DBUS_PKG_ERRORS
-
-@@ -12783,13 +12661,12 @@ installed software in a non-standard pre
+@@ -12764,7 +12667,6 @@
Alternatively, you may set the environment variables DBUS_CFLAGS
and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -5048,206 +4341,17 @@
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
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -12798,8 +12675,7 @@ and DBUS_LIBS to avoid the need to call
+@@ -12779,8 +12681,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
else
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
DBUS_LIBS=$pkg_cv_DBUS_LIBS
-@@ -12809,7 +12685,6 @@ $as_echo "yes" >&6; }
- fi
-
-
--
- # Check whether --with-dbus_service_dir was given.
- if test "${with_dbus_service_dir+set}" = set; then :
- withval=$with_dbus_service_dir; with_dbus_service_dir="$withval"
-@@ -12842,7 +12717,7 @@ $as_echo "$USE_NLS" >&6; }
-
- case "$am__api_version" in
- 1.01234)
-- as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
-+ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
- ;;
- *)
- ;;
-@@ -12859,7 +12734,7 @@ $as_echo_n "checking for intltool >= 0.3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
- $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-- as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5
-+ as_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5
- fi
-
- # Extract the first word of "intltool-update", so it can be a program name with args.
-@@ -12983,7 +12858,7 @@ fi
-
-
- if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-- as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
-+ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
- fi
-
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -13265,13 +13140,13 @@ fi
-
-
- if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-- as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
-+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
- fi
- xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
- mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
- mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
- if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-- as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
-+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
- fi
-
- # Extract the first word of "perl", so it can be a program name with args.
-@@ -13315,13 +13190,13 @@ fi
-
-
- if test -z "$INTLTOOL_PERL"; then
-- as_fn_error $? "perl not found" "$LINENO" 5
-+ as_fn_error "perl not found" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
- $as_echo_n "checking for perl >= 5.8.1... " >&6; }
- $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
- if test $? -ne 0; then
-- as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
-+ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
- else
- IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
-@@ -13334,7 +13209,7 @@ $as_echo_n "checking for XML::Parser...
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
- $as_echo "ok" >&6; }
- else
-- as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
-+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
- fi
- fi
-
-@@ -14150,7 +14025,8 @@ for ac_header in sys/un.h stropts.h term
- do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -14165,7 +14041,8 @@ for ac_func in getpt posix_openpt grantp
- do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
--if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -14297,22 +14174,17 @@ HTTP_CFLAGS=
- HTTP_LIBS=
-
- if test "x$enable_http" != "xno"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-gnome-2.4 >= 2.26.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libsoup-gnome-2.4 >= 2.26.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- msg_http=yes
--
- fi
-
- if test "x$msg_http" = "xyes"; then
-
--
--
--
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HTTP" >&5
- $as_echo_n "checking for HTTP... " >&6; }
-@@ -14320,8 +14192,7 @@ $as_echo_n "checking for HTTP... " >&6;
- if test -n "$HTTP_CFLAGS"; then
- pkg_cv_HTTP_CFLAGS="$HTTP_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-gnome-2.4 libxml-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libsoup-gnome-2.4 libxml-2.0") 2>&5
- ac_status=$?
-@@ -14330,17 +14201,14 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_HTTP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-gnome-2.4 libxml-2.0" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
- fi
--
- if test -n "$HTTP_LIBS"; then
- pkg_cv_HTTP_LIBS="$HTTP_LIBS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-gnome-2.4 libxml-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libsoup-gnome-2.4 libxml-2.0") 2>&5
- ac_status=$?
-@@ -14349,7 +14217,6 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_HTTP_LIBS=`$PKG_CONFIG --libs "libsoup-gnome-2.4 libxml-2.0" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
-@@ -14357,7 +14224,6 @@ fi
-
-
-
--
- if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -14367,7 +14233,6 @@ if $PKG_CONFIG --atleast-pkgconfig-versi
- else
- _pkg_short_errors_supported=no
- fi
--
- if test $_pkg_short_errors_supported = yes; then
- HTTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsoup-gnome-2.4 libxml-2.0" 2>&1`
- else
-@@ -14376,7 +14241,7 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$HTTP_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (libsoup-gnome-2.4 libxml-2.0) were not met:
-+ as_fn_error "Package requirements (libsoup-gnome-2.4 libxml-2.0) were not met:
-
- $HTTP_PKG_ERRORS
-
-@@ -14386,13 +14251,12 @@ installed software in a non-standard pre
+@@ -14354,7 +14255,6 @@
Alternatively, you may set the environment variables HTTP_CFLAGS
and HTTP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -5255,256 +4359,17 @@
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
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -14401,8 +14265,7 @@ and HTTP_LIBS to avoid the need to call
+@@ -14369,8 +14269,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
else
HTTP_CFLAGS=$pkg_cv_HTTP_CFLAGS
HTTP_LIBS=$pkg_cv_HTTP_LIBS
-@@ -14411,7 +14274,6 @@ $as_echo "yes" >&6; }
-
- fi
-
--
- $as_echo "#define HAVE_HTTP 1" >>confdefs.h
-
- fi
-@@ -14445,9 +14307,6 @@ fi
- msg_avahi=no
- if test "x$enable_avahi" != "xno"; then
-
--
--
--
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVAHI" >&5
- $as_echo_n "checking for AVAHI... " >&6; }
-@@ -14455,8 +14314,7 @@ $as_echo_n "checking for AVAHI... " >&6;
- if test -n "$AVAHI_CFLAGS"; then
- pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-glib >= 0.6 avahi-client >= 0.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "avahi-glib >= 0.6 avahi-client >= 0.6") 2>&5
- ac_status=$?
-@@ -14465,17 +14323,14 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags "avahi-glib >= 0.6 avahi-client >= 0.6" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
- fi
--
- if test -n "$AVAHI_LIBS"; then
- pkg_cv_AVAHI_LIBS="$AVAHI_LIBS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-glib >= 0.6 avahi-client >= 0.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "avahi-glib >= 0.6 avahi-client >= 0.6") 2>&5
- ac_status=$?
-@@ -14484,7 +14339,6 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs "avahi-glib >= 0.6 avahi-client >= 0.6" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
-@@ -14492,7 +14346,6 @@ fi
-
-
-
--
- if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -14502,7 +14355,6 @@ if $PKG_CONFIG --atleast-pkgconfig-versi
- else
- _pkg_short_errors_supported=no
- fi
--
- if test $_pkg_short_errors_supported = yes; then
- AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "avahi-glib >= 0.6 avahi-client >= 0.6" 2>&1`
- else
-@@ -14550,13 +14402,9 @@ $as_echo "#define HAVE_AVAHI /**/" >>con
- fi
-
-
--
- fi
-
-
--
--
--
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML" >&5
- $as_echo_n "checking for LIBXML... " >&6; }
-@@ -14564,8 +14412,7 @@ $as_echo_n "checking for LIBXML... " >&6
- if test -n "$LIBXML_CFLAGS"; then
- pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
- ac_status=$?
-@@ -14574,17 +14421,14 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
- fi
--
- if test -n "$LIBXML_LIBS"; then
- pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
- ac_status=$?
-@@ -14593,7 +14437,6 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
-@@ -14601,7 +14444,6 @@ fi
-
-
-
--
- if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -14611,7 +14453,6 @@ if $PKG_CONFIG --atleast-pkgconfig-versi
- else
- _pkg_short_errors_supported=no
- fi
--
- if test $_pkg_short_errors_supported = yes; then
- LIBXML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0" 2>&1`
- else
-@@ -14658,7 +14499,6 @@ $as_echo "#define HAVE_LIBXML /**/" >>co
- msg_libxml=yes
- fi
-
--
- # Check whether --enable-udev was given.
- if test "${enable_udev+set}" = set; then :
- enableval=$enable_udev;
-@@ -14669,22 +14509,17 @@ UDEV_CFLAGS=
- UDEV_LIBS=
-
- if test "x$enable_udev" != "xno"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 138\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libudev >= 138") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- msg_udev=yes
--
- fi
-
- if test "x$msg_udev" = "xyes"; then
-
--
--
--
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
- $as_echo_n "checking for UDEV... " >&6; }
-@@ -14692,8 +14527,7 @@ $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" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libudev") 2>&5
- ac_status=$?
-@@ -14702,17 +14536,14 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev" 2>/dev/null`
- else
- pkg_failed=yes
--
- 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" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libudev") 2>&5
- ac_status=$?
-@@ -14721,7 +14552,6 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs "libudev" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
-@@ -14729,7 +14559,6 @@ fi
-
-
-
--
- if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -14739,7 +14568,6 @@ if $PKG_CONFIG --atleast-pkgconfig-versi
- 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" 2>&1`
- else
-@@ -14748,7 +14576,7 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$UDEV_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (libudev) were not met:
-+ as_fn_error "Package requirements (libudev) were not met:
-
- $UDEV_PKG_ERRORS
-
-@@ -14758,13 +14586,12 @@ installed software in a non-standard pre
+@@ -14691,7 +14590,6 @@
Alternatively, you may set the environment variables UDEV_CFLAGS
and UDEV_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -5512,118 +4377,17 @@
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
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -14773,8 +14600,7 @@ and UDEV_LIBS to avoid the need to call
+@@ -14706,8 +14604,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
else
UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS
UDEV_LIBS=$pkg_cv_UDEV_LIBS
-@@ -14783,7 +14609,6 @@ $as_echo "yes" >&6; }
-
- fi
-
--
- $as_echo "#define HAVE_LIBUDEV 1" >>confdefs.h
-
- fi
-@@ -14799,22 +14624,17 @@ FUSE_LIBS=
- FUSE_CFLAGS=
-
- if test "x$enable_fuse" != "xno"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fuse\""; } >&5
- ($PKG_CONFIG --exists --print-errors "fuse") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- msg_fuse=yes
--
- fi
-
- if test "x$msg_fuse" = "xyes"; then
-
--
--
--
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FUSE" >&5
- $as_echo_n "checking for FUSE... " >&6; }
-@@ -14822,8 +14642,7 @@ $as_echo_n "checking for FUSE... " >&6;
- if test -n "$FUSE_CFLAGS"; then
- pkg_cv_FUSE_CFLAGS="$FUSE_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fuse\""; } >&5
- ($PKG_CONFIG --exists --print-errors "fuse") 2>&5
- ac_status=$?
-@@ -14832,17 +14651,14 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_FUSE_CFLAGS=`$PKG_CONFIG --cflags "fuse" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
- fi
--
- if test -n "$FUSE_LIBS"; then
- pkg_cv_FUSE_LIBS="$FUSE_LIBS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fuse\""; } >&5
- ($PKG_CONFIG --exists --print-errors "fuse") 2>&5
- ac_status=$?
-@@ -14851,7 +14667,6 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_FUSE_LIBS=`$PKG_CONFIG --libs "fuse" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
-@@ -14859,7 +14674,6 @@ fi
-
-
-
--
- if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -14869,7 +14683,6 @@ if $PKG_CONFIG --atleast-pkgconfig-versi
- else
- _pkg_short_errors_supported=no
- fi
--
- if test $_pkg_short_errors_supported = yes; then
- FUSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fuse" 2>&1`
- else
-@@ -14878,7 +14691,7 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$FUSE_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (fuse) were not met:
-+ as_fn_error "Package requirements (fuse) were not met:
-
- $FUSE_PKG_ERRORS
-
-@@ -14888,13 +14701,12 @@ installed software in a non-standard pre
+@@ -14808,7 +14705,6 @@
Alternatively, you may set the environment variables FUSE_CFLAGS
and FUSE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -5631,118 +4395,17 @@
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
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -14903,8 +14715,7 @@ and FUSE_LIBS to avoid the need to call
+@@ -14823,8 +14719,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
else
FUSE_CFLAGS=$pkg_cv_FUSE_CFLAGS
FUSE_LIBS=$pkg_cv_FUSE_LIBS
-@@ -14913,7 +14724,6 @@ $as_echo "yes" >&6; }
-
- fi
-
--
- $as_echo "#define HAVE_FUSE 1" >>confdefs.h
-
- fi
-@@ -14938,22 +14748,17 @@ GCONF_LIBS=
- GCONF_CFLAGS=
-
- if test "x$enable_gconf" != "xno"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- msg_gconf=yes
--
- fi
-
- if test "x$msg_gconf" = "xyes"; then
-
--
--
--
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF" >&5
- $as_echo_n "checking for GCONF... " >&6; }
-@@ -14961,8 +14766,7 @@ $as_echo_n "checking for GCONF... " >&6;
- if test -n "$GCONF_CFLAGS"; then
- pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
- ac_status=$?
-@@ -14971,17 +14775,14 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
- fi
--
- if test -n "$GCONF_LIBS"; then
- pkg_cv_GCONF_LIBS="$GCONF_LIBS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
- ac_status=$?
-@@ -14990,7 +14791,6 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
-@@ -14998,7 +14798,6 @@ fi
-
-
-
--
- if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -15008,7 +14807,6 @@ if $PKG_CONFIG --atleast-pkgconfig-versi
- else
- _pkg_short_errors_supported=no
- fi
--
- if test $_pkg_short_errors_supported = yes; then
- GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0" 2>&1`
- else
-@@ -15017,7 +14815,7 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$GCONF_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (gconf-2.0) were not met:
-+ as_fn_error "Package requirements (gconf-2.0) were not met:
-
- $GCONF_PKG_ERRORS
-
-@@ -15027,13 +14825,12 @@ installed software in a non-standard pre
+@@ -14934,7 +14829,6 @@
Alternatively, you may set the environment variables GCONF_CFLAGS
and GCONF_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -5750,118 +4413,17 @@
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
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -15042,8 +14839,7 @@ and GCONF_LIBS to avoid the need to call
+@@ -14949,8 +14843,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
else
GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
GCONF_LIBS=$pkg_cv_GCONF_LIBS
-@@ -15052,7 +14848,6 @@ $as_echo "yes" >&6; }
-
- fi
-
--
- $as_echo "#define HAVE_GCONF 1" >>confdefs.h
-
- fi
-@@ -15145,22 +14940,17 @@ GDU_CFLAGS=
- GDU_REQUIRED=2.29.0
-
- if test "x$enable_gdu" != "xno"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdu >= \$GDU_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gdu >= $GDU_REQUIRED") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- msg_gdu=yes
--
- fi
-
- if test "x$msg_gdu" = "xyes"; then
-
--
--
--
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDU" >&5
- $as_echo_n "checking for GDU... " >&6; }
-@@ -15168,8 +14958,7 @@ $as_echo_n "checking for GDU... " >&6; }
- if test -n "$GDU_CFLAGS"; then
- pkg_cv_GDU_CFLAGS="$GDU_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdu >= \$GDU_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gdu >= $GDU_REQUIRED") 2>&5
- ac_status=$?
-@@ -15178,17 +14967,14 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_GDU_CFLAGS=`$PKG_CONFIG --cflags "gdu >= $GDU_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
- fi
--
- if test -n "$GDU_LIBS"; then
- pkg_cv_GDU_LIBS="$GDU_LIBS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdu >= \$GDU_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gdu >= $GDU_REQUIRED") 2>&5
- ac_status=$?
-@@ -15197,7 +14983,6 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_GDU_LIBS=`$PKG_CONFIG --libs "gdu >= $GDU_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
-@@ -15205,7 +14990,6 @@ fi
-
-
-
--
- if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -15215,7 +14999,6 @@ if $PKG_CONFIG --atleast-pkgconfig-versi
- else
- _pkg_short_errors_supported=no
- fi
--
- if test $_pkg_short_errors_supported = yes; then
- GDU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gdu >= $GDU_REQUIRED" 2>&1`
- else
-@@ -15224,7 +15007,7 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$GDU_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (gdu >= $GDU_REQUIRED) were not met:
-+ as_fn_error "Package requirements (gdu >= $GDU_REQUIRED) were not met:
-
- $GDU_PKG_ERRORS
-
-@@ -15234,13 +15017,12 @@ installed software in a non-standard pre
+@@ -15128,7 +15021,6 @@
Alternatively, you may set the environment variables GDU_CFLAGS
and GDU_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -5869,118 +4431,17 @@
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
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -15249,8 +15031,7 @@ and GDU_LIBS to avoid the need to call p
+@@ -15143,8 +15035,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
else
GDU_CFLAGS=$pkg_cv_GDU_CFLAGS
GDU_LIBS=$pkg_cv_GDU_LIBS
-@@ -15259,7 +15040,6 @@ $as_echo "yes" >&6; }
-
- fi
-
--
- $as_echo "#define HAVE_GDU 1" >>confdefs.h
-
- fi
-@@ -15286,22 +15066,17 @@ HAL_CFLAGS=
- HAL_REQUIRED=0.5.10
-
- if test "x$enable_hal" != "xno" && test "x$msg_gdu" = "xno"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal >= \$HAL_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "hal >= $HAL_REQUIRED") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- msg_hal=yes
--
- fi
-
- if test "x$msg_hal" = "xyes"; then
-
--
--
--
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HAL" >&5
- $as_echo_n "checking for HAL... " >&6; }
-@@ -15309,8 +15084,7 @@ $as_echo_n "checking for HAL... " >&6; }
- if test -n "$HAL_CFLAGS"; then
- pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal >= \$HAL_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "hal >= $HAL_REQUIRED") 2>&5
- ac_status=$?
-@@ -15319,17 +15093,14 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal >= $HAL_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
- fi
--
- if test -n "$HAL_LIBS"; then
- pkg_cv_HAL_LIBS="$HAL_LIBS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal >= \$HAL_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "hal >= $HAL_REQUIRED") 2>&5
- ac_status=$?
-@@ -15338,7 +15109,6 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal >= $HAL_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
-@@ -15346,7 +15116,6 @@ fi
-
-
-
--
- if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -15356,7 +15125,6 @@ if $PKG_CONFIG --atleast-pkgconfig-versi
- else
- _pkg_short_errors_supported=no
- fi
--
- if test $_pkg_short_errors_supported = yes; then
- HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal >= $HAL_REQUIRED" 2>&1`
- else
-@@ -15365,7 +15133,7 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$HAL_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (hal >= $HAL_REQUIRED) were not met:
-+ as_fn_error "Package requirements (hal >= $HAL_REQUIRED) were not met:
-
- $HAL_PKG_ERRORS
-
-@@ -15375,13 +15143,12 @@ installed software in a non-standard pre
+@@ -15256,7 +15147,6 @@
Alternatively, you may set the environment variables HAL_CFLAGS
and HAL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -5988,118 +4449,17 @@
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
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -15390,8 +15157,7 @@ and HAL_LIBS to avoid the need to call p
+@@ -15271,8 +15161,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
else
HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
HAL_LIBS=$pkg_cv_HAL_LIBS
-@@ -15400,7 +15166,6 @@ $as_echo "yes" >&6; }
-
- fi
-
--
- $as_echo "#define HAVE_HAL 1" >>confdefs.h
-
- save_libs="$LIBS"
-@@ -15472,22 +15237,17 @@ msg_gudev=no
- GUDEV_REQUIRED=001
-
- if test "x$enable_gudev" != "xno"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= \$GUDEV_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= $GUDEV_REQUIRED") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- msg_gudev=yes
--
- fi
-
- if test "x$msg_gudev" = "xyes"; then
-
--
--
--
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUDEV" >&5
- $as_echo_n "checking for GUDEV... " >&6; }
-@@ -15495,8 +15255,7 @@ $as_echo_n "checking for GUDEV... " >&6;
- if test -n "$GUDEV_CFLAGS"; then
- pkg_cv_GUDEV_CFLAGS="$GUDEV_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= \$GUDEV_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= $GUDEV_REQUIRED") 2>&5
- ac_status=$?
-@@ -15505,17 +15264,14 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_GUDEV_CFLAGS=`$PKG_CONFIG --cflags "gudev-1.0 >= $GUDEV_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
- fi
--
- if test -n "$GUDEV_LIBS"; then
- pkg_cv_GUDEV_LIBS="$GUDEV_LIBS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= \$GUDEV_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= $GUDEV_REQUIRED") 2>&5
- ac_status=$?
-@@ -15524,7 +15280,6 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_GUDEV_LIBS=`$PKG_CONFIG --libs "gudev-1.0 >= $GUDEV_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
-@@ -15532,7 +15287,6 @@ fi
-
-
-
--
- if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -15542,7 +15296,6 @@ if $PKG_CONFIG --atleast-pkgconfig-versi
- else
- _pkg_short_errors_supported=no
- fi
--
- if test $_pkg_short_errors_supported = yes; then
- GUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gudev-1.0 >= $GUDEV_REQUIRED" 2>&1`
- else
-@@ -15551,7 +15304,7 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$GUDEV_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (gudev-1.0 >= $GUDEV_REQUIRED) were not met:
-+ as_fn_error "Package requirements (gudev-1.0 >= $GUDEV_REQUIRED) were not met:
-
- $GUDEV_PKG_ERRORS
-
-@@ -15561,13 +15314,12 @@ installed software in a non-standard pre
+@@ -15429,7 +15318,6 @@
Alternatively, you may set the environment variables GUDEV_CFLAGS
and GUDEV_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -6107,118 +4467,17 @@
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
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -15576,8 +15328,7 @@ and GUDEV_LIBS to avoid the need to call
+@@ -15444,8 +15332,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
else
GUDEV_CFLAGS=$pkg_cv_GUDEV_CFLAGS
GUDEV_LIBS=$pkg_cv_GUDEV_LIBS
-@@ -15586,7 +15337,6 @@ $as_echo "yes" >&6; }
-
- fi
-
--
- $as_echo "#define HAVE_GUDEV 1" >>confdefs.h
-
- fi
-@@ -15620,22 +15370,17 @@ CDDA_LIBS=
- CDDA_CFLAGS=
-
- if test "x$enable_cdda" != "xno" -a \( "x$msg_hal" = "xyes" -o "x$msg_gudev" = "xyes" \); then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio_paranoia >= 0.78.2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libcdio_paranoia >= 0.78.2") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- msg_cdda=yes
--
- fi
-
- if test "x$msg_cdda" = "xyes"; then
-
--
--
--
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CDDA" >&5
- $as_echo_n "checking for CDDA... " >&6; }
-@@ -15643,8 +15388,7 @@ $as_echo_n "checking for CDDA... " >&6;
- if test -n "$CDDA_CFLAGS"; then
- pkg_cv_CDDA_CFLAGS="$CDDA_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio_paranoia\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libcdio_paranoia") 2>&5
- ac_status=$?
-@@ -15653,17 +15397,14 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_CDDA_CFLAGS=`$PKG_CONFIG --cflags "libcdio_paranoia" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
- fi
--
- if test -n "$CDDA_LIBS"; then
- pkg_cv_CDDA_LIBS="$CDDA_LIBS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio_paranoia\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libcdio_paranoia") 2>&5
- ac_status=$?
-@@ -15672,7 +15413,6 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_CDDA_LIBS=`$PKG_CONFIG --libs "libcdio_paranoia" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
-@@ -15680,7 +15420,6 @@ fi
-
-
-
--
- if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -15690,7 +15429,6 @@ if $PKG_CONFIG --atleast-pkgconfig-versi
- else
- _pkg_short_errors_supported=no
- fi
--
- if test $_pkg_short_errors_supported = yes; then
- CDDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcdio_paranoia" 2>&1`
- else
-@@ -15699,7 +15437,7 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$CDDA_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (libcdio_paranoia) were not met:
-+ as_fn_error "Package requirements (libcdio_paranoia) were not met:
-
- $CDDA_PKG_ERRORS
-
-@@ -15709,13 +15447,12 @@ installed software in a non-standard pre
+@@ -15564,7 +15451,6 @@
Alternatively, you may set the environment variables CDDA_CFLAGS
and CDDA_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -6226,118 +4485,17 @@
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
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -15724,8 +15461,7 @@ and CDDA_LIBS to avoid the need to call
+@@ -15579,8 +15465,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
else
CDDA_CFLAGS=$pkg_cv_CDDA_CFLAGS
CDDA_LIBS=$pkg_cv_CDDA_LIBS
-@@ -15734,7 +15470,6 @@ $as_echo "yes" >&6; }
-
- fi
-
--
- $as_echo "#define HAVE_CDDA 1" >>confdefs.h
-
- fi
-@@ -15759,22 +15494,17 @@ AFC_LIBS=
- AFC_CFLAGS=
-
- if test "x$enable_afc" != "xno" ; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libimobiledevice-1.0 >= 0.9.7\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libimobiledevice-1.0 >= 0.9.7") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- msg_afc=yes
--
- fi
-
- if test "x$msg_afc" = "xyes"; then
-
--
--
--
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AFC" >&5
- $as_echo_n "checking for AFC... " >&6; }
-@@ -15782,8 +15512,7 @@ $as_echo_n "checking for AFC... " >&6; }
- if test -n "$AFC_CFLAGS"; then
- pkg_cv_AFC_CFLAGS="$AFC_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libimobiledevice-1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libimobiledevice-1.0") 2>&5
- ac_status=$?
-@@ -15792,17 +15521,14 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_AFC_CFLAGS=`$PKG_CONFIG --cflags "libimobiledevice-1.0" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
- fi
--
- if test -n "$AFC_LIBS"; then
- pkg_cv_AFC_LIBS="$AFC_LIBS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libimobiledevice-1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libimobiledevice-1.0") 2>&5
- ac_status=$?
-@@ -15811,7 +15537,6 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_AFC_LIBS=`$PKG_CONFIG --libs "libimobiledevice-1.0" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
-@@ -15819,7 +15544,6 @@ fi
-
-
-
--
- if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -15829,7 +15553,6 @@ if $PKG_CONFIG --atleast-pkgconfig-versi
- else
- _pkg_short_errors_supported=no
- fi
--
- if test $_pkg_short_errors_supported = yes; then
- AFC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libimobiledevice-1.0" 2>&1`
- else
-@@ -15838,7 +15561,7 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$AFC_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (libimobiledevice-1.0) were not met:
-+ as_fn_error "Package requirements (libimobiledevice-1.0) were not met:
-
- $AFC_PKG_ERRORS
-
-@@ -15848,13 +15571,12 @@ installed software in a non-standard pre
+@@ -15690,7 +15575,6 @@
Alternatively, you may set the environment variables AFC_CFLAGS
and AFC_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -6345,118 +4503,17 @@
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
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -15863,8 +15585,7 @@ and AFC_LIBS to avoid the need to call p
+@@ -15705,8 +15589,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
else
AFC_CFLAGS=$pkg_cv_AFC_CFLAGS
AFC_LIBS=$pkg_cv_AFC_LIBS
-@@ -15873,7 +15594,6 @@ $as_echo "yes" >&6; }
-
- fi
-
--
- $as_echo "#define HAVE_AFC 1" >>confdefs.h
-
- fi
-@@ -15901,22 +15621,17 @@ OBEXFTP_LIBS=
- OBEXFTP_CFLAGS=
-
- if test "x$enable_obexftp" != "xno"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 bluez >= 4.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "dbus-glib-1 bluez >= 4.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- msg_obexftp=yes
--
- fi
-
- if test "x$msg_obexftp" = "xyes" -a "x$have_expat" = "xtrue"; then
-
--
--
--
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OBEXFTP" >&5
- $as_echo_n "checking for OBEXFTP... " >&6; }
-@@ -15924,8 +15639,7 @@ $as_echo_n "checking for OBEXFTP... " >&
- if test -n "$OBEXFTP_CFLAGS"; then
- pkg_cv_OBEXFTP_CFLAGS="$OBEXFTP_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 bluez >= 4.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "dbus-glib-1 bluez >= 4.0") 2>&5
- ac_status=$?
-@@ -15934,17 +15648,14 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_OBEXFTP_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 bluez >= 4.0" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
- fi
--
- if test -n "$OBEXFTP_LIBS"; then
- pkg_cv_OBEXFTP_LIBS="$OBEXFTP_LIBS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 bluez >= 4.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "dbus-glib-1 bluez >= 4.0") 2>&5
- ac_status=$?
-@@ -15953,7 +15664,6 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_OBEXFTP_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 bluez >= 4.0" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
-@@ -15961,7 +15671,6 @@ fi
-
-
-
--
- if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -15971,7 +15680,6 @@ if $PKG_CONFIG --atleast-pkgconfig-versi
- else
- _pkg_short_errors_supported=no
- fi
--
- if test $_pkg_short_errors_supported = yes; then
- OBEXFTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 bluez >= 4.0" 2>&1`
- else
-@@ -15980,7 +15688,7 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$OBEXFTP_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (dbus-glib-1 bluez >= 4.0) were not met:
-+ as_fn_error "Package requirements (dbus-glib-1 bluez >= 4.0) were not met:
-
- $OBEXFTP_PKG_ERRORS
-
-@@ -15990,13 +15698,12 @@ installed software in a non-standard pre
+@@ -15819,7 +15702,6 @@
Alternatively, you may set the environment variables OBEXFTP_CFLAGS
and OBEXFTP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -6464,121 +4521,17 @@
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
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -16005,8 +15712,7 @@ and OBEXFTP_LIBS to avoid the need to ca
+@@ -15834,8 +15716,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
else
OBEXFTP_CFLAGS=$pkg_cv_OBEXFTP_CFLAGS
OBEXFTP_LIBS=$pkg_cv_OBEXFTP_LIBS
-@@ -16017,7 +15723,6 @@ fi
-
-
-
--
- msg_obexftp=yes
-
- $as_echo "#define HAVE_OBEXFTP 1" >>confdefs.h
-@@ -16046,15 +15751,13 @@ GPHOTO2_LIBS=
- GPHOTO2_CFLAGS=
-
- if test "x$enable_gphoto2" != "xno" -a \( "x$msg_hal" = "xyes" -o "x$msg_gudev" = "xyes" \); then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgphoto2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libgphoto2") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- msg_gphoto2=yes
--
- fi
-
- # Need OS tweaks in hal volume monitor backend
-@@ -16070,9 +15773,6 @@ fi
- if test "x$msg_gphoto2" = "xyes"; then
- if test "x$use_gphoto2" = "xyes"; then
-
--
--
--
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPHOTO2" >&5
- $as_echo_n "checking for GPHOTO2... " >&6; }
-@@ -16080,8 +15780,7 @@ $as_echo_n "checking for GPHOTO2... " >&
- if test -n "$GPHOTO2_CFLAGS"; then
- pkg_cv_GPHOTO2_CFLAGS="$GPHOTO2_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgphoto2 >= 2.4.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libgphoto2 >= 2.4.0") 2>&5
- ac_status=$?
-@@ -16090,17 +15789,14 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_GPHOTO2_CFLAGS=`$PKG_CONFIG --cflags "libgphoto2 >= 2.4.0" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
- fi
--
- if test -n "$GPHOTO2_LIBS"; then
- pkg_cv_GPHOTO2_LIBS="$GPHOTO2_LIBS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgphoto2 >= 2.4.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libgphoto2 >= 2.4.0") 2>&5
- ac_status=$?
-@@ -16109,7 +15805,6 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_GPHOTO2_LIBS=`$PKG_CONFIG --libs "libgphoto2 >= 2.4.0" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
-@@ -16117,7 +15812,6 @@ fi
-
-
-
--
- if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -16127,7 +15821,6 @@ if $PKG_CONFIG --atleast-pkgconfig-versi
- else
- _pkg_short_errors_supported=no
- fi
--
- if test $_pkg_short_errors_supported = yes; then
- GPHOTO2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgphoto2 >= 2.4.0" 2>&1`
- else
-@@ -16136,7 +15829,7 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$GPHOTO2_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (libgphoto2 >= 2.4.0) were not met:
-+ as_fn_error "Package requirements (libgphoto2 >= 2.4.0) were not met:
-
- $GPHOTO2_PKG_ERRORS
-
-@@ -16146,13 +15839,12 @@ installed software in a non-standard pre
+@@ -15962,7 +15843,6 @@
Alternatively, you may set the environment variables GPHOTO2_CFLAGS
and GPHOTO2_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -6586,118 +4539,17 @@
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
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -16161,8 +15853,7 @@ and GPHOTO2_LIBS to avoid the need to ca
+@@ -15977,8 +15857,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
else
GPHOTO2_CFLAGS=$pkg_cv_GPHOTO2_CFLAGS
GPHOTO2_LIBS=$pkg_cv_GPHOTO2_LIBS
-@@ -16171,7 +15862,6 @@ $as_echo "yes" >&6; }
-
- fi
-
--
- $as_echo "#define HAVE_GPHOTO2 1" >>confdefs.h
-
- else
-@@ -16201,22 +15891,17 @@ KEYRING_LIBS=
- KEYRING_CFLAGS=
-
- if test "x$enable_keyring" != "xno"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gnome-keyring-1") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- msg_keyring=yes
--
- fi
-
- if test "x$msg_keyring" = "xyes"; then
-
--
--
--
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KEYRING" >&5
- $as_echo_n "checking for KEYRING... " >&6; }
-@@ -16224,8 +15909,7 @@ $as_echo_n "checking for KEYRING... " >&
- if test -n "$KEYRING_CFLAGS"; then
- pkg_cv_KEYRING_CFLAGS="$KEYRING_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gnome-keyring-1") 2>&5
- ac_status=$?
-@@ -16234,17 +15918,14 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_KEYRING_CFLAGS=`$PKG_CONFIG --cflags "gnome-keyring-1" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
- fi
--
- if test -n "$KEYRING_LIBS"; then
- pkg_cv_KEYRING_LIBS="$KEYRING_LIBS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gnome-keyring-1") 2>&5
- ac_status=$?
-@@ -16253,7 +15934,6 @@ if test -n "$PKG_CONFIG" && \
- pkg_cv_KEYRING_LIBS=`$PKG_CONFIG --libs "gnome-keyring-1" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
-@@ -16261,7 +15941,6 @@ fi
-
-
-
--
- if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -16271,7 +15950,6 @@ if $PKG_CONFIG --atleast-pkgconfig-versi
- else
- _pkg_short_errors_supported=no
- fi
--
- if test $_pkg_short_errors_supported = yes; then
- KEYRING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-keyring-1" 2>&1`
- else
-@@ -16280,7 +15958,7 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$KEYRING_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (gnome-keyring-1) were not met:
-+ as_fn_error "Package requirements (gnome-keyring-1) were not met:
-
- $KEYRING_PKG_ERRORS
-
-@@ -16290,13 +15968,12 @@ installed software in a non-standard pre
+@@ -16093,7 +15972,6 @@
Alternatively, you may set the environment variables KEYRING_CFLAGS
and KEYRING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -6705,304 +4557,72 @@
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
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -16305,8 +15982,7 @@ and KEYRING_LIBS to avoid the need to ca
+@@ -16108,8 +15986,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
else
KEYRING_CFLAGS=$pkg_cv_KEYRING_CFLAGS
KEYRING_LIBS=$pkg_cv_KEYRING_LIBS
-@@ -16315,7 +15991,6 @@ $as_echo "yes" >&6; }
-
- fi
-
--
- $as_echo "#define HAVE_KEYRING 1" >>confdefs.h
-
- fi
-@@ -16821,7 +16496,8 @@ for ac_header in sys/statfs.h sys/statvf
- do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -16834,7 +16510,8 @@ for ac_func in statvfs statfs
- do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
--if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -16969,7 +16646,7 @@ else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
- $as_echo "unknown" >&6; }
-- as_fn_error $? "unable to determine number of arguments to statfs()" "$LINENO" 5
-+ as_fn_error "unable to determine number of arguments to statfs()" "$LINENO" 5
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-@@ -17124,7 +16801,6 @@ DEFS=-DHAVE_CONFIG_H
-
- ac_libobjs=
- ac_ltlibobjs=
--U=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
- # 1. Remove the extension, and $U if already installed.
- ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-@@ -17147,36 +16823,40 @@ else
+@@ -16949,6 +16826,10 @@
am__EXEEXT_FALSE=
fi
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
++ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-- as_fn_error $? "conditional \"AMDEP\" was never defined.
-+ as_fn_error "conditional \"AMDEP\" was never defined.
+ as_fn_error $? "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
-- as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
-+ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
-- as_fn_error $? "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
-+ as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
-- as_fn_error $? "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
-+ as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
-- as_fn_error $? "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-+ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
-- as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined.
-+ as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-
-@@ -17184,87 +16864,87 @@ fi
-
-
- if test -z "${HAVE_HTTP_TRUE}" && test -z "${HAVE_HTTP_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_HTTP\" was never defined.
-+ as_fn_error "conditional \"HAVE_HTTP\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_AVAHI_TRUE}" && test -z "${HAVE_AVAHI_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_AVAHI\" was never defined.
-+ as_fn_error "conditional \"HAVE_AVAHI\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_AVAHI_TRUE}" && test -z "${HAVE_AVAHI_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_AVAHI\" was never defined.
-+ as_fn_error "conditional \"HAVE_AVAHI\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_AVAHI_TRUE}" && test -z "${HAVE_AVAHI_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_AVAHI\" was never defined.
-+ as_fn_error "conditional \"HAVE_AVAHI\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_AVAHI_TRUE}" && test -z "${HAVE_AVAHI_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_AVAHI\" was never defined.
-+ as_fn_error "conditional \"HAVE_AVAHI\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_LIBXML_TRUE}" && test -z "${HAVE_LIBXML_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_LIBXML\" was never defined.
-+ as_fn_error "conditional \"HAVE_LIBXML\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_LIBXML_TRUE}" && test -z "${HAVE_LIBXML_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_LIBXML\" was never defined.
-+ as_fn_error "conditional \"HAVE_LIBXML\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_LIBXML_TRUE}" && test -z "${HAVE_LIBXML_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_LIBXML\" was never defined.
-+ as_fn_error "conditional \"HAVE_LIBXML\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_FUSE_TRUE}" && test -z "${USE_FUSE_FALSE}"; then
-- as_fn_error $? "conditional \"USE_FUSE\" was never defined.
-+ as_fn_error "conditional \"USE_FUSE\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_GCONF_TRUE}" && test -z "${USE_GCONF_FALSE}"; then
-- as_fn_error $? "conditional \"USE_GCONF\" was never defined.
-+ as_fn_error "conditional \"USE_GCONF\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_GDU_TRUE}" && test -z "${USE_GDU_FALSE}"; then
-- as_fn_error $? "conditional \"USE_GDU\" was never defined.
-+ as_fn_error "conditional \"USE_GDU\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_HAL_TRUE}" && test -z "${USE_HAL_FALSE}"; then
-- as_fn_error $? "conditional \"USE_HAL\" was never defined.
-+ as_fn_error "conditional \"USE_HAL\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_GUDEV_TRUE}" && test -z "${USE_GUDEV_FALSE}"; then
-- as_fn_error $? "conditional \"USE_GUDEV\" was never defined.
-+ as_fn_error "conditional \"USE_GUDEV\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_CDDA_TRUE}" && test -z "${USE_CDDA_FALSE}"; then
-- as_fn_error $? "conditional \"USE_CDDA\" was never defined.
-+ as_fn_error "conditional \"USE_CDDA\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_AFC_TRUE}" && test -z "${USE_AFC_FALSE}"; then
-- as_fn_error $? "conditional \"USE_AFC\" was never defined.
-+ as_fn_error "conditional \"USE_AFC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_OBEXFTP_TRUE}" && test -z "${USE_OBEXFTP_FALSE}"; then
-- as_fn_error $? "conditional \"USE_OBEXFTP\" was never defined.
-+ as_fn_error "conditional \"USE_OBEXFTP\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_GPHOTO2_TRUE}" && test -z "${USE_GPHOTO2_FALSE}"; then
-- as_fn_error $? "conditional \"USE_GPHOTO2\" was never defined.
-+ as_fn_error "conditional \"USE_GPHOTO2\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_KEYRING_TRUE}" && test -z "${USE_KEYRING_FALSE}"; then
-- as_fn_error $? "conditional \"USE_KEYRING\" was never defined.
-+ as_fn_error "conditional \"USE_KEYRING\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_SAMBA_TRUE}" && test -z "${HAVE_SAMBA_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_SAMBA\" was never defined.
-+ as_fn_error "conditional \"HAVE_SAMBA\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_ARCHIVE_TRUE}" && test -z "${HAVE_ARCHIVE_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_ARCHIVE\" was never defined.
-+ as_fn_error "conditional \"HAVE_ARCHIVE\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${ENABLE_BASHCOMP_TRUE}" && test -z "${ENABLE_BASHCOMP_FALSE}"; then
-- as_fn_error $? "conditional \"ENABLE_BASHCOMP\" was never defined.
-+ as_fn_error "conditional \"ENABLE_BASHCOMP\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-
-@@ -17414,19 +17094,19 @@ export LANGUAGE
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
--# as_fn_error STATUS ERROR [LINENO LOG_FD]
--# ----------------------------------------
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
- # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
--# script with STATUS, using 1 if that was 0.
-+# script with status $?, using 1 if that was 0.
- as_fn_error ()
- {
-- as_status=$1; test $as_status -eq 0 && as_status=1
-- if test "$4"; then
-- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-+ as_status=$?; test $as_status -eq 0 && as_status=1
-+ if test "$3"; then
-+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
- fi
-- $as_echo "$as_me: error: $2" >&2
-+ $as_echo "$as_me: error: $1" >&2
- as_fn_exit $as_status
- } # as_fn_error
-
-@@ -17622,7 +17302,7 @@ $as_echo X"$as_dir" |
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
-- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
- } # as_fn_mkdir_p
-@@ -17676,7 +17356,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+@@ -17478,7 +17359,7 @@
# values after options handling.
ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.66. Invocation command line was
-+generated by GNU Autoconf 2.65. Invocation command line was
++generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -17742,10 +17422,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -17544,7 +17425,7 @@
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.66,
-+configured by $0, generated by GNU Autoconf 2.65,
++configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
--Copyright (C) 2010 Free Software Foundation, Inc.
-+Copyright (C) 2009 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
-
-@@ -17801,7 +17481,7 @@ do
+ Copyright (C) 2010 Free Software Foundation, Inc.
+@@ -17565,11 +17446,16 @@
+ while test $# != 0
+ do
+ case $1 in
+- --*=*)
++ --*=?*)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+ ac_shift=:
+ ;;
++ --*=)
++ ac_option=`expr "X$1" : 'X\([^=]*\)='`
++ ac_optarg=
++ ac_shift=:
++ ;;
+ *)
+ ac_option=$1
+ ac_optarg=$2
+@@ -17591,6 +17477,7 @@
+ $ac_shift
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++ '') as_fn_error $? "missing file argument" ;;
+ esac
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
- --he | --h)
- # Conflict between --help and --header
-- as_fn_error $? "ambiguous option: \`$1'
-+ as_fn_error "ambiguous option: \`$1'
- Try \`$0 --help' for more information.";;
- --help | --hel | -h )
- $as_echo "$ac_cs_usage"; exit ;;
-@@ -17810,7 +17490,7 @@ Try \`$0 --help' for more information.";
- ac_cs_silent=: ;;
-
- # This is an error.
-- -*) as_fn_error $? "unrecognized option: \`$1'
-+ -*) as_fn_error "unrecognized option: \`$1'
- Try \`$0 --help' for more information." ;;
-
- *) as_fn_append ac_config_targets " $1"
-@@ -17864,143 +17544,131 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac
+@@ -17666,143 +17553,131 @@
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
@@ -7265,7 +4885,7 @@
GREP \
EGREP \
FGREP \
-@@ -18024,6 +17692,8 @@ lt_cv_sys_global_symbol_pipe \
+@@ -17826,6 +17701,8 @@
lt_cv_sys_global_symbol_to_cdecl \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -7274,7 +4894,7 @@
lt_prog_compiler_no_builtin_flag \
lt_prog_compiler_wl \
lt_prog_compiler_pic \
-@@ -18053,13 +17723,12 @@ variables_saved_for_relink \
+@@ -17855,13 +17732,12 @@
libname_spec \
library_names_spec \
soname_spec \
@@ -7290,7 +4910,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -18086,9 +17755,9 @@ postuninstall_cmds \
+@@ -17888,9 +17764,9 @@
finish_cmds \
sys_lib_search_path_spec \
sys_lib_dlsearch_path_spec; do
@@ -7302,7 +4922,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -18096,6 +17765,12 @@ sys_lib_dlsearch_path_spec; do
+@@ -17898,6 +17774,12 @@
esac
done
@@ -7315,189 +4935,43 @@
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
-@@ -18147,7 +17822,7 @@ do
+@@ -17949,7 +17831,7 @@
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
esac
done
-@@ -18185,7 +17860,7 @@ $debug ||
- {
- tmp=./conf$$-$RANDOM
- (umask 077 && mkdir "$tmp")
--} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
-
- # Set up the scripts for CONFIG_FILES section.
- # No need to generate them if there are no CONFIG_FILES.
-@@ -18202,7 +17877,7 @@ if test "x$ac_cr" = x; then
- fi
- ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
- if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-- ac_cs_awk_cr='\\r'
-+ ac_cs_awk_cr='\r'
- else
- ac_cs_awk_cr=$ac_cr
- fi
-@@ -18216,18 +17891,18 @@ _ACEOF
- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
- echo "_ACEOF"
- } >conf$$subs.sh ||
-- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
--ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- . ./conf$$subs.sh ||
-- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-
- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
- if test $ac_delim_n = $ac_delim_num; then
- break
- elif $ac_last_try; then
-- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-@@ -18316,28 +17991,20 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
- else
- cat
- fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
- _ACEOF
-
--# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
--# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
- # trailing colons and then remove the whole line if VPATH becomes empty
- # (actually we leave an empty line to preserve line numbers).
- if test "x$srcdir" = x.; then
-- ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
--h
--s///
--s/^/:/
--s/[ ]*$/:/
--s/:\$(srcdir):/:/g
--s/:\${srcdir}:/:/g
--s/:@srcdir@:/:/g
--s/^:*//
-+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[ ]*\):*/\1/
- s/:*$//
--x
--s/\(=[ ]*\).*/\1/
--G
--s/\n//
- s/^[^=]*=[ ]*$//
- }'
- fi
-@@ -18365,7 +18032,7 @@ for ac_last_try in false false :; do
- if test -z "$ac_t"; then
- break
- elif $ac_last_try; then
-- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-@@ -18450,7 +18117,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
- _ACAWK
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
- fi # test -n "$CONFIG_HEADERS"
-
-
-@@ -18463,7 +18130,7 @@ do
+@@ -18265,7 +18147,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -18491,7 +18158,7 @@ do
+@@ -18293,7 +18175,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
-@@ -18518,7 +18185,7 @@ $as_echo "$as_me: creating $ac_file" >&6
+@@ -18320,7 +18202,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
-@@ -18655,22 +18322,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
- $ac_datarootdir_hack
- "
- eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-+ || as_fn_error "could not create $ac_file" "$LINENO" 5
-
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
--which seems to be undefined. Please make sure it is defined" >&5
-+which seems to be undefined. Please make sure it is defined." >&5
- $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
--which seems to be undefined. Please make sure it is defined" >&2;}
-+which seems to be undefined. Please make sure it is defined." >&2;}
-
- rm -f "$tmp/stdin"
- case $ac_file in
- -) cat "$tmp/out" && rm -f "$tmp/out";;
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
- esac \
-- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-+ || as_fn_error "could not create $ac_file" "$LINENO" 5
- ;;
- :H)
- #
-@@ -18681,19 +18348,19 @@ which seems to be undefined. Please mak
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
- } >"$tmp/config.h" \
-- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-+ || as_fn_error "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
- $as_echo "$as_me: $ac_file is unchanged" >&6;}
- else
- rm -f "$ac_file"
- mv "$tmp/config.h" "$ac_file" \
-- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-+ || as_fn_error "could not create $ac_file" "$LINENO" 5
- fi
- else
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-- || as_fn_error $? "could not create -" "$LINENO" 5
-+ || as_fn_error "could not create -" "$LINENO" 5
- fi
- # Compute "$ac_file"'s index in $config_headers.
- _am_arg="$ac_file"
-@@ -18854,8 +18521,7 @@ $as_echo X"$file" |
+@@ -18656,8 +18538,7 @@
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -7507,7 +4981,7 @@
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
-@@ -18903,12 +18569,6 @@ pic_mode=$pic_mode
+@@ -18705,12 +18586,6 @@
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
@@ -7520,7 +4994,7 @@
# The host system.
host_alias=$host_alias
host=$host
-@@ -18958,6 +18618,10 @@ SP2NL=$lt_lt_SP2NL
+@@ -18760,6 +18635,10 @@
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
@@ -7531,7 +5005,7 @@
# An object symbol dumper.
OBJDUMP=$lt_OBJDUMP
-@@ -18979,9 +18643,6 @@ RANLIB=$lt_RANLIB
+@@ -18781,9 +18660,6 @@
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
@@ -7541,7 +5015,7 @@
# A C compiler.
LTCC=$lt_CC
-@@ -19003,6 +18664,12 @@ global_symbol_to_c_name_address_lib_pref
+@@ -18805,6 +18681,12 @@
# The name of the directory that contains temporary libtool files.
objdir=$objdir
@@ -7554,7 +5028,7 @@
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
-@@ -19065,9 +18732,6 @@ library_names_spec=$lt_library_names_spe
+@@ -18867,9 +18749,6 @@
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
@@ -7564,7 +5038,7 @@
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
-@@ -19107,10 +18771,6 @@ striplib=$lt_striplib
+@@ -18909,10 +18788,6 @@
# The linker used to build libraries.
LD=$lt_LD
@@ -7575,7 +5049,7 @@
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
-@@ -19370,7 +19030,7 @@ _LT_EOF
+@@ -19172,7 +19047,7 @@
func_dirname ()
{
# Extract subdirectory from the argument.
@@ -7584,7 +5058,7 @@
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
-@@ -19381,7 +19041,7 @@ func_dirname ()
+@@ -19183,7 +19058,7 @@
# func_basename file
func_basename ()
{
@@ -7593,7 +5067,7 @@
}
-@@ -19394,8 +19054,10 @@ func_basename ()
+@@ -19196,8 +19071,10 @@
func_stripname ()
{
case ${2} in
@@ -7606,7 +5080,7 @@
esac
}
-@@ -19406,20 +19068,20 @@ my_sed_long_arg='1s/^-[^=]*=//'
+@@ -19208,20 +19085,20 @@
# func_opt_split
func_opt_split ()
{
@@ -7631,56 +5105,11 @@
}
# func_arith arithmetic-term...
-@@ -19478,7 +19140,7 @@ _LT_EOF
- esac ;;
- "po/stamp-it":C)
- if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
-- as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
-+ as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
- fi
- rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
- >"po/stamp-it.tmp"
-@@ -19506,7 +19168,7 @@ _ACEOF
- ac_clean_files=$ac_clean_files_save
-
- test $ac_write_fail = 0 ||
-- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
- # configure is writing to config.log, and then calls config.status.
-@@ -19527,7 +19189,7 @@ if test "$no_create" != yes; then
- exec 5>>config.log
- # Use ||, not &&, to avoid exiting from the if with $? = 1, which
- # would make configure fail if this is the last instruction.
-- $ac_cs_success || as_fn_exit 1
-+ $ac_cs_success || as_fn_exit $?
- fi
- if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-@@ -19560,8 +19222,7 @@ echo "
-
- # The gudev gphoto monitor needs a recent libgphoto; point to the required patch if the version is too old
- if test "x$msg_gudev" = "xyes"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgphoto2 >= 2.4.7\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libgphoto2 >= 2.4.7") 2>&5
- ac_status=$?
-@@ -19570,7 +19231,6 @@ if test -n "$PKG_CONFIG" && \
- :
- else
- msg_gphoto_patch=yes
--
- fi
- if test "x$msg_gphoto_patch" = "xyes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You are using a libgphoto2 version earlier than 2.4.7. To work with gudev, you must apply the patch in http://sourceforge.net/tracker/?func=detail&aid=2801117&group_id=8874&atid=308874" >&5
-Index: gvfs-1.6.3/daemon/Makefile.in
+Index: quilt-UA6TYS/daemon/Makefile.in
===================================================================
---- gvfs-1.6.3.orig/daemon/Makefile.in 2010-07-12 17:32:43.000000000 +0200
-+++ gvfs-1.6.3/daemon/Makefile.in 2010-07-19 18:35:25.478247362 +0200
-@@ -78,34 +78,65 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+--- quilt-UA6TYS.orig/daemon/Makefile.in 2010-09-27 16:52:40.000000000 +0200
++++ quilt-UA6TYS/daemon/Makefile.in 2010-10-01 13:00:05.000000000 +0200
+@@ -78,34 +78,65 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -7764,7 +5193,7 @@
@HAVE_HTTP_TRUE at am__EXEEXT_1 = gvfsd-http$(EXEEXT) gvfsd-dav$(EXEEXT)
@HAVE_SAMBA_TRUE at am__EXEEXT_2 = gvfsd-smb-browse$(EXEEXT) \
@HAVE_SAMBA_TRUE@ gvfsd-smb$(EXEEXT)
-@@ -116,16 +147,13 @@ am__v_lt_0 = --silent
+@@ -116,16 +147,13 @@
@HAVE_AVAHI_TRUE at am__EXEEXT_7 = gvfsd-dnssd$(EXEEXT)
@HAVE_ARCHIVE_TRUE at am__EXEEXT_8 = gvfsd-archive$(EXEEXT)
@USE_AFC_TRUE at am__EXEEXT_9 = gvfsd-afc$(EXEEXT)
@@ -7783,7 +5212,7 @@
gvfsd_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_gvfsd_afc_OBJECTS = gvfsd_afc-gvfsbackendafc.$(OBJEXT) \
gvfsd_afc-daemon-main.$(OBJEXT) \
-@@ -274,7 +302,7 @@ am__v_CCLD_0 = @echo " CCLD " $@;
+@@ -274,7 +302,7 @@
AM_V_GEN = $(am__v_GEN_$(V))
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
@@ -7792,7 +5221,7 @@
$(gvfsd_afc_SOURCES) $(gvfsd_archive_SOURCES) \
$(gvfsd_burn_SOURCES) $(gvfsd_cdda_SOURCES) \
$(gvfsd_computer_SOURCES) $(gvfsd_dav_SOURCES) \
-@@ -284,7 +312,7 @@ SOURCES = $(libdaemon_la_SOURCES) $(gvfs
+@@ -284,7 +312,7 @@
$(gvfsd_obexftp_SOURCES) $(gvfsd_sftp_SOURCES) \
$(gvfsd_smb_SOURCES) $(gvfsd_smb_browse_SOURCES) \
$(gvfsd_test_SOURCES) $(gvfsd_trash_SOURCES)
@@ -7801,7 +5230,7 @@
$(gvfsd_afc_SOURCES) $(gvfsd_archive_SOURCES) \
$(gvfsd_burn_SOURCES) $(gvfsd_cdda_SOURCES) \
$(gvfsd_computer_SOURCES) $(gvfsd_dav_SOURCES) \
-@@ -301,27 +329,6 @@ RECURSIVE_TARGETS = all-recursive check-
+@@ -301,27 +329,6 @@
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
@@ -7829,7 +5258,7 @@
DATA = $(mount_DATA) $(service_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-@@ -450,6 +457,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
+@@ -450,6 +457,7 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7837,7 +5266,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -529,6 +537,7 @@ libdir = @libdir@
+@@ -529,6 +537,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -7845,7 +5274,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -560,13 +569,14 @@ INCLUDES = \
+@@ -560,13 +569,14 @@
-DLIBEXEC_DIR=\"$(libexecdir)/\" \
-DMOUNTABLE_DIR=\"$(mountdir)/\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -7864,7 +5293,7 @@
servicedir = $(DBUS_SERVICE_DIR)
service_in_files = gvfs-daemon.service.in
-@@ -584,7 +594,7 @@ mount_DATA = sftp.mount trash.mount comp
+@@ -584,7 +594,7 @@
@USE_OBEXFTP_TRUE at BUILT_SOURCES = obexftp-marshal.c obexftp-marshal.h
EXTRA_DIST = gvfs-daemon.service.in $(mount_in_files) obexftp-marshal.list
DISTCLEANFILES = gvfs-daemon.service $(mount_DATA)
@@ -7873,7 +5302,7 @@
gvfsdaemon.c gvfsdaemon.h \
gvfsbackend.c gvfsbackend.h \
gvfschannel.c gvfschannel.h \
-@@ -632,6 +642,11 @@ libdaemon_la_SOURCES = \
+@@ -632,6 +642,11 @@
gvfskeyring.h gvfskeyring.c \
$(NULL)
@@ -7885,7 +5314,7 @@
gvfsd_SOURCES = \
mount.c mount.h \
main.c
-@@ -878,7 +893,7 @@ all: $(BUILT_SOURCES)
+@@ -878,7 +893,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -7894,7 +5323,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -903,22 +918,44 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -903,22 +918,44 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7946,7 +5375,7 @@
install-libexecPROGRAMS: $(libexec_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-@@ -2508,7 +2545,7 @@ check: $(BUILT_SOURCES)
+@@ -2508,7 +2545,7 @@
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
installdirs: installdirs-recursive
installdirs-am:
@@ -7955,7 +5384,7 @@
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
-@@ -2542,7 +2579,7 @@ maintainer-clean-generic:
+@@ -2542,7 +2579,7 @@
clean: clean-recursive
clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \
@@ -7964,7 +5393,7 @@
distclean: distclean-recursive
-rm -rf ./$(DEPDIR)
-@@ -2562,7 +2599,8 @@ info: info-recursive
+@@ -2562,7 +2599,8 @@
info-am:
@@ -7974,7 +5403,7 @@
install-dvi: install-dvi-recursive
-@@ -2609,7 +2647,7 @@ ps: ps-recursive
+@@ -2609,7 +2647,7 @@
ps-am:
uninstall-am: uninstall-libexecPROGRAMS uninstall-mountDATA \
@@ -7983,7 +5412,7 @@
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
ctags-recursive install install-am install-strip \
-@@ -2617,22 +2655,22 @@ uninstall-am: uninstall-libexecPROGRAMS
+@@ -2617,22 +2655,22 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic \
@@ -8015,11 +5444,11 @@
# D-BUS service file
-Index: gvfs-1.6.3/daemon/trashlib/Makefile.in
+Index: quilt-UA6TYS/daemon/trashlib/Makefile.in
===================================================================
---- gvfs-1.6.3.orig/daemon/trashlib/Makefile.in 2010-07-12 17:32:43.000000000 +0200
-+++ gvfs-1.6.3/daemon/trashlib/Makefile.in 2010-07-19 18:35:25.638247522 +0200
-@@ -40,7 +40,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+--- quilt-UA6TYS.orig/daemon/trashlib/Makefile.in 2010-09-27 16:52:40.000000000 +0200
++++ quilt-UA6TYS/daemon/trashlib/Makefile.in 2010-10-01 13:00:05.000000000 +0200
+@@ -40,7 +40,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -8028,7 +5457,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -183,6 +183,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
+@@ -183,6 +183,7 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8036,7 +5465,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -262,6 +263,7 @@ libdir = @libdir@
+@@ -262,6 +263,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -8044,7 +5473,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -295,7 +297,7 @@ all: all-am
+@@ -295,7 +297,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -8053,7 +5482,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -320,9 +322,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -320,9 +322,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8065,11 +5494,11 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-Index: gvfs-1.6.3/gconf/Makefile.in
+Index: quilt-UA6TYS/gconf/Makefile.in
===================================================================
---- gvfs-1.6.3.orig/gconf/Makefile.in 2010-07-12 17:32:43.000000000 +0200
-+++ gvfs-1.6.3/gconf/Makefile.in 2010-07-19 18:35:25.754246699 +0200
-@@ -40,7 +40,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+--- quilt-UA6TYS.orig/gconf/Makefile.in 2010-09-27 16:52:40.000000000 +0200
++++ quilt-UA6TYS/gconf/Makefile.in 2010-10-01 13:00:05.000000000 +0200
+@@ -40,7 +40,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -8078,7 +5507,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -206,6 +206,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
+@@ -206,6 +206,7 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8086,7 +5515,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -285,6 +286,7 @@ libdir = @libdir@
+@@ -285,6 +286,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -8094,7 +5523,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -315,7 +317,6 @@ libgiogconf_la_CFLAGS = \
+@@ -315,7 +317,6 @@
$(GCONF_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -8102,7 +5531,7 @@
$(NULL)
libgiogconf_la_LDFLAGS = \
-@@ -331,7 +332,7 @@ all: all-am
+@@ -331,7 +332,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -8111,7 +5540,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -356,9 +357,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -356,9 +357,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8123,10 +5552,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-giomodulesLTLIBRARIES: $(giomodules_LTLIBRARIES)
-Index: gvfs-1.6.3/gtk-doc.make
+Index: quilt-UA6TYS/gtk-doc.make
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gvfs-1.6.3/gtk-doc.make 2010-07-19 18:34:06.466253226 +0200
++++ quilt-UA6TYS/gtk-doc.make 2010-10-01 12:59:44.000000000 +0200
@@ -0,0 +1,230 @@
+# -*- mode: makefile -*-
+
@@ -8358,10 +5787,10 @@
+ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
-Index: gvfs-1.6.3/ltmain.sh
+Index: quilt-UA6TYS/ltmain.sh
===================================================================
---- gvfs-1.6.3.orig/ltmain.sh 2010-06-24 12:20:12.000000000 +0200
-+++ gvfs-1.6.3/ltmain.sh 2010-07-19 18:34:58.758280380 +0200
+--- quilt-UA6TYS.orig/ltmain.sh 2010-08-13 04:09:38.000000000 +0200
++++ quilt-UA6TYS/ltmain.sh 2010-10-01 12:59:52.000000000 +0200
@@ -1,10 +1,9 @@
# Generated from ltmain.m4sh.
@@ -8460,7 +5889,7 @@
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -96,15 +91,10 @@ fi
+@@ -96,15 +91,10 @@
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
@@ -8479,7 +5908,7 @@
lt_user_locale=
lt_safe_locale=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-@@ -117,24 +107,15 @@ do
+@@ -117,24 +107,15 @@
lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
@@ -8505,7 +5934,7 @@
: ${EGREP="/bin/grep -E"}
: ${FGREP="/bin/grep -F"}
: ${GREP="/bin/grep"}
-@@ -178,168 +159,32 @@ basename="s,^.*/,,"
+@@ -178,168 +159,32 @@
func_dirname_and_basename ()
{
# Extract subdirectory from the argument.
@@ -8687,7 +6116,7 @@
# Make sure we have an absolute path for reexecution:
case $progpath in
-@@ -413,13 +258,6 @@ func_verbose ()
+@@ -413,13 +258,6 @@
:
}
@@ -8701,7 +6130,7 @@
# func_error arg...
# Echo program name prefixed message to standard error.
func_error ()
-@@ -488,9 +326,9 @@ func_mkdir_p ()
+@@ -488,9 +326,9 @@
case $my_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
@@ -8713,7 +6142,7 @@
save_mkdir_p_IFS="$IFS"; IFS=':'
for my_dir in $my_dir_list; do
-@@ -540,7 +378,7 @@ func_mktempdir ()
+@@ -540,7 +378,7 @@
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
@@ -8722,7 +6151,7 @@
}
-@@ -554,7 +392,7 @@ func_quote_for_eval ()
+@@ -554,7 +392,7 @@
{
case $1 in
*[\\\`\"\$]*)
@@ -8731,7 +6160,7 @@
*)
func_quote_for_eval_unquoted_result="$1" ;;
esac
-@@ -581,7 +419,7 @@ func_quote_for_expand ()
+@@ -581,7 +419,7 @@
{
case $1 in
*[\\\`\"]*)
@@ -8740,7 +6169,7 @@
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
my_arg="$1" ;;
-@@ -651,19 +489,14 @@ func_show_eval_locale ()
+@@ -651,19 +489,14 @@
}
@@ -8764,7 +6193,7 @@
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-@@ -676,20 +509,19 @@ func_version ()
+@@ -676,20 +509,19 @@
# Echo short help message to standard output and exit.
func_usage ()
{
@@ -8789,7 +6218,7 @@
func_help ()
{
$SED -n '/^# Usage:/,/# Report bugs to/ {
-@@ -706,10 +538,7 @@ func_help ()
+@@ -706,10 +538,7 @@
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
p
}' < "$progpath"
@@ -8801,7 +6230,7 @@
}
# func_missing_arg argname
-@@ -717,7 +546,7 @@ func_help ()
+@@ -717,7 +546,7 @@
# exit_cmd.
func_missing_arg ()
{
@@ -8810,7 +6239,7 @@
exit_cmd=exit
}
-@@ -727,6 +556,29 @@ exit_cmd=:
+@@ -727,6 +556,29 @@
@@ -8840,7 +6269,7 @@
magic="%%%MAGIC variable%%%"
magic_exe="%%%MAGIC EXE variable%%%"
-@@ -784,16 +636,16 @@ func_config ()
+@@ -784,16 +636,16 @@
# Display the features supported by this script.
func_features ()
{
@@ -8862,7 +6291,7 @@
fi
exit $?
-@@ -920,21 +772,10 @@ func_enable_tag ()
+@@ -920,21 +772,10 @@
--quiet|--silent) preserve_args="$preserve_args $opt"
opt_silent=:
@@ -8884,7 +6313,7 @@
;;
--tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
-@@ -952,7 +793,6 @@ func_enable_tag ()
+@@ -952,7 +793,6 @@
-\?|-h) func_usage ;;
--help) opt_help=: ;;
@@ -8892,7 +6321,7 @@
--version) func_version ;;
-*) func_fatal_help "unrecognized option \`$opt'" ;;
-@@ -1176,13 +1016,10 @@ func_infer_tag ()
+@@ -1176,13 +1016,10 @@
func_quote_for_eval "$arg"
CC_quoted="$CC_quoted $func_quote_for_eval_result"
done
@@ -8907,7 +6336,7 @@
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
-@@ -1196,11 +1033,8 @@ func_infer_tag ()
+@@ -1196,11 +1033,8 @@
func_quote_for_eval "$arg"
CC_quoted="$CC_quoted $func_quote_for_eval_result"
done
@@ -8920,7 +6349,7 @@
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
-@@ -1379,7 +1213,7 @@ func_mode_compile ()
+@@ -1379,7 +1213,7 @@
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
@@ -8929,7 +6358,7 @@
func_xform "$libobj"
libobj=$func_xform_result
;;
-@@ -1454,7 +1288,7 @@ func_mode_compile ()
+@@ -1454,7 +1288,7 @@
# Calculate the filename of the output object if compiler does
# not support -o with -c
if test "$compiler_c_o" = no; then
@@ -8938,7 +6367,7 @@
lockfile="$output_obj.lock"
else
output_obj=
-@@ -1611,7 +1445,7 @@ compiler."
+@@ -1611,7 +1445,7 @@
}
$opt_help || {
@@ -8947,7 +6376,7 @@
}
func_mode_help ()
-@@ -1648,11 +1482,10 @@ This mode accepts the following addition
+@@ -1648,11 +1482,10 @@
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
-no-suppress do not suppress compiler output for multiple passes
@@ -8961,7 +6390,7 @@
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
from the given SOURCEFILE.
-@@ -1705,7 +1538,7 @@ either the \`install' or \`cp' program.
+@@ -1705,7 +1538,7 @@
The following components of INSTALL-COMMAND are treated specially:
@@ -8970,7 +6399,7 @@
The rest of the components are interpreted as arguments to that command (only
BSD-compatible install options are recognized)."
-@@ -1725,8 +1558,6 @@ The following components of LINK-COMMAND
+@@ -1725,8 +1558,6 @@
-all-static do not do any dynamic linking at all
-avoid-version do not add a version suffix if possible
@@ -8979,7 +6408,7 @@
-dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-@@ -1755,11 +1586,6 @@ The following components of LINK-COMMAND
+@@ -1755,11 +1586,6 @@
-version-info CURRENT[:REVISION[:AGE]]
specify library version info [each variable defaults to 0]
-weak LIBNAME declare that the target provides the LIBNAME interface
@@ -8991,7 +6420,7 @@
All other options (arguments beginning with \`-') are ignored.
-@@ -1797,40 +1623,14 @@ Otherwise, only FILE itself is deleted u
+@@ -1797,40 +1623,14 @@
;;
esac
@@ -9037,7 +6466,7 @@
# func_mode_execute arg...
-@@ -1912,7 +1712,7 @@ func_mode_execute ()
+@@ -1912,7 +1712,7 @@
for file
do
case $file in
@@ -9046,7 +6475,7 @@
*)
# Do a test to see if this is really a libtool program.
if func_ltwrapper_script_p "$file"; then
-@@ -1954,7 +1754,7 @@ func_mode_execute ()
+@@ -1954,7 +1754,7 @@
# Display what would be done.
if test -n "$shlibpath_var"; then
eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
@@ -9055,7 +6484,7 @@
fi
$ECHO "$cmd$args"
exit $EXIT_SUCCESS
-@@ -1995,23 +1795,23 @@ func_mode_finish ()
+@@ -1995,23 +1795,23 @@
# Exit here if they wanted silent mode.
$opt_silent && exit $EXIT_SUCCESS
@@ -9090,7 +6519,7 @@
fi
if test -n "$hardcode_libdir_flag_spec"; then
libdir=LIBDIR
-@@ -2023,21 +1823,21 @@ func_mode_finish ()
+@@ -2023,21 +1823,21 @@
$ECHO " - have your system administrator run these commands:$admincmds"
fi
if test -f /etc/ld.so.conf; then
@@ -9119,7 +6548,7 @@
exit $EXIT_SUCCESS
}
-@@ -2052,7 +1852,7 @@ func_mode_install ()
+@@ -2052,7 +1852,7 @@
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
@@ -9128,7 +6557,7 @@
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
-@@ -2067,11 +1867,6 @@ func_mode_install ()
+@@ -2067,11 +1867,6 @@
# Aesthetically quote it.
func_quote_for_eval "$arg"
install_prog="$install_prog$func_quote_for_eval_result"
@@ -9140,7 +6569,7 @@
# We need to accept at least all the BSD install flags.
dest=
-@@ -2081,10 +1876,8 @@ func_mode_install ()
+@@ -2081,10 +1876,8 @@
install_type=
isdir=no
stripme=
@@ -9151,7 +6580,7 @@
if test -n "$dest"; then
files="$files $dest"
dest=$arg
-@@ -2094,9 +1887,10 @@ func_mode_install ()
+@@ -2094,9 +1887,10 @@
case $arg in
-d) isdir=yes ;;
-f)
@@ -9165,7 +6594,7 @@
;;
-g | -m | -o)
prev=$arg
-@@ -2110,10 +1904,6 @@ func_mode_install ()
+@@ -2110,10 +1904,6 @@
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
@@ -9176,7 +6605,7 @@
prev=
else
dest=$arg
-@@ -2125,10 +1915,6 @@ func_mode_install ()
+@@ -2125,10 +1915,6 @@
# Aesthetically quote the argument.
func_quote_for_eval "$arg"
install_prog="$install_prog $func_quote_for_eval_result"
@@ -9187,7 +6616,7 @@
done
test -z "$install_prog" && \
-@@ -2137,13 +1923,6 @@ func_mode_install ()
+@@ -2137,13 +1923,6 @@
test -n "$prev" && \
func_fatal_help "the \`$prev' option requires an argument"
@@ -9201,7 +6630,7 @@
if test -z "$files"; then
if test -z "$dest"; then
func_fatal_help "no file or destination specified"
-@@ -2231,7 +2010,7 @@ func_mode_install ()
+@@ -2231,7 +2010,7 @@
if test -n "$relink_command"; then
# Determine the prefix the user has applied to our future dir.
@@ -9210,7 +6639,7 @@
# Don't allow the user to place us outside of our expected
# location b/c this prevents finding dependent libraries that
-@@ -2244,9 +2023,9 @@ func_mode_install ()
+@@ -2244,9 +2023,9 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -9222,7 +6651,7 @@
fi
func_warning "relinking \`$file'"
-@@ -2264,7 +2043,7 @@ func_mode_install ()
+@@ -2264,7 +2043,7 @@
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
@@ -9231,7 +6660,7 @@
'exit $?'
tstripme="$stripme"
case $host_os in
-@@ -2404,7 +2183,7 @@ func_mode_install ()
+@@ -2404,7 +2183,7 @@
if test -f "$lib"; then
func_source "$lib"
fi
@@ -9240,7 +6669,7 @@
if test -n "$libdir" && test ! -f "$libfile"; then
func_warning "\`$lib' has not been installed in \`$libdir'"
finalize=no
-@@ -2423,7 +2202,7 @@ func_mode_install ()
+@@ -2423,7 +2202,7 @@
file="$func_basename_result"
outputname="$tmpdir/$file"
# Replace the output file specification.
@@ -9249,7 +6678,7 @@
$opt_silent || {
func_quote_for_expand "$relink_command"
-@@ -2442,7 +2221,7 @@ func_mode_install ()
+@@ -2442,7 +2221,7 @@
}
else
# Install the binary that we compiled earlier.
@@ -9258,7 +6687,7 @@
fi
fi
-@@ -2544,10 +2323,6 @@ func_generate_dlsyms ()
+@@ -2544,10 +2323,6 @@
extern \"C\" {
#endif
@@ -9269,7 +6698,7 @@
/* External symbol declarations for the compiler. */\
"
-@@ -2557,7 +2332,7 @@ extern \"C\" {
+@@ -2557,7 +2332,7 @@
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
@@ -9278,7 +6707,7 @@
for progfile in $progfiles; do
func_verbose "extracting global C symbols from \`$progfile'"
$opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
-@@ -2596,7 +2371,7 @@ extern \"C\" {
+@@ -2596,7 +2371,7 @@
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
@@ -9287,7 +6716,7 @@
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
-@@ -2640,10 +2415,10 @@ extern \"C\" {
+@@ -2640,10 +2415,10 @@
if test -f "$nlist"S; then
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
else
@@ -9300,7 +6729,7 @@
/* The mapping between symbol names and symbols. */
typedef struct {
-@@ -2653,7 +2428,7 @@ typedef struct {
+@@ -2653,7 +2428,7 @@
"
case $host in
*cygwin* | *mingw* | *cegcc* )
@@ -9309,7 +6738,7 @@
/* DATA imports from DLLs on WIN32 con't be const, because
runtime relocations are performed -- see ld's documentation
on pseudo-relocs. */"
-@@ -2666,7 +2441,7 @@ typedef struct {
+@@ -2666,7 +2441,7 @@
lt_dlsym_const=const ;;
esac
@@ -9318,7 +6747,7 @@
extern $lt_dlsym_const lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[];
$lt_dlsym_const lt_dlsymlist
-@@ -2682,7 +2457,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[]
+@@ -2682,7 +2457,7 @@
eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
;;
esac
@@ -9327,7 +6756,7 @@
{0, (void *) 0}
};
-@@ -2740,16 +2515,16 @@ static const void *lt_preloaded_setup()
+@@ -2740,16 +2515,16 @@
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
@@ -9350,7 +6779,7 @@
;;
esac
;;
-@@ -2763,8 +2538,8 @@ static const void *lt_preloaded_setup()
+@@ -2763,8 +2538,8 @@
# really was required.
# Nullify the symbol file.
@@ -9361,7 +6790,7 @@
fi
}
-@@ -2774,7 +2549,6 @@ static const void *lt_preloaded_setup()
+@@ -2774,7 +2549,6 @@
# Need a lot of goo to handle *both* DLLs and import libs
# Has to be a shell function in order to 'eat' the argument
# that is supplied when $file_magic_command is called.
@@ -9369,7 +6798,7 @@
func_win32_libid ()
{
$opt_debug
-@@ -2785,9 +2559,8 @@ func_win32_libid ()
+@@ -2785,9 +2559,8 @@
win32_libid_type="x86 archive import"
;;
*ar\ archive*) # could be an import, or static
@@ -9380,7 +6809,7 @@
win32_nmres=`eval $NM -f posix -A $1 |
$SED -n -e '
1,100{
-@@ -2825,18 +2598,7 @@ func_extract_an_archive ()
+@@ -2825,18 +2598,7 @@
$opt_debug
f_ex_an_ar_dir="$1"; shift
f_ex_an_ar_oldlib="$1"
@@ -9400,7 +6829,7 @@
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
:
else
-@@ -2907,7 +2669,7 @@ func_extract_archives ()
+@@ -2907,7 +2669,7 @@
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
@@ -9409,7 +6838,7 @@
$LIPO -create -output "$darwin_file" $darwin_files
done # $darwin_filelist
$RM -rf unfat-$$
-@@ -2922,30 +2684,25 @@ func_extract_archives ()
+@@ -2922,30 +2684,25 @@
func_extract_an_archive "$my_xdir" "$my_xabs"
;;
esac
@@ -9452,7 +6881,7 @@
$ECHO "\
#! $SHELL
-@@ -2961,6 +2718,7 @@ func_emit_wrapper ()
+@@ -2961,6 +2718,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -9460,7 +6889,7 @@
sed_quote_subst='$sed_quote_subst'
# Be Bourne compatible
-@@ -2991,132 +2749,31 @@ if test \"\$libtool_install_magic\" = \"
+@@ -2991,132 +2749,31 @@
else
# When we are sourced in execute mode, \$file and \$ECHO are already set.
if test \"\$libtool_execute_magic\" != \"$magic\"; then
@@ -9611,7 +7040,7 @@
# If there was a directory component, then change thisdir.
if test \"x\$destdir\" != \"x\$file\"; then
-@@ -3126,13 +2783,30 @@ func_exec_program ()
+@@ -3126,13 +2783,30 @@
esac
fi
@@ -9645,7 +7074,7 @@
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
# special case for '.'
if test \"\$thisdir\" = \".\"; then
-@@ -3140,7 +2814,7 @@ func_exec_program ()
+@@ -3140,7 +2814,7 @@
fi
# remove .libs from thisdir
case \"\$thisdir\" in
@@ -9654,7 +7083,7 @@
$objdir ) thisdir=. ;;
esac
fi
-@@ -3203,7 +2877,7 @@ func_exec_program ()
+@@ -3203,7 +2877,7 @@
# Some systems cannot cope with colon-terminated $shlibpath_var
# The second colon is a workaround for a bug in BeOS R4 sed
@@ -9663,7 +7092,7 @@
export $shlibpath_var
"
-@@ -3220,18 +2894,64 @@ func_exec_program ()
+@@ -3220,18 +2894,64 @@
$ECHO "\
if test \"\$libtool_execute_magic\" != \"$magic\"; then
# Run the actual program with our arguments.
@@ -9730,7 +7159,7 @@
# func_to_host_path arg
-@@ -3258,19 +2978,23 @@ fi\
+@@ -3258,19 +2978,23 @@
func_to_host_path ()
{
func_to_host_path_result="$1"
@@ -9759,7 +7188,7 @@
;;
* )
# Unfortunately, winepath does not exit with a non-zero
-@@ -3282,17 +3006,17 @@ func_to_host_path ()
+@@ -3282,17 +3006,17 @@
# the odd construction:
func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
@@ -9780,7 +7209,7 @@
func_error "Continuing, but uninstalled executables may not work."
# Fallback:
func_to_host_path_result="$1"
-@@ -3325,24 +3049,30 @@ func_to_host_path ()
+@@ -3325,24 +3049,30 @@
func_to_host_pathlist ()
{
func_to_host_pathlist_result="$1"
@@ -9818,7 +7247,7 @@
$SED -e "$lt_sed_naive_backslashify"`
;;
* )
-@@ -3358,17 +3088,18 @@ func_to_host_pathlist ()
+@@ -3358,17 +3088,18 @@
if test -z "$func_to_host_pathlist_result" ; then
func_to_host_pathlist_result="$func_to_host_path_result"
else
@@ -9840,7 +7269,7 @@
func_error "Continuing, but uninstalled executables may not work."
# Fallback. This may break if $1 contains DOS-style drive
# specifications. The fix is not to complicate the expression
-@@ -3385,7 +3116,7 @@ func_to_host_pathlist ()
+@@ -3385,7 +3116,7 @@
;;
esac
case "$1" in
@@ -9849,7 +7278,7 @@
;;
esac
;;
-@@ -3410,23 +3141,31 @@ func_emit_cwrapperexe_src ()
+@@ -3410,23 +3141,31 @@
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
@@ -9884,7 +7313,7 @@
# endif
#endif
#include <malloc.h>
-@@ -3438,44 +3177,6 @@ EOF
+@@ -3438,44 +3177,6 @@
#include <fcntl.h>
#include <sys/stat.h>
@@ -9929,7 +7358,7 @@
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
#elif defined(MAXPATHLEN)
-@@ -3491,7 +3192,14 @@ int setenv (const char *, const char *,
+@@ -3491,7 +3192,14 @@
# define S_IXGRP 0
#endif
@@ -9945,7 +7374,7 @@
#ifndef DIR_SEPARATOR
# define DIR_SEPARATOR '/'
# define PATH_SEPARATOR ':'
-@@ -3522,6 +3230,10 @@ int setenv (const char *, const char *,
+@@ -3522,6 +3230,10 @@
# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
#endif /* PATH_SEPARATOR_2 */
@@ -9956,7 +7385,7 @@
#ifndef FOPEN_WB
# define FOPEN_WB "w"
#endif
-@@ -3534,13 +3246,22 @@ int setenv (const char *, const char *,
+@@ -3534,13 +3246,22 @@
if (stale) { free ((void *) stale); stale = 0; } \
} while (0)
@@ -9983,7 +7412,7 @@
void *xmalloc (size_t num);
char *xstrdup (const char *string);
-@@ -3550,17 +3271,31 @@ char *chase_symlinks (const char *pathsp
+@@ -3550,17 +3271,31 @@
int make_executable (const char *path);
int check_executable (const char *path);
char *strendzap (char *str, const char *pat);
@@ -10021,7 +7450,7 @@
cat <<EOF
const char * MAGIC_EXE = "$magic_exe";
-@@ -3605,10 +3340,24 @@ EOF
+@@ -3605,10 +3340,24 @@
cat <<"EOF"
#define LTWRAPPER_OPTION_PREFIX "--lt-"
@@ -10047,7 +7476,7 @@
int
main (int argc, char *argv[])
-@@ -3625,13 +3374,10 @@ main (int argc, char *argv[])
+@@ -3625,13 +3374,10 @@
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
@@ -10064,7 +7493,7 @@
for (i = 1; i < argc; i++)
{
if (strcmp (argv[i], dumpscript_opt) == 0)
-@@ -3645,57 +3391,25 @@ EOF
+@@ -3645,57 +3391,25 @@
esac
cat <<"EOF"
@@ -10131,7 +7560,7 @@
strendzap (actual_cwrapper_path, actual_cwrapper_name);
/* wrapper name transforms */
-@@ -3713,9 +3427,8 @@ EOF
+@@ -3713,9 +3427,8 @@
target_name = tmp_pathspec;
tmp_pathspec = 0;
@@ -10143,7 +7572,7 @@
EOF
cat <<EOF
-@@ -3768,12 +3481,77 @@ EOF
+@@ -3768,12 +3481,77 @@
lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
@@ -10225,7 +7654,7 @@
}
EOF
-@@ -3782,14 +3560,11 @@ EOF
+@@ -3782,14 +3560,11 @@
mingw*)
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
@@ -10241,7 +7670,7 @@
return 127;
}
return rval;
-@@ -3811,7 +3586,7 @@ xmalloc (size_t num)
+@@ -3811,7 +3586,7 @@
{
void *p = (void *) malloc (num);
if (!p)
@@ -10250,7 +7679,7 @@
return p;
}
-@@ -3845,8 +3620,8 @@ check_executable (const char *path)
+@@ -3845,8 +3620,8 @@
{
struct stat st;
@@ -10261,7 +7690,7 @@
if ((!path) || (!*path))
return 0;
-@@ -3863,8 +3638,8 @@ make_executable (const char *path)
+@@ -3863,8 +3638,8 @@
int rval = 0;
struct stat st;
@@ -10272,7 +7701,7 @@
if ((!path) || (!*path))
return 0;
-@@ -3890,8 +3665,8 @@ find_executable (const char *wrapper)
+@@ -3890,8 +3665,8 @@
int tmp_len;
char *concat_name;
@@ -10283,7 +7712,7 @@
if ((wrapper == NULL) || (*wrapper == '\0'))
return NULL;
-@@ -3944,8 +3719,7 @@ find_executable (const char *wrapper)
+@@ -3944,8 +3719,7 @@
{
/* empty path: current directory */
if (getcwd (tmp, LT_PATHMAX) == NULL)
@@ -10293,7 +7722,7 @@
tmp_len = strlen (tmp);
concat_name =
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-@@ -3970,8 +3744,7 @@ find_executable (const char *wrapper)
+@@ -3970,8 +3744,7 @@
}
/* Relative path | not found in path: prepend cwd */
if (getcwd (tmp, LT_PATHMAX) == NULL)
@@ -10303,7 +7732,7 @@
tmp_len = strlen (tmp);
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
memcpy (concat_name, tmp, tmp_len);
-@@ -3997,9 +3770,8 @@ chase_symlinks (const char *pathspec)
+@@ -3997,9 +3770,8 @@
int has_symlinks = 0;
while (strlen (tmp_pathspec) && !has_symlinks)
{
@@ -10315,7 +7744,7 @@
if (lstat (tmp_pathspec, &s) == 0)
{
if (S_ISLNK (s.st_mode) != 0)
-@@ -4021,9 +3793,8 @@ chase_symlinks (const char *pathspec)
+@@ -4021,9 +3793,8 @@
}
else
{
@@ -10327,7 +7756,7 @@
}
}
XFREE (tmp_pathspec);
-@@ -4036,8 +3807,7 @@ chase_symlinks (const char *pathspec)
+@@ -4036,8 +3807,7 @@
tmp_pathspec = realpath (pathspec, buf);
if (tmp_pathspec == 0)
{
@@ -10337,7 +7766,7 @@
}
return xstrdup (tmp_pathspec);
#endif
-@@ -4063,25 +3833,11 @@ strendzap (char *str, const char *pat)
+@@ -4063,25 +3833,11 @@
return str;
}
@@ -10365,7 +7794,7 @@
vfprintf (stderr, message, ap);
fprintf (stderr, ".\n");
-@@ -4090,32 +3846,20 @@ lt_error_core (int exit_status, const ch
+@@ -4090,32 +3846,20 @@
}
void
@@ -10403,7 +7832,7 @@
{
#ifdef HAVE_SETENV
/* always make a copy, for consistency with !HAVE_SETENV */
-@@ -4160,12 +3904,95 @@ lt_extend_str (const char *orig_value, c
+@@ -4160,12 +3904,95 @@
return new_value;
}
@@ -10502,7 +7931,7 @@
if (name && *name && value && *value)
{
-@@ -4184,9 +4011,9 @@ lt_update_exe_path (const char *name, co
+@@ -4184,9 +4011,9 @@
void
lt_update_lib_path (const char *name, const char *value)
{
@@ -10515,7 +7944,7 @@
if (name && *name && value && *value)
{
-@@ -4196,152 +4023,11 @@ lt_update_lib_path (const char *name, co
+@@ -4196,152 +4023,11 @@
}
}
@@ -10668,7 +8097,7 @@
# func_mode_link arg...
func_mode_link ()
{
-@@ -4386,7 +4072,6 @@ func_mode_link ()
+@@ -4386,7 +4072,6 @@
new_inherited_linker_flags=
avoid_version=no
@@ -10676,7 +8105,7 @@
dlfiles=
dlprefiles=
dlself=no
-@@ -4479,11 +4164,6 @@ func_mode_link ()
+@@ -4479,11 +4164,6 @@
esac
case $prev in
@@ -10688,7 +8117,7 @@
dlfiles|dlprefiles)
if test "$preload" = no; then
# Add the symbol object into the linking commands.
-@@ -4745,11 +4425,6 @@ func_mode_link ()
+@@ -4745,11 +4425,6 @@
continue
;;
@@ -10700,7 +8129,7 @@
-dlopen)
prev=dlfiles
continue
-@@ -4828,7 +4503,7 @@ func_mode_link ()
+@@ -4828,7 +4503,7 @@
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
@@ -10709,7 +8138,7 @@
case :$dllsearchpath: in
*":$dir:"*) ;;
::) dllsearchpath=$dir;;
-@@ -4847,7 +4522,7 @@ func_mode_link ()
+@@ -4847,7 +4522,7 @@
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
@@ -10718,7 +8147,7 @@
# These systems don't actually have a C or math library (as such)
continue
;;
-@@ -5033,7 +4708,7 @@ func_mode_link ()
+@@ -5033,7 +4708,7 @@
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
@@ -10727,7 +8156,7 @@
compiler_flags="$compiler_flags $func_quote_for_eval_result"
done
IFS="$save_ifs"
-@@ -5079,19 +4754,18 @@ func_mode_link ()
+@@ -5079,19 +4754,18 @@
arg="$func_quote_for_eval_result"
;;
@@ -10758,7 +8187,7 @@
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
-@@ -5251,7 +4925,7 @@ func_mode_link ()
+@@ -5251,7 +4925,7 @@
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
@@ -10767,7 +8196,7 @@
else
shlib_search_path=
fi
-@@ -5359,7 +5033,10 @@ func_mode_link ()
+@@ -5359,7 +5033,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -10779,7 +8208,7 @@
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5374,8 +5051,7 @@ func_mode_link ()
+@@ -5374,8 +5051,7 @@
# Collect preopened libtool deplibs, except any this library
# has declared as weak libs
for deplib in $dependency_libs; do
@@ -10789,7 +8218,7 @@
case " $weak_libs " in
*" $deplib_base "*) ;;
*) deplibs="$deplibs $deplib" ;;
-@@ -5554,7 +5230,7 @@ func_mode_link ()
+@@ -5554,7 +5230,7 @@
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
@@ -10798,7 +8227,7 @@
| $EGREP "$match_pattern_regex" > /dev/null; then
valid_a_lib=yes
fi
-@@ -5564,15 +5240,15 @@ func_mode_link ()
+@@ -5564,15 +5240,15 @@
;;
esac
if test "$valid_a_lib" != yes; then
@@ -10821,7 +8250,7 @@
$ECHO "*** Warning: Linking the shared library $output against the"
$ECHO "*** static library $deplib is not portable!"
deplibs="$deplib $deplibs"
-@@ -5645,7 +5321,7 @@ func_mode_link ()
+@@ -5645,7 +5321,7 @@
# Convert "-framework foo" to "foo.ltframework"
if test -n "$inherited_linker_flags"; then
@@ -10830,7 +8259,7 @@
for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
case " $new_inherited_linker_flags " in
*" $tmp_inherited_linker_flag "*) ;;
-@@ -5653,7 +5329,7 @@ func_mode_link ()
+@@ -5653,7 +5329,7 @@
esac
done
fi
@@ -10839,7 +8268,7 @@
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -5671,19 +5347,19 @@ func_mode_link ()
+@@ -5671,19 +5347,19 @@
# It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
@@ -10869,7 +8298,7 @@
continue
fi # $pass = conv
-@@ -5907,7 +5583,7 @@ func_mode_link ()
+@@ -5907,7 +5583,7 @@
fi
done
if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
@@ -10878,7 +8307,7 @@
if test "$linkmode" = prog; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
-@@ -6010,9 +5686,9 @@ func_mode_link ()
+@@ -6010,9 +5686,9 @@
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
@@ -10891,7 +8320,7 @@
else
add="$dir/$old_library"
fi
-@@ -6152,21 +5828,21 @@ func_mode_link ()
+@@ -6152,21 +5828,21 @@
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
@@ -10925,7 +8354,7 @@
fi
if test "$build_old_libs" = no; then
build_libtool_libs=module
-@@ -6286,7 +5962,7 @@ func_mode_link ()
+@@ -6286,7 +5962,7 @@
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
@@ -10934,7 +8363,7 @@
fi
fi
dependency_libs="$newdependency_libs"
-@@ -6454,7 +6130,7 @@ func_mode_link ()
+@@ -6454,7 +6130,7 @@
if test "$deplibs_check_method" != pass_all; then
func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
else
@@ -10943,7 +8372,7 @@
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
$ECHO "*** objects $objs is not portable!"
libobjs="$libobjs $objs"
-@@ -6522,7 +6198,7 @@ func_mode_link ()
+@@ -6522,7 +6198,7 @@
age="$number_minor"
revision="$number_revision"
;;
@@ -10952,7 +8381,7 @@
current="$number_major"
revision="$number_minor"
age="0"
-@@ -6534,6 +6210,9 @@ func_mode_link ()
+@@ -6534,6 +6210,9 @@
revision="$number_minor"
lt_irix_increment=no
;;
@@ -10962,7 +8391,7 @@
esac
;;
no)
-@@ -6756,14 +6435,14 @@ func_mode_link ()
+@@ -6756,14 +6435,14 @@
oldlibs="$oldlibs $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
@@ -10981,7 +8410,7 @@
#done
if test -n "$xrpath"; then
-@@ -6804,7 +6483,7 @@ func_mode_link ()
+@@ -6804,7 +6483,7 @@
if test "$build_libtool_libs" = yes; then
if test -n "$rpath"; then
case $host in
@@ -10990,7 +8419,7 @@
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
-@@ -6889,13 +6568,13 @@ EOF
+@@ -6889,13 +6568,13 @@
newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
@@ -11010,7 +8439,7 @@
fi
fi
;;
-@@ -6932,22 +6611,22 @@ EOF
+@@ -6932,22 +6611,22 @@
newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
@@ -11043,7 +8472,7 @@
fi
;;
*)
-@@ -6993,7 +6672,7 @@ EOF
+@@ -6993,7 +6672,7 @@
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
case $potliblink in
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
@@ -11052,7 +8481,7 @@
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-@@ -7008,12 +6687,12 @@ EOF
+@@ -7008,12 +6687,12 @@
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
@@ -11070,7 +8499,7 @@
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
-@@ -7051,7 +6730,7 @@ EOF
+@@ -7051,7 +6730,7 @@
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
potlib="$potent_lib" # see symlink-check above in file_magic test
@@ -11079,7 +8508,7 @@
$EGREP "$match_pattern_regex" > /dev/null; then
newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
-@@ -7062,12 +6741,12 @@ EOF
+@@ -7062,12 +6741,12 @@
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
@@ -11097,7 +8526,7 @@
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
-@@ -7085,25 +6764,25 @@ EOF
+@@ -7085,25 +6764,25 @@
;;
none | unknown | *)
newdeplibs=""
@@ -11133,7 +8562,7 @@
;;
esac
versuffix=$versuffix_save
-@@ -7115,23 +6794,23 @@ EOF
+@@ -7115,23 +6794,23 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library with the System framework
@@ -11167,7 +8596,7 @@
fi
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
-@@ -7141,16 +6820,16 @@ EOF
+@@ -7141,16 +6820,16 @@
build_libtool_libs=no
fi
else
@@ -11192,7 +8621,7 @@
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
build_libtool_libs=module
-@@ -7167,9 +6846,9 @@ EOF
+@@ -7167,9 +6846,9 @@
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
case $host in
*-*-darwin*)
@@ -11205,7 +8634,7 @@
;;
esac
-@@ -7291,7 +6970,7 @@ EOF
+@@ -7291,7 +6970,7 @@
done
# Use standard objects if they are pic
@@ -11214,7 +8643,7 @@
test "X$libobjs" = "X " && libobjs=
delfiles=
-@@ -7357,7 +7036,7 @@ EOF
+@@ -7357,7 +7036,7 @@
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
@@ -11223,7 +8652,7 @@
fi
if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-@@ -7458,8 +7137,7 @@ EOF
+@@ -7458,8 +7137,7 @@
save_libobjs=$libobjs
fi
save_output=$output
@@ -11233,7 +8662,7 @@
# Clear the reloadable object creation command queue and
# initialize k to one.
-@@ -7472,12 +7150,12 @@ EOF
+@@ -7472,12 +7150,12 @@
if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
output=${output_objdir}/${output_la}.lnkscript
func_verbose "creating GNU ld script: $output"
@@ -11248,7 +8677,7 @@
delfiles="$delfiles $output"
elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
output=${output_objdir}/${output_la}.lnk
-@@ -7519,19 +7197,17 @@ EOF
+@@ -7519,19 +7197,17 @@
# command to the queue.
if test "$k" -eq 1 ; then
# The first file doesn't have a previous command to add.
@@ -11271,7 +8700,7 @@
func_len " $last_robj"
func_arith $len0 + $func_len_result
len=$func_arith_result
-@@ -7541,8 +7217,7 @@ EOF
+@@ -7541,8 +7217,7 @@
# reloadable object file. All subsequent reloadable object
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
@@ -11281,7 +8710,7 @@
if test -n "$last_robj"; then
eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
fi
-@@ -7601,7 +7276,7 @@ EOF
+@@ -7601,7 +7276,7 @@
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
@@ -11290,7 +8719,7 @@
fi
if test -n "$orig_export_symbols"; then
-@@ -7766,7 +7441,7 @@ EOF
+@@ -7766,7 +7441,7 @@
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
@@ -11299,7 +8728,7 @@
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
-@@ -7777,7 +7452,7 @@ EOF
+@@ -7777,7 +7452,7 @@
fi
# Create the old-style object.
@@ -11308,7 +8737,7 @@
output="$obj"
func_execute_cmds "$reload_cmds" 'exit $?'
-@@ -7837,8 +7512,8 @@ EOF
+@@ -7837,8 +7512,8 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -11319,7 +8748,7 @@
;;
esac
-@@ -7855,8 +7530,8 @@ EOF
+@@ -7855,8 +7530,8 @@
esac
fi
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
@@ -11330,7 +8759,7 @@
;;
esac
-@@ -7993,8 +7668,8 @@ EOF
+@@ -7993,8 +7668,8 @@
if test -n "$libobjs" && test "$build_old_libs" = yes; then
# Transform all the library objects into standard objects.
@@ -11341,7 +8770,7 @@
fi
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-@@ -8006,15 +7681,15 @@ EOF
+@@ -8006,15 +7681,15 @@
wrappers_required=yes
case $host in
@@ -11361,7 +8790,7 @@
*)
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
wrappers_required=no
-@@ -8023,7 +7698,7 @@ EOF
+@@ -8023,7 +7698,7 @@
esac
if test "$wrappers_required" = no; then
# Replace the output file specification.
@@ -11370,7 +8799,7 @@
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
-@@ -8070,7 +7745,7 @@ EOF
+@@ -8070,7 +7745,7 @@
# We don't need to create a wrapper script.
link_command="$compile_var$compile_command$compile_rpath"
# Replace the output file specification.
@@ -11379,7 +8808,7 @@
# Delete the old output file.
$opt_dry_run || $RM $output
# Link the executable and exit
-@@ -8089,7 +7764,7 @@ EOF
+@@ -8089,7 +7764,7 @@
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
@@ -11388,7 +8817,7 @@
else
# fast_install is set to needless
relink_command=
-@@ -8101,7 +7776,7 @@ EOF
+@@ -8101,7 +7776,7 @@
fi
# Replace the output file specification.
@@ -11397,7 +8826,7 @@
# Delete the old output files.
$opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-@@ -8125,7 +7800,18 @@ EOF
+@@ -8125,7 +7800,18 @@
fi
done
relink_command="(cd `pwd`; $relink_command)"
@@ -11417,7 +8846,7 @@
fi
# Only actually do things if not in dry run mode.
-@@ -8246,7 +7932,7 @@ EOF
+@@ -8246,7 +7932,7 @@
done | sort | sort -uc >/dev/null 2>&1); then
:
else
@@ -11426,7 +8855,7 @@
gentop="$output_objdir/${outputname}x"
generated="$generated $gentop"
func_mkdir_p "$gentop"
-@@ -8357,7 +8043,7 @@ EOF
+@@ -8357,7 +8043,7 @@
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
@@ -11435,7 +8864,7 @@
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
-@@ -8442,27 +8128,9 @@ EOF
+@@ -8442,27 +8128,9 @@
fi
$RM $output
# place dlname in correct position for cygwin
@@ -11464,11 +8893,11 @@
esac
$ECHO > $output "\
# $outputname - a libtool library file
-Index: gvfs-1.6.3/Makefile.in
+Index: quilt-UA6TYS/Makefile.in
===================================================================
---- gvfs-1.6.3.orig/Makefile.in 2010-07-12 17:32:45.000000000 +0200
-+++ gvfs-1.6.3/Makefile.in 2010-07-19 18:35:27.222246264 +0200
-@@ -38,14 +38,14 @@ DIST_COMMON = README $(am__configure_dep
+--- quilt-UA6TYS.orig/Makefile.in 2010-09-27 16:52:41.000000000 +0200
++++ quilt-UA6TYS/Makefile.in 2010-10-01 13:00:06.000000000 +0200
+@@ -38,14 +38,14 @@
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
TODO compile config.guess config.sub depcomp install-sh \
@@ -11485,7 +8914,7 @@
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -201,6 +201,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
+@@ -201,6 +201,7 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11493,7 +8922,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -280,6 +281,7 @@ libdir = @libdir@
+@@ -280,6 +281,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -11501,7 +8930,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -327,7 +329,7 @@ all: config.h
+@@ -327,7 +329,7 @@
.SUFFIXES:
am--refresh:
@:
@@ -11510,7 +8939,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -354,9 +356,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -354,9 +356,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -11522,7 +8951,7 @@
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
-@@ -369,7 +371,7 @@ config.h: stamp-h1
+@@ -369,7 +371,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -11531,11 +8960,11 @@
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
-Index: gvfs-1.6.3/metadata/Makefile.in
+Index: quilt-UA6TYS/metadata/Makefile.in
===================================================================
---- gvfs-1.6.3.orig/metadata/Makefile.in 2010-07-12 17:32:43.000000000 +0200
-+++ gvfs-1.6.3/metadata/Makefile.in 2010-07-19 18:35:25.894246396 +0200
-@@ -45,7 +45,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+--- quilt-UA6TYS.orig/metadata/Makefile.in 2010-09-27 16:52:40.000000000 +0200
++++ quilt-UA6TYS/metadata/Makefile.in 2010-10-01 13:00:05.000000000 +0200
+@@ -45,7 +45,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -11544,7 +8973,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -240,6 +240,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
+@@ -240,6 +240,7 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11552,7 +8981,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -319,6 +320,7 @@ libdir = @libdir@
+@@ -319,6 +320,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -11560,7 +8989,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -371,7 +373,7 @@ all: all-am
+@@ -371,7 +373,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -11569,7 +8998,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -396,9 +398,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -396,9 +398,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11581,10 +9010,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-Index: gvfs-1.6.3/mkinstalldirs
+Index: quilt-UA6TYS/mkinstalldirs
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gvfs-1.6.3/mkinstalldirs 2010-07-19 18:34:06.478250562 +0200
++++ quilt-UA6TYS/mkinstalldirs 2010-10-01 13:00:06.000000000 +0200
@@ -0,0 +1,162 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
@@ -11748,11 +9177,11 @@
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
-Index: gvfs-1.6.3/monitor/afc/Makefile.in
+Index: quilt-UA6TYS/monitor/afc/Makefile.in
===================================================================
---- gvfs-1.6.3.orig/monitor/afc/Makefile.in 2010-07-12 17:32:44.000000000 +0200
-+++ gvfs-1.6.3/monitor/afc/Makefile.in 2010-07-19 18:35:26.110245848 +0200
-@@ -42,7 +42,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+--- quilt-UA6TYS.orig/monitor/afc/Makefile.in 2010-09-27 16:52:40.000000000 +0200
++++ quilt-UA6TYS/monitor/afc/Makefile.in 2010-10-01 13:00:05.000000000 +0200
+@@ -42,7 +42,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -11761,7 +9190,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -217,6 +217,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
+@@ -217,6 +217,7 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11769,7 +9198,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -296,6 +297,7 @@ libdir = @libdir@
+@@ -296,6 +297,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -11777,7 +9206,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -350,7 +352,7 @@ all: all-am
+@@ -350,7 +352,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -11786,7 +9215,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -375,9 +377,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -375,9 +377,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11798,11 +9227,11 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-libexecPROGRAMS: $(libexec_PROGRAMS)
-Index: gvfs-1.6.3/monitor/gdu/Makefile.in
+Index: quilt-UA6TYS/monitor/gdu/Makefile.in
===================================================================
---- gvfs-1.6.3.orig/monitor/gdu/Makefile.in 2010-07-12 17:32:44.000000000 +0200
-+++ gvfs-1.6.3/monitor/gdu/Makefile.in 2010-07-19 18:35:26.250245563 +0200
-@@ -42,7 +42,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+--- quilt-UA6TYS.orig/monitor/gdu/Makefile.in 2010-09-27 16:52:40.000000000 +0200
++++ quilt-UA6TYS/monitor/gdu/Makefile.in 2010-10-01 13:00:05.000000000 +0200
+@@ -42,7 +42,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -11811,7 +9240,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -219,6 +219,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
+@@ -219,6 +219,7 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11819,7 +9248,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -298,6 +299,7 @@ libdir = @libdir@
+@@ -298,6 +299,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -11827,7 +9256,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -356,7 +358,7 @@ all: all-am
+@@ -356,7 +358,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -11836,7 +9265,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -381,9 +383,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -381,9 +383,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11848,11 +9277,11 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-libexecPROGRAMS: $(libexec_PROGRAMS)
-Index: gvfs-1.6.3/monitor/gphoto2/Makefile.in
+Index: quilt-UA6TYS/monitor/gphoto2/Makefile.in
===================================================================
---- gvfs-1.6.3.orig/monitor/gphoto2/Makefile.in 2010-07-12 17:32:44.000000000 +0200
-+++ gvfs-1.6.3/monitor/gphoto2/Makefile.in 2010-07-19 18:35:26.410245704 +0200
-@@ -46,7 +46,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+--- quilt-UA6TYS.orig/monitor/gphoto2/Makefile.in 2010-09-27 16:52:40.000000000 +0200
++++ quilt-UA6TYS/monitor/gphoto2/Makefile.in 2010-10-01 13:00:06.000000000 +0200
+@@ -46,7 +46,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -11861,7 +9290,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -236,6 +236,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
+@@ -236,6 +236,7 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11869,7 +9298,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -315,6 +316,7 @@ libdir = @libdir@
+@@ -315,6 +316,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -11877,7 +9306,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -351,7 +353,7 @@ gvfs_gphoto2_volume_monitor_CFLAGS = -DG
+@@ -351,7 +353,7 @@
-I$(top_srcdir)/common -I$(top_srcdir)/monitor/proxy \
$(GLIB_CFLAGS) $(GPHOTO2_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
@@ -11886,7 +9315,7 @@
-DG_UDEV_API_IS_SUBJECT_TO_CHANGE $(NULL) $(am__append_1) \
$(am__append_2)
gvfs_gphoto2_volume_monitor_LDFLAGS = \
-@@ -372,7 +374,7 @@ all: $(BUILT_SOURCES)
+@@ -372,7 +374,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -11895,7 +9324,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -397,9 +399,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -397,9 +399,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11907,11 +9336,11 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-libexecPROGRAMS: $(libexec_PROGRAMS)
-Index: gvfs-1.6.3/monitor/hal/Makefile.in
+Index: quilt-UA6TYS/monitor/hal/Makefile.in
===================================================================
---- gvfs-1.6.3.orig/monitor/hal/Makefile.in 2010-07-12 17:32:44.000000000 +0200
-+++ gvfs-1.6.3/monitor/hal/Makefile.in 2010-07-19 18:35:26.574245949 +0200
-@@ -42,7 +42,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+--- quilt-UA6TYS.orig/monitor/hal/Makefile.in 2010-09-27 16:52:41.000000000 +0200
++++ quilt-UA6TYS/monitor/hal/Makefile.in 2010-10-01 13:00:06.000000000 +0200
+@@ -42,7 +42,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -11920,7 +9349,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -222,6 +222,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
+@@ -222,6 +222,7 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11928,7 +9357,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -301,6 +302,7 @@ libdir = @libdir@
+@@ -301,6 +302,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -11936,7 +9365,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -340,7 +342,6 @@ gvfs_hal_volume_monitor_CFLAGS = \
+@@ -340,7 +342,6 @@
$(HAL_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -11944,7 +9373,7 @@
$(NULL)
gvfs_hal_volume_monitor_LDFLAGS = \
-@@ -364,7 +365,7 @@ all: $(BUILT_SOURCES)
+@@ -364,7 +365,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -11953,7 +9382,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -389,9 +390,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -389,9 +390,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11965,11 +9394,11 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-libexecPROGRAMS: $(libexec_PROGRAMS)
-Index: gvfs-1.6.3/monitor/Makefile.in
+Index: quilt-UA6TYS/monitor/Makefile.in
===================================================================
---- gvfs-1.6.3.orig/monitor/Makefile.in 2010-07-12 17:32:43.000000000 +0200
-+++ gvfs-1.6.3/monitor/Makefile.in 2010-07-19 18:35:25.982247873 +0200
-@@ -43,7 +43,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+--- quilt-UA6TYS.orig/monitor/Makefile.in 2010-09-27 16:52:40.000000000 +0200
++++ quilt-UA6TYS/monitor/Makefile.in 2010-10-01 13:00:05.000000000 +0200
+@@ -43,7 +43,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -11978,7 +9407,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -188,6 +188,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
+@@ -188,6 +188,7 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11986,7 +9415,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -267,6 +268,7 @@ libdir = @libdir@
+@@ -267,6 +268,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -11994,7 +9423,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -288,7 +290,7 @@ SUBDIRS = proxy $(am__append_1) $(am__ap
+@@ -288,7 +290,7 @@
all: all-recursive
.SUFFIXES:
@@ -12003,7 +9432,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -313,9 +315,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -313,9 +315,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12015,11 +9444,11 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-Index: gvfs-1.6.3/monitor/proxy/Makefile.in
+Index: quilt-UA6TYS/monitor/proxy/Makefile.in
===================================================================
---- gvfs-1.6.3.orig/monitor/proxy/Makefile.in 2010-07-12 17:32:45.000000000 +0200
-+++ gvfs-1.6.3/monitor/proxy/Makefile.in 2010-07-19 18:35:26.734246601 +0200
-@@ -40,7 +40,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+--- quilt-UA6TYS.orig/monitor/proxy/Makefile.in 2010-09-27 16:52:41.000000000 +0200
++++ quilt-UA6TYS/monitor/proxy/Makefile.in 2010-10-01 13:00:06.000000000 +0200
+@@ -40,7 +40,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -12028,7 +9457,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -225,6 +225,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
+@@ -225,6 +225,7 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12036,7 +9465,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -304,6 +305,7 @@ libdir = @libdir@
+@@ -304,6 +305,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -12044,7 +9473,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -341,7 +343,6 @@ libgioremote_volume_monitor_la_CFLAGS =
+@@ -341,7 +343,6 @@
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DREMOTE_VOLUME_MONITORS_DIR=\"$(remote_volume_monitorsdir)\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -12052,7 +9481,7 @@
$(NULL)
libgioremote_volume_monitor_la_LDFLAGS = \
-@@ -368,7 +369,6 @@ libgvfsproxyvolumemonitordaemon_noin_la_
+@@ -368,7 +369,6 @@
$(GDU_CFLAGS) \
-DG_LOG_DOMAIN=\"GVFS-RemoteVolumeMonitorDaemon\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -12060,7 +9489,7 @@
$(NULL)
libgvfsproxyvolumemonitordaemon_noin_la_LIBADD = \
-@@ -381,7 +381,7 @@ all: all-am
+@@ -381,7 +381,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -12069,7 +9498,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -406,9 +406,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -406,9 +406,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12081,11 +9510,11 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-giomodulesLTLIBRARIES: $(giomodules_LTLIBRARIES)
-Index: gvfs-1.6.3/programs/Makefile.in
+Index: quilt-UA6TYS/programs/Makefile.in
===================================================================
---- gvfs-1.6.3.orig/programs/Makefile.in 2010-07-12 17:32:45.000000000 +0200
-+++ gvfs-1.6.3/programs/Makefile.in 2010-07-19 18:35:26.926247947 +0200
-@@ -49,7 +49,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+--- quilt-UA6TYS.orig/programs/Makefile.in 2010-09-27 16:52:41.000000000 +0200
++++ quilt-UA6TYS/programs/Makefile.in 2010-10-01 13:00:06.000000000 +0200
+@@ -49,7 +49,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -12094,7 +9523,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -269,6 +269,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
+@@ -269,6 +269,7 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12102,7 +9531,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -348,6 +349,7 @@ libdir = @libdir@
+@@ -348,6 +349,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -12110,7 +9539,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -369,7 +371,7 @@ INCLUDES = \
+@@ -369,7 +371,7 @@
-I$(top_builddir) \
$(GLIB_CFLAGS) \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -12119,7 +9548,7 @@
libraries = \
$(GLIB_LIBS)
-@@ -417,7 +419,7 @@ all: all-am
+@@ -417,7 +419,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -12128,7 +9557,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -442,9 +444,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -442,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12140,11 +9569,11 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-binPROGRAMS: $(bin_PROGRAMS)
-Index: gvfs-1.6.3/test/Makefile.in
+Index: quilt-UA6TYS/test/Makefile.in
===================================================================
---- gvfs-1.6.3.orig/test/Makefile.in 2010-07-12 17:32:45.000000000 +0200
-+++ gvfs-1.6.3/test/Makefile.in 2010-07-19 18:35:27.050246322 +0200
-@@ -45,7 +45,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+--- quilt-UA6TYS.orig/test/Makefile.in 2010-09-27 16:52:41.000000000 +0200
++++ quilt-UA6TYS/test/Makefile.in 2010-10-01 13:00:06.000000000 +0200
+@@ -45,7 +45,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -12153,7 +9582,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -200,6 +200,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
+@@ -200,6 +200,7 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12161,7 +9590,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -279,6 +280,7 @@ libdir = @libdir@
+@@ -279,6 +280,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -12169,7 +9598,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -299,7 +301,7 @@ AM_CFLAGS = \
+@@ -299,7 +301,7 @@
-I$(top_srcdir) \
-I$(top_builddir) \
$(GLIB_CFLAGS) \
@@ -12178,7 +9607,7 @@
AM_LDFLAGS = \
$(GLIB_LIBS)
-@@ -309,7 +311,7 @@ all: all-am
+@@ -309,7 +311,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -12187,7 +9616,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -334,9 +336,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -334,9 +336,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12199,10 +9628,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-Index: gvfs-1.6.3/INSTALL
+Index: quilt-UA6TYS/INSTALL
===================================================================
---- gvfs-1.6.3.orig/INSTALL 2010-07-19 18:36:37.922251606 +0200
-+++ gvfs-1.6.3/INSTALL 2010-07-19 18:35:27.106246597 +0200
+--- quilt-UA6TYS.orig/INSTALL 2010-09-27 16:52:36.000000000 +0200
++++ quilt-UA6TYS/INSTALL 2010-10-01 13:00:06.000000000 +0200
@@ -1,3 +1,365 @@
-The ObexFTP backend requires the obex-data-server D-Bus service in
-addition to the dependencies listed in the configure. See:
@@ -12572,10 +10001,10 @@
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
-Index: gvfs-1.6.3/config.guess
+Index: quilt-UA6TYS/config.guess
===================================================================
---- gvfs-1.6.3.orig/config.guess 2010-07-19 18:36:38.114750664 +0200
-+++ gvfs-1.6.3/config.guess 2010-07-19 18:35:23.774747559 +0200
+--- quilt-UA6TYS.orig/config.guess 2010-03-29 13:21:24.000000000 +0200
++++ quilt-UA6TYS/config.guess 2010-10-01 13:00:04.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -12589,7 +10018,7 @@
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-@@ -56,8 +56,9 @@ version="\
+@@ -56,8 +56,9 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
@@ -12601,10 +10030,10 @@
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-Index: gvfs-1.6.3/config.sub
+Index: quilt-UA6TYS/config.sub
===================================================================
---- gvfs-1.6.3.orig/config.sub 2010-07-19 18:36:38.014745491 +0200
-+++ gvfs-1.6.3/config.sub 2010-07-19 18:35:23.802246095 +0200
+--- quilt-UA6TYS.orig/config.sub 2010-03-29 13:21:24.000000000 +0200
++++ quilt-UA6TYS/config.sub 2010-10-01 13:00:04.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -12618,7 +10047,7 @@
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
-@@ -75,8 +75,9 @@ Report bugs and patches to <config-patch
+@@ -75,8 +75,9 @@
version="\
GNU config.sub ($timestamp)
@@ -12630,7 +10059,7 @@
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -380,7 +381,8 @@ case $basic_machine in
+@@ -380,7 +381,8 @@
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
@@ -12640,7 +10069,7 @@
| tron-* \
| ubicom32-* \
| v850-* | v850e-* | vax-* \
-@@ -1085,6 +1087,11 @@ case $basic_machine in
+@@ -1085,6 +1087,11 @@
basic_machine=tic6x-unknown
os=-coff
;;
@@ -12652,7 +10081,7 @@
tile*)
basic_machine=tile-unknown
os=-linux-gnu
-@@ -1435,6 +1442,8 @@ case $os in
+@@ -1435,6 +1442,8 @@
-dicos*)
os=-dicos
;;
More information about the pkg-gnome-commits
mailing list