r22360 - in /desktop/experimental/gvfs/debian: changelog gvfs-backends.install gvfs.install patches/05_shared_libdaemon.patch patches/90_relibtoolize.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Nov 16 19:45:01 UTC 2009
Author: joss
Date: Mon Nov 16 19:45:00 2009
New Revision: 22360
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22360
Log:
* 05_shared_libdaemon.patch:
+ Put the common code for all gvfsd-* in a private library in
/usr/lib/gvfs/libgvfsdaemon.so. This reduces binary sizes and
memory overhead caused by the multiple running daemons.
+ Move libgvfscommon* to /usr/lib/gvfs as well.
* Install libgvfsdaemon.
* 90_relibtoolize.patch: refresh accordingly.
Added:
desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch
Modified:
desktop/experimental/gvfs/debian/changelog
desktop/experimental/gvfs/debian/gvfs-backends.install
desktop/experimental/gvfs/debian/gvfs.install
desktop/experimental/gvfs/debian/patches/90_relibtoolize.patch
desktop/experimental/gvfs/debian/patches/series
Modified: desktop/experimental/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/changelog?rev=22360&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Mon Nov 16 19:45:00 2009
@@ -3,6 +3,13 @@
* Merge changes in unstable to the experimental (GDU-enabled) branch.
* Require dk-disks >> 009-1 to have IDE support.
* Replace part of the sed magic by linux-any magic.
+ * 05_shared_libdaemon.patch:
+ + Put the common code for all gvfsd-* in a private library in
+ /usr/lib/gvfs/libgvfsdaemon.so. This reduces binary sizes and
+ memory overhead caused by the multiple running daemons.
+ + Move libgvfscommon* to /usr/lib/gvfs as well.
+ * Install libgvfsdaemon.
+ * 90_relibtoolize.patch: refresh accordingly.
-- Josselin Mouette <joss at debian.org> Mon, 16 Nov 2009 18:28:56 +0100
Modified: desktop/experimental/gvfs/debian/gvfs-backends.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/gvfs-backends.install?rev=22360&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/gvfs-backends.install [utf-8] (original)
+++ desktop/experimental/gvfs/debian/gvfs-backends.install [utf-8] Mon Nov 16 19:45:00 2009
@@ -14,7 +14,7 @@
debian/tmp/usr/lib/gvfs/gvfsd-smb-browse
# Now installed from debian/rules:
# debian/tmp/usr/lib/gvfs/gvfs-gphoto2-volume-monitor
-debian/tmp/usr/lib/libgvfscommon-dnssd.so.*
+debian/tmp/usr/lib/gvfs/libgvfscommon-dnssd.so
# Now installed from debian/rules:
# debian/tmp/usr/share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
debian/tmp/usr/share/gvfs/mounts/archive.mount
Modified: desktop/experimental/gvfs/debian/gvfs.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/gvfs.install?rev=22360&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/gvfs.install [utf-8] (original)
+++ desktop/experimental/gvfs/debian/gvfs.install [utf-8] Mon Nov 16 19:45:00 2009
@@ -5,7 +5,8 @@
debian/tmp/usr/lib/gvfs/gvfsd-localtest
debian/tmp/usr/lib/gvfs/gvfsd-metadata
debian/tmp/usr/lib/gvfs/gvfsd-trash
-debian/tmp/usr/lib/libgvfscommon.so.*
+debian/tmp/usr/lib/gvfs/libgvfsdaemon.so
+debian/tmp/usr/lib/gvfs/libgvfscommon.so
debian/tmp/usr/share/dbus-1/services/gvfs-daemon.service
debian/tmp/usr/share/dbus-1/services/gvfs-metadata.service
debian/tmp/usr/share/locale
Added: desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch?rev=22360&op=file
==============================================================================
--- desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch (added)
+++ desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch [utf-8] Mon Nov 16 19:45:00 2009
@@ -1,0 +1,84 @@
+Index: gvfs-1.4.1/daemon/Makefile.am
+===================================================================
+--- gvfs-1.4.1.orig/daemon/Makefile.am 2009-11-16 19:22:37.290115602 +0100
++++ gvfs-1.4.1/daemon/Makefile.am 2009-11-16 19:38:15.026110186 +0100
+@@ -19,12 +19,14 @@ INCLUDES = \
+ -DGVFS_LOCALEDIR=\""$(localedir)"\" \
+ $(NULL)
+
+-noinst_LTLIBRARIES=libdaemon.la
++privlibdir = $(libdir)/gvfs
++
++privlib_LTLIBRARIES=libgvfsdaemon.la
+
+ libraries = \
+- libdaemon.la \
++ libgvfsdaemon.la \
+ $(top_builddir)/common/libgvfscommon.la \
+- $(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
++ $(GLIB_LIBS) $(DBUS_LIBS)
+
+ # D-BUS service file
+ %.service: %.service.in ../config.log
+@@ -110,7 +112,7 @@ noinst_PROGRAMS = \
+ gvfsd-test \
+ $(NULL)
+
+-libdaemon_la_SOURCES = \
++libgvfsdaemon_la_SOURCES = \
+ gvfsdaemon.c gvfsdaemon.h \
+ gvfsbackend.c gvfsbackend.h \
+ gvfschannel.c gvfschannel.h \
+@@ -158,6 +160,12 @@ libdaemon_la_SOURCES = \
+ gvfskeyring.h gvfskeyring.c \
+ $(NULL)
+
++libgvfsdaemon_la_LDFLAGS = -avoid-version
++
++libgvfsdaemon_la_LIBADD = \
++ $(top_builddir)/common/libgvfscommon.la \
++ $(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
++
+ gvfsd_SOURCES = \
+ mount.c mount.h \
+ main.c
+Index: gvfs-1.4.1/common/Makefile.am
+===================================================================
+--- gvfs-1.4.1.orig/common/Makefile.am 2009-11-16 20:20:33.370114869 +0100
++++ gvfs-1.4.1/common/Makefile.am 2009-11-16 20:22:04.614110519 +0100
+@@ -1,6 +1,8 @@
+ NULL =
+
+-lib_LTLIBRARIES=libgvfscommon.la
++privlibdir=$(libdir)/gvfs
++
++privlib_LTLIBRARIES=libgvfscommon.la
+
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
+ -I$(top_srcdir)/daemon \
+@@ -22,14 +24,14 @@ libgvfscommon_la_SOURCES = \
+ $(NULL)
+
+ # needed by cygwin (see bug #564003)
+-libgvfscommon_la_LDFLAGS = -no-undefined
++libgvfscommon_la_LDFLAGS = -no-undefined -avoid-version
+
+ libgvfscommon_la_LIBADD = \
+ $(DBUS_LIBS) \
+ $(GLIB_LIBS)
+
+ if HAVE_AVAHI
+-lib_LTLIBRARIES += libgvfscommon-dnssd.la
++privlib_LTLIBRARIES += libgvfscommon-dnssd.la
+
+ libgvfscommon_dnssd_la_SOURCES = \
+ gvfsdnssdutils.c gvfsdnssdutils.h \
+@@ -39,6 +41,8 @@ libgvfscommon_dnssd_la_SOURCES = \
+ libgvfscommon_dnssd_la_CFLAGS = \
+ $(AVAHI_CFLAGS)
+
++libgvfscommon_dnssd_la_LDFLAGS = -avoid-version
++
+ libgvfscommon_dnssd_la_LIBADD = \
+ libgvfscommon.la \
+ $(AVAHI_LIBS) \
Modified: desktop/experimental/gvfs/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/90_relibtoolize.patch?rev=22360&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/90_relibtoolize.patch [utf-8] Mon Nov 16 19:45:00 2009
@@ -7,8 +7,8 @@
Index: gvfs-1.4.1/aclocal.m4
===================================================================
---- gvfs-1.4.1.orig/aclocal.m4 2009-10-20 11:03:30.000000000 +0200
-+++ gvfs-1.4.1/aclocal.m4 2009-10-20 10:56:13.000000000 +0200
+--- gvfs-1.4.1.orig/aclocal.m4 2009-11-16 20:19:09.622112230 +0100
++++ gvfs-1.4.1/aclocal.m4 2009-11-16 20:22:08.661609471 +0100
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -20,7 +20,7 @@
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'.])])
-@@ -3152,13 +3152,10 @@
+@@ -3152,13 +3152,10 @@ linux* | k*bsd*-gnu)
# before this can be enabled.
hardcode_into_libs=yes
@@ -35,7 +35,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -3170,6 +3167,18 @@
+@@ -3170,6 +3167,18 @@ linux* | k*bsd*-gnu)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -54,7 +54,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -3761,7 +3770,7 @@
+@@ -3761,7 +3770,7 @@ linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -63,7 +63,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
-@@ -4442,7 +4451,7 @@
+@@ -4442,7 +4451,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
@@ -72,7 +72,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -4867,6 +4876,9 @@
+@@ -4867,6 +4876,9 @@ m4_if([$1], [CXX], [
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'
;;
@@ -82,7 +82,7 @@
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -4931,6 +4943,9 @@
+@@ -4931,6 +4943,9 @@ dnl Note also adjust exclude_expsyms for
openbsd*)
with_gnu_ld=no
;;
@@ -92,7 +92,7 @@
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -5113,7 +5128,7 @@
+@@ -5113,7 +5128,7 @@ _LT_EOF
fi
;;
@@ -101,7 +101,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=
-@@ -5288,6 +5303,7 @@
+@@ -5288,6 +5303,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -109,7 +109,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -5526,7 +5542,7 @@
+@@ -5526,7 +5542,7 @@ _LT_EOF
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -118,7 +118,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
-@@ -8735,14 +8751,16 @@
+@@ -8735,14 +8751,16 @@ fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
@@ -143,7 +143,7 @@
fi[]dnl
])# _PKG_CONFIG
-@@ -8786,9 +8804,9 @@
+@@ -8786,9 +8804,9 @@ See the pkg-config man page for more det
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
@@ -155,7 +155,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-@@ -9403,6 +9421,46 @@
+@@ -9403,6 +9421,46 @@ fi
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
@@ -204,9 +204,9 @@
# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
Index: gvfs-1.4.1/client/Makefile.in
===================================================================
---- gvfs-1.4.1.orig/client/Makefile.in 2009-10-20 11:03:31.000000000 +0200
-+++ gvfs-1.4.1/client/Makefile.in 2009-10-20 10:56:16.000000000 +0200
-@@ -217,6 +217,7 @@
+--- gvfs-1.4.1.orig/client/Makefile.in 2009-11-16 20:19:09.594112092 +0100
++++ gvfs-1.4.1/client/Makefile.in 2009-11-16 20:22:26.254108263 +0100
+@@ -217,6 +217,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -214,7 +214,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -236,6 +237,7 @@
+@@ -236,6 +237,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -222,7 +222,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -317,7 +319,7 @@
+@@ -317,7 +319,7 @@ INCLUDES = -I$(top_srcdir) \
-I$(top_srcdir)/metadata \
-I$(top_srcdir)/common \
$(GLIB_CFLAGS) $(DBUS_CFLAGS) \
@@ -231,7 +231,7 @@
-DGVFS_MODULE_DIR=\"$(libdir)/gvfs/modules\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
-DDBUS_API_SUBJECT_TO_CHANGE
-@@ -369,7 +371,7 @@
+@@ -369,7 +371,7 @@ test_uri_utils_CFLAGS = $(INCLUDES)
@USE_FUSE_TRUE@ -I$(top_srcdir) \
@USE_FUSE_TRUE@ -I$(top_srcdir)/common \
@USE_FUSE_TRUE@ $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(FUSE_CFLAGS) \
@@ -240,7 +240,7 @@
@USE_FUSE_TRUE@ -DDBUS_API_SUBJECT_TO_CHANGE
@USE_FUSE_TRUE at gvfs_fuse_daemon_LDADD = \
-@@ -380,7 +382,7 @@
+@@ -380,7 +382,7 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -249,7 +249,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -405,9 +407,9 @@
+@@ -405,9 +407,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -263,9 +263,34 @@
install-giomodulesLTLIBRARIES: $(giomodules_LTLIBRARIES)
Index: gvfs-1.4.1/common/Makefile.in
===================================================================
---- gvfs-1.4.1.orig/common/Makefile.in 2009-10-20 11:03:32.000000000 +0200
-+++ gvfs-1.4.1/common/Makefile.in 2009-10-20 10:56:16.000000000 +0200
-@@ -200,6 +200,7 @@
+--- gvfs-1.4.1.orig/common/Makefile.in 2009-11-16 20:19:09.566115864 +0100
++++ gvfs-1.4.1/common/Makefile.in 2009-11-16 20:22:26.422107124 +0100
+@@ -66,8 +66,8 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-LTLIBRARIES = $(lib_LTLIBRARIES)
++am__installdirs = "$(DESTDIR)$(privlibdir)"
++LTLIBRARIES = $(privlib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ @HAVE_AVAHI_TRUE at libgvfscommon_dnssd_la_DEPENDENCIES = \
+ @HAVE_AVAHI_TRUE@ libgvfscommon.la $(am__DEPENDENCIES_1) \
+@@ -82,9 +82,10 @@ am__objects_1 =
+ libgvfscommon_dnssd_la_OBJECTS = $(am_libgvfscommon_dnssd_la_OBJECTS)
+ libgvfscommon_dnssd_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+- $(libgvfscommon_dnssd_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
+- at HAVE_AVAHI_TRUE@am_libgvfscommon_dnssd_la_rpath = -rpath $(libdir)
++ $(libgvfscommon_dnssd_la_CFLAGS) $(CFLAGS) \
++ $(libgvfscommon_dnssd_la_LDFLAGS) $(LDFLAGS) -o $@
++ at HAVE_AVAHI_TRUE@am_libgvfscommon_dnssd_la_rpath = -rpath \
++ at HAVE_AVAHI_TRUE@ $(privlibdir)
+ libgvfscommon_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+ am_libgvfscommon_la_OBJECTS = gsysutils.lo gdbusutils.lo gmountspec.lo \
+@@ -200,6 +201,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,7 +298,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -219,6 +220,7 @@
+@@ -219,6 +221,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -281,7 +306,13 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -299,7 +301,7 @@
+@@ -295,11 +298,12 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ NULL =
+-lib_LTLIBRARIES = libgvfscommon.la $(am__append_1)
++privlibdir = $(libdir)/gvfs
++privlib_LTLIBRARIES = libgvfscommon.la $(am__append_1)
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
-I$(top_srcdir)/daemon \
$(GLIB_CFLAGS) $(DBUS_CFLAGS) \
@@ -290,7 +321,24 @@
-DDBUS_API_SUBJECT_TO_CHANGE
libgvfscommon_la_SOURCES = \
-@@ -339,7 +341,7 @@
+@@ -317,7 +321,7 @@ libgvfscommon_la_SOURCES = \
+
+
+ # needed by cygwin (see bug #564003)
+-libgvfscommon_la_LDFLAGS = -no-undefined
++libgvfscommon_la_LDFLAGS = -no-undefined -avoid-version
+ libgvfscommon_la_LIBADD = \
+ $(DBUS_LIBS) \
+ $(GLIB_LIBS)
+@@ -330,6 +334,7 @@ libgvfscommon_la_LIBADD = \
+ @HAVE_AVAHI_TRUE at libgvfscommon_dnssd_la_CFLAGS = \
+ @HAVE_AVAHI_TRUE@ $(AVAHI_CFLAGS)
+
++ at HAVE_AVAHI_TRUE@libgvfscommon_dnssd_la_LDFLAGS = -avoid-version
+ @HAVE_AVAHI_TRUE at libgvfscommon_dnssd_la_LIBADD = \
+ @HAVE_AVAHI_TRUE@ libgvfscommon.la \
+ @HAVE_AVAHI_TRUE@ $(AVAHI_LIBS) \
+@@ -339,7 +344,7 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -299,7 +347,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -364,9 +366,9 @@
+@@ -364,37 +369,37 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -310,11 +358,123 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
++install-privlibLTLIBRARIES: $(privlib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
++ test -z "$(privlibdir)" || $(MKDIR_P) "$(DESTDIR)$(privlibdir)"
++ @list='$(privlib_LTLIBRARIES)'; test -n "$(privlibdir)" || list=; \
+ list2=; for p in $$list; do \
+ if test -f $$p; then \
+ list2="$$list2 $$p"; \
+ else :; fi; \
+ done; \
+ test -z "$$list2" || { \
+- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(privlibdir)'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(privlibdir)"; \
+ }
+
+-uninstall-libLTLIBRARIES:
++uninstall-privlibLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
++ @list='$(privlib_LTLIBRARIES)'; test -n "$(privlibdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(privlibdir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(privlibdir)/$$f"; \
+ done
+
+-clean-libLTLIBRARIES:
+- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++clean-privlibLTLIBRARIES:
++ -test -z "$(privlib_LTLIBRARIES)" || rm -f $(privlib_LTLIBRARIES)
++ @list='$(privlib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+@@ -403,7 +408,7 @@ clean-libLTLIBRARIES:
+ libgvfscommon-dnssd.la: $(libgvfscommon_dnssd_la_OBJECTS) $(libgvfscommon_dnssd_la_DEPENDENCIES)
+ $(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)
+- $(libgvfscommon_la_LINK) -rpath $(libdir) $(libgvfscommon_la_OBJECTS) $(libgvfscommon_la_LIBADD) $(LIBS)
++ $(libgvfscommon_la_LINK) -rpath $(privlibdir) $(libgvfscommon_la_OBJECTS) $(libgvfscommon_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -551,7 +556,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
++ for dir in "$(DESTDIR)$(privlibdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+@@ -581,7 +586,7 @@ maintainer-clean-generic:
+ @echo "it deletes files that may require special tools to rebuild."
+ clean: clean-am
+
+-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
++clean-am: clean-generic clean-libtool clean-privlibLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+@@ -602,13 +607,13 @@ info: info-am
+
+ info-am:
+
+-install-data-am:
++install-data-am: install-privlibLTLIBRARIES
+
+ install-dvi: install-dvi-am
+
+ install-dvi-am:
+
+-install-exec-am: install-libLTLIBRARIES
++install-exec-am:
+
+ install-html: install-html-am
+
+@@ -648,23 +653,23 @@ ps: ps-am
+
+ ps-am:
+
+-uninstall-am: uninstall-libLTLIBRARIES
++uninstall-am: uninstall-privlibLTLIBRARIES
+
+ .MAKE: install-am install-strip
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
++ clean-libtool clean-privlibLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am \
+- install-libLTLIBRARIES install-man install-pdf install-pdf-am \
++ install-html-am install-info install-info-am install-man \
++ install-pdf install-pdf-am install-privlibLTLIBRARIES \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-libLTLIBRARIES
++ tags uninstall uninstall-am uninstall-privlibLTLIBRARIES
+
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: gvfs-1.4.1/config.h.in
===================================================================
---- gvfs-1.4.1.orig/config.h.in 2009-10-20 11:03:30.000000000 +0200
-+++ gvfs-1.4.1/config.h.in 2009-10-20 10:56:19.000000000 +0200
+--- gvfs-1.4.1.orig/config.h.in 2009-11-16 20:19:09.538110836 +0100
++++ gvfs-1.4.1/config.h.in 2009-11-16 20:22:08.665609071 +0100
@@ -129,31 +129,31 @@
/* Define to 1 if you have the <stropts.h> header file. */
#undef HAVE_STROPTS_H
@@ -368,8 +528,8 @@
Index: gvfs-1.4.1/configure
===================================================================
---- gvfs-1.4.1.orig/configure 2009-10-20 11:03:30.000000000 +0200
-+++ gvfs-1.4.1/configure 2009-10-20 10:56:22.000000000 +0200
+--- gvfs-1.4.1.orig/configure 2009-11-16 20:19:09.514112252 +0100
++++ gvfs-1.4.1/configure 2009-11-16 20:22:29.713605773 +0100
@@ -1,18 +1,20 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -397,7 +557,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -20,23 +22,15 @@
+@@ -20,23 +22,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -426,7 +586,7 @@
as_nl='
'
export as_nl
-@@ -44,7 +38,13 @@
+@@ -44,7 +38,13 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -441,7 +601,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -450,7 +610,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -78,13 +78,6 @@
+@@ -78,13 +78,6 @@ if test "${PATH_SEPARATOR+set}" != set;
}
fi
@@ -464,7 +624,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -94,15 +87,15 @@
+@@ -94,15 +87,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -483,7 +643,7 @@
IFS=$as_save_IFS
;;
-@@ -114,12 +107,16 @@
+@@ -114,12 +107,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -504,7 +664,7 @@
done
PS1='$ '
PS2='> '
-@@ -131,330 +128,299 @@
+@@ -131,330 +128,299 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
@@ -1080,7 +1240,7 @@
sed -n '
p
/[$]LINENO/=
-@@ -471,8 +437,7 @@
+@@ -471,8 +437,7 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
@@ -1090,7 +1250,7 @@
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
-@@ -482,29 +447,18 @@
+@@ -482,29 +447,18 @@ test \$exitcode = 0") || {
exit
}
@@ -1125,7 +1285,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -534,7 +488,7 @@
+@@ -534,7 +488,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
@@ -1134,7 +1294,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -553,10 +507,10 @@
+@@ -553,10 +507,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
@@ -1147,7 +1307,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -571,7 +525,6 @@
+@@ -571,7 +525,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
@@ -1155,7 +1315,7 @@
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
-@@ -738,7 +691,6 @@
+@@ -738,7 +691,6 @@ cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
@@ -1163,7 +1323,7 @@
# Identity of this package.
PACKAGE_NAME=
-@@ -746,6 +698,7 @@
+@@ -746,6 +698,7 @@ PACKAGE_TARNAME=
PACKAGE_VERSION=
PACKAGE_STRING=
PACKAGE_BUGREPORT=
@@ -1171,7 +1331,7 @@
ac_unique_file="client/gdaemonvfs.h"
# Factoring default headers for most tests.
-@@ -954,6 +907,9 @@
+@@ -954,6 +907,9 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
@@ -1181,7 +1341,7 @@
am__untar
am__tar
AMTAR
-@@ -1007,6 +963,7 @@
+@@ -1007,6 +963,7 @@ bindir
program_transform_name
prefix
exec_prefix
@@ -1189,7 +1349,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1017,6 +974,7 @@
+@@ -1017,6 +974,7 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -1197,7 +1357,7 @@
enable_dependency_tracking
enable_static
enable_shared
-@@ -1198,8 +1156,7 @@
+@@ -1198,8 +1156,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 &&
@@ -1207,7 +1367,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1225,8 +1182,7 @@
+@@ -1225,8 +1182,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 &&
@@ -1217,7 +1377,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1430,8 +1386,7 @@
+@@ -1430,8 +1386,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 &&
@@ -1227,7 +1387,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1447,8 +1402,7 @@
+@@ -1447,8 +1402,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 &&
@@ -1237,7 +1397,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1478,17 +1432,17 @@
+@@ -1478,17 +1432,17 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -1261,7 +1421,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1505,15 +1459,13 @@
+@@ -1505,15 +1459,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -1279,7 +1439,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1536,8 +1488,7 @@
+@@ -1536,8 +1488,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -1289,7 +1449,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1567,11 +1518,9 @@
+@@ -1567,11 +1518,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 .` ||
@@ -1303,7 +1463,7 @@
# Find the source files, if location was not specified.
-@@ -1610,13 +1559,11 @@
+@@ -1610,13 +1559,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -1319,7 +1479,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1718,6 +1665,8 @@
+@@ -1718,6 +1665,8 @@ Optional Features:
--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]
@@ -1328,7 +1488,7 @@
--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]
-@@ -1815,6 +1764,7 @@
+@@ -1815,6 +1764,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1336,7 +1496,7 @@
_ACEOF
ac_status=$?
fi
-@@ -1878,21 +1828,483 @@
+@@ -1878,21 +1828,483 @@ test -n "$ac_init_help" && exit $ac_stat
if $ac_init_version; then
cat <<\_ACEOF
configure
@@ -1824,7 +1984,7 @@
$ $0 $@
-@@ -1928,8 +2340,8 @@
+@@ -1928,8 +2340,8 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1835,7 +1995,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1966,9 +2378,9 @@
+@@ -1966,9 +2378,9 @@ do
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1847,7 +2007,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1984,13 +2396,13 @@
+@@ -1984,13 +2396,13 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -1864,7 +2024,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -2015,13 +2427,13 @@
+@@ -2015,13 +2427,13 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -1880,7 +2040,7 @@
esac ;;
esac
done
-@@ -2093,39 +2505,41 @@
+@@ -2093,39 +2505,41 @@ _ASBOX
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -1927,7 +2087,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2144,7 +2558,7 @@
+@@ -2144,7 +2558,7 @@ for ac_site_file in "$ac_site_file1" "$a
do
test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
@@ -1936,7 +2096,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2155,7 +2569,7 @@
+@@ -2155,7 +2569,7 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
@@ -1945,7 +2105,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2163,7 +2577,7 @@
+@@ -2163,7 +2577,7 @@ $as_echo "$as_me: loading cache $cache_f
esac
fi
else
@@ -1954,7 +2114,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2178,11 +2592,11 @@
+@@ -2178,11 +2592,11 @@ for ac_var in $ac_precious_vars; do
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -1968,7 +2128,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2192,17 +2606,17 @@
+@@ -2192,17 +2606,17 @@ $as_echo "$as_me: error: \`$ac_var' was
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -1990,7 +2150,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2214,66 +2628,43 @@
+@@ -2214,66 +2628,43 @@ $as_echo "$as_me: current value: \`$ac
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -2078,7 +2238,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2299,10 +2690,10 @@
+@@ -2299,10 +2690,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
@@ -2091,7 +2251,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2310,11 +2701,11 @@
+@@ -2310,11 +2701,11 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2107,7 +2267,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2351,7 +2742,7 @@
+@@ -2351,7 +2742,7 @@ case $as_dir/ in
;;
esac
@@ -2116,7 +2276,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2367,7 +2758,7 @@
+@@ -2367,7 +2758,7 @@ fi
INSTALL=$ac_install_sh
fi
fi
@@ -2125,7 +2285,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2378,7 +2769,7 @@
+@@ -2378,7 +2769,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -2134,7 +2294,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2389,15 +2780,11 @@
+@@ -2389,15 +2780,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -2152,7 +2312,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2419,11 +2806,8 @@
+@@ -2419,11 +2806,8 @@ 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".
@@ -2166,7 +2326,7 @@
fi
test "$2" = conftest.file
-@@ -2432,13 +2816,10 @@
+@@ -2432,13 +2816,10 @@ then
# Ok.
:
else
@@ -2183,7 +2343,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2466,7 +2847,7 @@
+@@ -2466,7 +2847,7 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -2192,7 +2352,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2487,9 +2868,9 @@
+@@ -2487,9 +2868,9 @@ if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -2204,7 +2364,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2500,24 +2881,24 @@
+@@ -2500,24 +2881,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2234,7 +2394,7 @@
$as_echo "no" >&6; }
fi
-@@ -2527,9 +2908,9 @@
+@@ -2527,9 +2908,9 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -2246,7 +2406,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2540,24 +2921,24 @@
+@@ -2540,24 +2921,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2276,7 +2436,7 @@
$as_echo "no" >&6; }
fi
-@@ -2566,7 +2947,7 @@
+@@ -2566,7 +2947,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2285,7 +2445,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2579,10 +2960,10 @@
+@@ -2579,10 +2960,10 @@ fi
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -2298,7 +2458,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2590,7 +2971,7 @@
+@@ -2590,7 +2971,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2307,7 +2467,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2602,7 +2983,7 @@
+@@ -2602,7 +2983,7 @@ do
esac
done
done
@@ -2316,7 +2476,7 @@
IFS=$as_save_IFS
fi
-@@ -2618,7 +2999,7 @@
+@@ -2618,7 +2999,7 @@ fi
MKDIR_P="$ac_install_sh -d"
fi
fi
@@ -2325,7 +2485,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2631,9 +3012,9 @@
+@@ -2631,9 +3012,9 @@ for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2337,7 +2497,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2644,24 +3025,24 @@
+@@ -2644,24 +3025,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2367,7 +2527,7 @@
$as_echo "no" >&6; }
fi
-@@ -2669,11 +3050,11 @@
+@@ -2669,11 +3050,11 @@ fi
test -n "$AWK" && break
done
@@ -2381,7 +2541,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2691,11 +3072,11 @@
+@@ -2691,11 +3072,11 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -2395,7 +2555,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2715,9 +3096,7 @@
+@@ -2715,9 +3096,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
@@ -2406,7 +2566,7 @@
fi
fi
-@@ -2773,10 +3152,33 @@
+@@ -2773,10 +3152,33 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
@@ -2441,7 +2601,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2787,15 +3189,11 @@
+@@ -2787,15 +3189,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -2459,7 +2619,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2817,11 +3215,8 @@
+@@ -2817,11 +3215,8 @@ 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".
@@ -2473,7 +2633,7 @@
fi
test "$2" = conftest.file
-@@ -2830,13 +3225,10 @@
+@@ -2830,13 +3225,10 @@ then
# Ok.
:
else
@@ -2490,7 +2650,7 @@
$as_echo "yes" >&6; }
DEPDIR="${am__leading_dot}deps"
-@@ -2851,7 +3243,7 @@
+@@ -2851,7 +3243,7 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -2499,7 +2659,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -2879,12 +3271,12 @@
+@@ -2879,12 +3271,12 @@ if test "$am__include" = "#"; then
fi
@@ -2514,7 +2674,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -2909,9 +3301,9 @@
+@@ -2909,9 +3301,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -2526,7 +2686,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2922,24 +3314,24 @@
+@@ -2922,24 +3314,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2556,7 +2716,7 @@
$as_echo "no" >&6; }
fi
-@@ -2949,9 +3341,9 @@
+@@ -2949,9 +3341,9 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -2568,7 +2728,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -2962,24 +3354,24 @@
+@@ -2962,24 +3354,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2598,7 +2758,7 @@
$as_echo "no" >&6; }
fi
-@@ -2988,7 +3380,7 @@
+@@ -2988,7 +3380,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2607,7 +2767,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3002,9 +3394,9 @@
+@@ -3002,9 +3394,9 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -2619,7 +2779,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3015,24 +3407,24 @@
+@@ -3015,24 +3407,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2649,7 +2809,7 @@
$as_echo "no" >&6; }
fi
-@@ -3042,9 +3434,9 @@
+@@ -3042,9 +3434,9 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -2661,7 +2821,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3056,18 +3448,18 @@
+@@ -3056,18 +3448,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2683,7 +2843,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3086,10 +3478,10 @@
+@@ -3086,10 +3478,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2696,7 +2856,7 @@
$as_echo "no" >&6; }
fi
-@@ -3101,9 +3493,9 @@
+@@ -3101,9 +3493,9 @@ if test -z "$CC"; then
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
@@ -2708,7 +2868,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3114,24 +3506,24 @@
+@@ -3114,24 +3506,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2738,7 +2898,7 @@
$as_echo "no" >&6; }
fi
-@@ -3145,9 +3537,9 @@
+@@ -3145,9 +3537,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2750,7 +2910,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3158,24 +3550,24 @@
+@@ -3158,24 +3550,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2780,7 +2940,7 @@
$as_echo "no" >&6; }
fi
-@@ -3188,7 +3580,7 @@
+@@ -3188,7 +3580,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2789,7 +2949,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3199,73 +3591,55 @@
+@@ -3199,73 +3591,55 @@ fi
fi
@@ -2888,7 +3048,7 @@
$as_echo_n "checking for C compiler default output file name... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-@@ -3282,17 +3656,17 @@
+@@ -3282,17 +3656,17 @@ do
done
rm -f $ac_rmfiles
@@ -2911,7 +3071,7 @@
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3309,7 +3683,7 @@
+@@ -3309,7 +3683,7 @@ do
# certainly right.
break;;
*.* )
@@ -2920,7 +3080,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3328,84 +3702,75 @@
+@@ -3328,84 +3702,75 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
else
ac_file=''
fi
@@ -3030,7 +3190,7 @@
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3420,32 +3785,24 @@
+@@ -3420,32 +3785,24 @@ for ac_file in conftest.exe conftest con
esac
done
else
@@ -3070,7 +3230,7 @@
/* end confdefs.h. */
int
-@@ -3457,17 +3814,17 @@
+@@ -3457,17 +3814,17 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -3093,7 +3253,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3480,31 +3837,23 @@
+@@ -3480,31 +3837,23 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3132,7 +3292,7 @@
/* end confdefs.h. */
int
-@@ -3518,37 +3867,16 @@
+@@ -3518,37 +3867,16 @@ main ()
return 0;
}
_ACEOF
@@ -3173,7 +3333,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3557,20 +3885,16 @@
+@@ -3557,20 +3885,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -3197,7 +3357,7 @@
/* end confdefs.h. */
int
-@@ -3581,35 +3905,11 @@
+@@ -3581,35 +3905,11 @@ main ()
return 0;
}
_ACEOF
@@ -3236,7 +3396,7 @@
/* end confdefs.h. */
int
-@@ -3620,36 +3920,12 @@
+@@ -3620,36 +3920,12 @@ main ()
return 0;
}
_ACEOF
@@ -3277,7 +3437,7 @@
/* end confdefs.h. */
int
-@@ -3660,42 +3936,17 @@
+@@ -3660,42 +3936,17 @@ main ()
return 0;
}
_ACEOF
@@ -3322,7 +3482,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3712,18 +3963,14 @@
+@@ -3712,18 +3963,14 @@ else
CFLAGS=
fi
fi
@@ -3344,7 +3504,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3780,32 +4027,9 @@
+@@ -3780,32 +4027,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -3378,7 +3538,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3816,17 +4040,19 @@
+@@ -3816,17 +4040,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -3401,7 +3561,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3836,9 +4062,9 @@
+@@ -3836,9 +4062,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -3413,7 +3573,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3946,7 +4172,7 @@
+@@ -3946,7 +4172,7 @@ else
fi
fi
@@ -3422,7 +3582,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3962,16 +4188,12 @@
+@@ -3962,16 +4188,12 @@ fi
@@ -3442,7 +3602,7 @@
/* end confdefs.h. */
int
-@@ -4031,55 +4253,28 @@
+@@ -4031,55 +4253,28 @@ main ()
return 0;
}
_ACEOF
@@ -3505,7 +3665,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -4104,54 +4299,27 @@
+@@ -4104,54 +4299,27 @@ for ac_lib in '' cposix; do
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -3568,7 +3728,7 @@
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-@@ -4164,9 +4332,9 @@
+@@ -4164,9 +4332,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -3580,7 +3740,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4177,24 +4345,24 @@
+@@ -4177,24 +4345,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3610,7 +3770,7 @@
$as_echo "no" >&6; }
fi
-@@ -4204,9 +4372,9 @@
+@@ -4204,9 +4372,9 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -3622,7 +3782,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -4217,24 +4385,24 @@
+@@ -4217,24 +4385,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3652,7 +3812,7 @@
$as_echo "no" >&6; }
fi
-@@ -4243,7 +4411,7 @@
+@@ -4243,7 +4411,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3661,7 +3821,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4257,9 +4425,9 @@
+@@ -4257,9 +4425,9 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -3673,7 +3833,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4270,24 +4438,24 @@
+@@ -4270,24 +4438,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3703,7 +3863,7 @@
$as_echo "no" >&6; }
fi
-@@ -4297,9 +4465,9 @@
+@@ -4297,9 +4465,9 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -3715,7 +3875,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4311,18 +4479,18 @@
+@@ -4311,18 +4479,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3737,7 +3897,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -4341,10 +4509,10 @@
+@@ -4341,10 +4509,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -3750,7 +3910,7 @@
$as_echo "no" >&6; }
fi
-@@ -4356,9 +4524,9 @@
+@@ -4356,9 +4524,9 @@ if test -z "$CC"; then
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
@@ -3762,7 +3922,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4369,24 +4537,24 @@
+@@ -4369,24 +4537,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3792,7 +3952,7 @@
$as_echo "no" >&6; }
fi
-@@ -4400,9 +4568,9 @@
+@@ -4400,9 +4568,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -3804,7 +3964,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -4413,24 +4581,24 @@
+@@ -4413,24 +4581,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3834,7 +3994,7 @@
$as_echo "no" >&6; }
fi
-@@ -4443,7 +4611,7 @@
+@@ -4443,7 +4611,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3843,7 +4003,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4454,62 +4622,42 @@
+@@ -4454,62 +4622,42 @@ fi
fi
@@ -3928,7 +4088,7 @@
/* end confdefs.h. */
int
-@@ -4523,37 +4671,16 @@
+@@ -4523,37 +4671,16 @@ main ()
return 0;
}
_ACEOF
@@ -3969,7 +4129,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -4562,20 +4689,16 @@
+@@ -4562,20 +4689,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -3993,7 +4153,7 @@
/* end confdefs.h. */
int
-@@ -4586,35 +4709,11 @@
+@@ -4586,35 +4709,11 @@ main ()
return 0;
}
_ACEOF
@@ -4032,7 +4192,7 @@
/* end confdefs.h. */
int
-@@ -4625,36 +4724,12 @@
+@@ -4625,36 +4724,12 @@ main ()
return 0;
}
_ACEOF
@@ -4073,7 +4233,7 @@
/* end confdefs.h. */
int
-@@ -4665,42 +4740,17 @@
+@@ -4665,42 +4740,17 @@ main ()
return 0;
}
_ACEOF
@@ -4118,7 +4278,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -4717,18 +4767,14 @@
+@@ -4717,18 +4767,14 @@ else
CFLAGS=
fi
fi
@@ -4140,7 +4300,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -4785,32 +4831,9 @@
+@@ -4785,32 +4831,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -4174,7 +4334,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -4821,17 +4844,19 @@
+@@ -4821,17 +4844,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -4197,7 +4357,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -4841,9 +4866,9 @@
+@@ -4841,9 +4866,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -4209,7 +4369,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4951,7 +4976,7 @@
+@@ -4951,7 +4976,7 @@ else
fi
fi
@@ -4218,7 +4378,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4971,14 +4996,14 @@
+@@ -4971,14 +4996,14 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4235,7 +4395,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -4993,11 +5018,7 @@
+@@ -4993,11 +5018,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -4248,7 +4408,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5006,78 +5027,34 @@
+@@ -5006,78 +5027,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -4332,7 +4492,7 @@
break
fi
-@@ -5089,7 +5066,7 @@
+@@ -5089,7 +5066,7 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
@@ -4341,7 +4501,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -5100,11 +5077,7 @@
+@@ -5100,11 +5077,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -4354,7 +4514,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5113,87 +5086,40 @@
+@@ -5113,87 +5086,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -4451,7 +4611,7 @@
fi
ac_ext=c
-@@ -5202,115 +5128,23 @@
+@@ -5202,115 +5128,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4572,7 +4732,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -5328,17 +5162,17 @@
+@@ -5328,17 +5162,17 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -4593,7 +4753,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -5370,7 +5204,7 @@
+@@ -5370,7 +5204,7 @@ fi
case `pwd` in
*\ * | *\ *)
@@ -4602,7 +4762,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -5395,35 +5229,27 @@
+@@ -5395,35 +5229,27 @@ ltmain="$ac_aux_dir/ltmain.sh"
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -4645,7 +4805,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -5439,28 +5265,24 @@
+@@ -5439,28 +5265,24 @@ IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -4679,7 +4839,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -5476,9 +5298,9 @@
+@@ -5476,9 +5298,9 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -4691,7 +4851,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -5486,7 +5308,7 @@
+@@ -5486,7 +5308,7 @@ else
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -4700,7 +4860,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -5495,7 +5317,7 @@
+@@ -5495,7 +5317,7 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4709,7 +4869,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -5515,7 +5337,7 @@
+@@ -5515,7 +5337,7 @@ case `"$ac_path_SED" --version 2>&1` in
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -4718,7 +4878,7 @@
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
-@@ -5530,19 +5352,17 @@
+@@ -5530,19 +5352,17 @@ esac
$ac_path_SED_found && break 3
done
done
@@ -4741,7 +4901,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -5560,9 +5380,9 @@
+@@ -5560,9 +5380,9 @@ Xsed="$SED -e 1s/^X//"
@@ -4753,7 +4913,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -5573,7 +5393,7 @@
+@@ -5573,7 +5393,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4762,7 +4922,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -5593,7 +5413,7 @@
+@@ -5593,7 +5413,7 @@ case `"$ac_path_GREP" --version 2>&1` in
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -4771,7 +4931,7 @@
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -5608,26 +5428,24 @@
+@@ -5608,26 +5428,24 @@ esac
$ac_path_GREP_found && break 3
done
done
@@ -4803,7 +4963,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -5641,7 +5459,7 @@
+@@ -5641,7 +5459,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4812,7 +4972,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -5661,7 +5479,7 @@
+@@ -5661,7 +5479,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -4821,7 +4981,7 @@
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -5676,12 +5494,10 @@
+@@ -5676,12 +5494,10 @@ esac
$ac_path_EGREP_found && break 3
done
done
@@ -4836,7 +4996,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -5689,14 +5505,14 @@
+@@ -5689,14 +5505,14 @@ fi
fi
fi
@@ -4854,7 +5014,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -5710,7 +5526,7 @@
+@@ -5710,7 +5526,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4863,7 +5023,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -5730,7 +5546,7 @@
+@@ -5730,7 +5546,7 @@ case `"$ac_path_FGREP" --version 2>&1` i
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -4872,7 +5032,7 @@
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -5745,12 +5561,10 @@
+@@ -5745,12 +5561,10 @@ esac
$ac_path_FGREP_found && break 3
done
done
@@ -4887,7 +5047,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -5758,7 +5572,7 @@
+@@ -5758,7 +5572,7 @@ fi
fi
fi
@@ -4896,7 +5056,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -5784,7 +5598,7 @@
+@@ -5784,7 +5598,7 @@ test -z "$GREP" && GREP=grep
# Check whether --with-gnu-ld was given.
@@ -4905,7 +5065,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -5793,7 +5607,7 @@
+@@ -5793,7 +5607,7 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -4914,7 +5074,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -5823,13 +5637,13 @@
+@@ -5823,13 +5637,13 @@ $as_echo_n "checking for ld used by $CC.
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -4931,7 +5091,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -5860,18 +5674,16 @@
+@@ -5860,18 +5674,16 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -4955,7 +5115,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -5884,7 +5696,7 @@
+@@ -5884,7 +5696,7 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
@@ -4964,7 +5124,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -5896,9 +5708,9 @@
+@@ -5896,9 +5708,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -4976,7 +5136,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -5945,7 +5757,7 @@
+@@ -5945,7 +5757,7 @@ else
: ${lt_cv_path_NM=no}
fi
fi
@@ -4985,7 +5145,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -5956,9 +5768,9 @@
+@@ -5956,9 +5768,9 @@ else
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
@@ -4997,7 +5157,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -5969,24 +5781,24 @@
+@@ -5969,24 +5781,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5027,7 +5187,7 @@
$as_echo "no" >&6; }
fi
-@@ -6000,9 +5812,9 @@
+@@ -6000,9 +5812,9 @@ if test -z "$DUMPBIN"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -5039,7 +5199,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -6013,24 +5825,24 @@
+@@ -6013,24 +5825,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5069,7 +5229,7 @@
$as_echo "no" >&6; }
fi
-@@ -6043,7 +5855,7 @@
+@@ -6043,7 +5855,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5078,7 +5238,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6063,33 +5875,33 @@
+@@ -6063,33 +5875,33 @@ test -z "$NM" && NM=nm
@@ -5120,7 +5280,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -6207,10 +6019,10 @@
+@@ -6207,10 +6019,10 @@ else
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -5133,7 +5293,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -6224,7 +6036,7 @@
+@@ -6224,7 +6036,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -5142,7 +5302,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -6234,17 +6046,17 @@
+@@ -6234,17 +6046,17 @@ xsi_shell=no
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -5163,7 +5323,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -6279,14 +6091,14 @@
+@@ -6279,14 +6091,14 @@ esac
@@ -5181,7 +5341,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -6315,9 +6127,9 @@
+@@ -6315,9 +6127,9 @@ esac
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -5193,7 +5353,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -6328,24 +6140,24 @@
+@@ -6328,24 +6140,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5223,7 +5383,7 @@
$as_echo "no" >&6; }
fi
-@@ -6355,9 +6167,9 @@
+@@ -6355,9 +6167,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -5235,7 +5395,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -6368,24 +6180,24 @@
+@@ -6368,24 +6180,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5265,7 +5425,7 @@
$as_echo "no" >&6; }
fi
-@@ -6394,7 +6206,7 @@
+@@ -6394,7 +6206,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5274,7 +5434,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6414,9 +6226,9 @@
+@@ -6414,9 +6226,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
@@ -5286,7 +5446,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -6535,7 +6347,7 @@
+@@ -6535,7 +6347,7 @@ linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -5295,7 +5455,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
-@@ -6610,7 +6422,7 @@
+@@ -6610,7 +6422,7 @@ tpf*)
esac
fi
@@ -5304,7 +5464,7 @@
$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -6630,9 +6442,9 @@
+@@ -6630,9 +6442,9 @@ test -z "$deplibs_check_method" && depli
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -5316,7 +5476,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -6643,24 +6455,24 @@
+@@ -6643,24 +6455,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5346,7 +5506,7 @@
$as_echo "no" >&6; }
fi
-@@ -6670,9 +6482,9 @@
+@@ -6670,9 +6482,9 @@ if test -z "$ac_cv_prog_AR"; then
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -5358,7 +5518,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -6683,24 +6495,24 @@
+@@ -6683,24 +6495,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5388,7 +5548,7 @@
$as_echo "no" >&6; }
fi
-@@ -6709,7 +6521,7 @@
+@@ -6709,7 +6521,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5397,7 +5557,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6735,9 +6547,9 @@
+@@ -6735,9 +6547,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -5409,7 +5569,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -6748,24 +6560,24 @@
+@@ -6748,24 +6560,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5439,7 +5599,7 @@
$as_echo "no" >&6; }
fi
-@@ -6775,9 +6587,9 @@
+@@ -6775,9 +6587,9 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -5451,7 +5611,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -6788,24 +6600,24 @@
+@@ -6788,24 +6600,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5481,7 +5641,7 @@
$as_echo "no" >&6; }
fi
-@@ -6814,7 +6626,7 @@
+@@ -6814,7 +6626,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5490,7 +5650,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6834,9 +6646,9 @@
+@@ -6834,9 +6646,9 @@ test -z "$STRIP" && STRIP=:
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -5502,7 +5662,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -6847,24 +6659,24 @@
+@@ -6847,24 +6659,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5532,7 +5692,7 @@
$as_echo "no" >&6; }
fi
-@@ -6874,9 +6686,9 @@
+@@ -6874,9 +6686,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -5544,7 +5704,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -6887,24 +6699,24 @@
+@@ -6887,24 +6699,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5574,7 +5734,7 @@
$as_echo "no" >&6; }
fi
-@@ -6913,7 +6725,7 @@
+@@ -6913,7 +6725,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5583,7 +5743,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6991,9 +6803,9 @@
+@@ -6991,9 +6803,9 @@ compiler=$CC
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -5595,7 +5755,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -7109,18 +6921,18 @@
+@@ -7109,18 +6921,18 @@ void nm_test_func(void){}
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -5620,7 +5780,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -7173,11 +6985,11 @@
+@@ -7173,11 +6985,11 @@ _LT_EOF
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -5635,7 +5795,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -7211,10 +7023,10 @@
+@@ -7211,10 +7023,10 @@ if test -z "$lt_cv_sys_global_symbol_pip
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -5648,7 +5808,7 @@
$as_echo "ok" >&6; }
fi
-@@ -7240,7 +7052,7 @@
+@@ -7240,7 +7052,7 @@ fi
# Check whether --enable-libtool-lock was given.
@@ -5657,7 +5817,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -7252,11 +7064,11 @@
+@@ -7252,11 +7064,11 @@ case $host in
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -5672,7 +5832,7 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -7270,12 +7082,12 @@
+@@ -7270,12 +7082,12 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -5689,7 +5849,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -7309,11 +7121,11 @@
+@@ -7309,11 +7121,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -5704,7 +5864,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -7362,9 +7174,9 @@
+@@ -7362,9 +7174,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -5716,7 +5876,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -7373,11 +7185,7 @@
+@@ -7373,11 +7185,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -5729,7 +5889,7 @@
/* end confdefs.h. */
int
-@@ -7388,38 +7196,13 @@
+@@ -7388,38 +7196,13 @@ main ()
return 0;
}
_ACEOF
@@ -5772,7 +5932,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7427,7 +7210,7 @@
+@@ -7427,7 +7210,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -5781,7 +5941,7 @@
$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -7437,11 +7220,11 @@
+@@ -7437,11 +7220,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -5796,7 +5956,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -7467,9 +7250,9 @@
+@@ -7467,9 +7250,9 @@ need_locks="$enable_libtool_lock"
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -5808,7 +5968,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -7480,24 +7263,24 @@
+@@ -7480,24 +7263,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5838,7 +5998,7 @@
$as_echo "no" >&6; }
fi
-@@ -7507,9 +7290,9 @@
+@@ -7507,9 +7290,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
@@ -5850,7 +6010,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -7520,24 +7303,24 @@
+@@ -7520,24 +7303,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5880,7 +6040,7 @@
$as_echo "no" >&6; }
fi
-@@ -7546,7 +7329,7 @@
+@@ -7546,7 +7329,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5889,7 +6049,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7559,9 +7342,9 @@
+@@ -7559,9 +7342,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -5901,7 +6061,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -7572,24 +7355,24 @@
+@@ -7572,24 +7355,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5931,7 +6091,7 @@
$as_echo "no" >&6; }
fi
-@@ -7599,9 +7382,9 @@
+@@ -7599,9 +7382,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
@@ -5943,7 +6103,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -7612,24 +7395,24 @@
+@@ -7612,24 +7395,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5973,7 +6133,7 @@
$as_echo "no" >&6; }
fi
-@@ -7638,7 +7421,7 @@
+@@ -7638,7 +7421,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5982,7 +6142,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7651,9 +7434,9 @@
+@@ -7651,9 +7434,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -5994,7 +6154,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -7664,24 +7447,24 @@
+@@ -7664,24 +7447,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6024,7 +6184,7 @@
$as_echo "no" >&6; }
fi
-@@ -7691,9 +7474,9 @@
+@@ -7691,9 +7474,9 @@ if test -z "$ac_cv_prog_LIPO"; then
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
@@ -6036,7 +6196,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -7704,24 +7487,24 @@
+@@ -7704,24 +7487,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6066,7 +6226,7 @@
$as_echo "no" >&6; }
fi
-@@ -7730,7 +7513,7 @@
+@@ -7730,7 +7513,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6075,7 +6235,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7743,9 +7526,9 @@
+@@ -7743,9 +7526,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -6087,7 +6247,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -7756,24 +7539,24 @@
+@@ -7756,24 +7539,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6117,7 +6277,7 @@
$as_echo "no" >&6; }
fi
-@@ -7783,9 +7566,9 @@
+@@ -7783,9 +7566,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
@@ -6129,7 +6289,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -7796,24 +7579,24 @@
+@@ -7796,24 +7579,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6159,7 +6319,7 @@
$as_echo "no" >&6; }
fi
-@@ -7822,7 +7605,7 @@
+@@ -7822,7 +7605,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6168,7 +6328,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7835,9 +7618,9 @@
+@@ -7835,9 +7618,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -6180,7 +6340,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -7848,24 +7631,24 @@
+@@ -7848,24 +7631,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6210,7 +6370,7 @@
$as_echo "no" >&6; }
fi
-@@ -7875,9 +7658,9 @@
+@@ -7875,9 +7658,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
@@ -6222,7 +6382,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -7888,24 +7671,24 @@
+@@ -7888,24 +7671,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6252,7 +6412,7 @@
$as_echo "no" >&6; }
fi
-@@ -7914,7 +7697,7 @@
+@@ -7914,7 +7697,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6261,7 +6421,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7950,9 +7733,9 @@
+@@ -7950,9 +7733,9 @@ fi
@@ -6273,7 +6433,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -7977,22 +7760,18 @@
+@@ -7977,22 +7760,18 @@ else
rm -f conftest.*
fi
fi
@@ -6300,7 +6460,7 @@
/* end confdefs.h. */
int
-@@ -8003,42 +7782,17 @@
+@@ -8003,42 +7782,17 @@ main ()
return 0;
}
_ACEOF
@@ -6348,7 +6508,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -8076,16 +7830,12 @@
+@@ -8076,16 +7830,12 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
esac
@@ -6368,7 +6528,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -8100,48 +7850,23 @@
+@@ -8100,48 +7850,23 @@ main ()
return 0;
}
_ACEOF
@@ -6422,7 +6582,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -8151,18 +7876,14 @@
+@@ -8151,18 +7876,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -6444,7 +6604,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -8172,14 +7893,10 @@
+@@ -8172,14 +7893,10 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -6461,7 +6621,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -8206,118 +7923,34 @@
+@@ -8206,118 +7923,34 @@ main ()
return 0;
}
_ACEOF
@@ -6593,7 +6753,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -8327,62 +7960,13 @@
+@@ -8327,62 +7960,13 @@ fi
done
@@ -6661,7 +6821,7 @@
_ACEOF
fi
-@@ -8402,7 +7986,7 @@
+@@ -8402,7 +7986,7 @@ done
# Check whether --enable-shared was given.
@@ -6670,7 +6830,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -8435,7 +8019,7 @@
+@@ -8435,7 +8019,7 @@ fi
# Check whether --with-pic was given.
@@ -6679,7 +6839,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -8451,7 +8035,7 @@
+@@ -8451,7 +8035,7 @@ test -z "$pic_mode" && pic_mode=default
# Check whether --enable-fast-install was given.
@@ -6688,7 +6848,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -8532,9 +8116,9 @@
+@@ -8532,9 +8116,9 @@ if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
fi
@@ -6700,7 +6860,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -8547,7 +8131,7 @@
+@@ -8547,7 +8131,7 @@ else
fi
rmdir .libs 2>/dev/null
fi
@@ -6709,7 +6869,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -8640,9 +8224,9 @@
+@@ -8640,9 +8224,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -6721,7 +6881,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -8693,10 +8277,10 @@
+@@ -8693,10 +8277,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -6734,7 +6894,7 @@
$as_echo "no" >&6; }
fi
-@@ -8706,9 +8290,9 @@
+@@ -8706,9 +8290,9 @@ fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -6746,7 +6906,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -8759,10 +8343,10 @@
+@@ -8759,10 +8343,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -6759,7 +6919,7 @@
$as_echo "no" >&6; }
fi
-@@ -8839,9 +8423,9 @@
+@@ -8839,9 +8423,9 @@ lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -6771,7 +6931,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -8857,11 +8441,11 @@
+@@ -8857,11 +8441,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -6785,7 +6945,7 @@
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.
-@@ -8874,7 +8458,7 @@
+@@ -8874,7 +8458,7 @@ else
$RM conftest*
fi
@@ -6794,7 +6954,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -8894,7 +8478,7 @@
+@@ -8894,7 +8478,7 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -6803,7 +6963,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -9166,7 +8750,7 @@
+@@ -9166,7 +8750,7 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -6812,7 +6972,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -9178,9 +8762,9 @@
+@@ -9178,9 +8762,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -6824,7 +6984,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -9196,11 +8780,11 @@
+@@ -9196,11 +8780,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -6838,7 +6998,7 @@
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.
-@@ -9213,7 +8797,7 @@
+@@ -9213,7 +8797,7 @@ else
$RM conftest*
fi
@@ -6847,7 +7007,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -9237,9 +8821,9 @@
+@@ -9237,9 +8821,9 @@ fi
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -6859,7 +7019,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -9265,7 +8849,7 @@
+@@ -9265,7 +8849,7 @@ else
LDFLAGS="$save_LDFLAGS"
fi
@@ -6868,7 +7028,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -9280,9 +8864,9 @@
+@@ -9280,9 +8864,9 @@ fi
@@ -6880,7 +7040,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -9301,11 +8885,11 @@
+@@ -9301,11 +8885,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -6894,7 +7054,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -9327,7 +8911,7 @@
+@@ -9327,7 +8911,7 @@ else
$RM conftest*
fi
@@ -6903,7 +7063,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -9335,9 +8919,9 @@
+@@ -9335,9 +8919,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
@@ -6915,7 +7075,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -9356,11 +8940,11 @@
+@@ -9356,11 +8940,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -6929,7 +7089,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -9382,7 +8966,7 @@
+@@ -9382,7 +8966,7 @@ else
$RM conftest*
fi
@@ -6938,7 +7098,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -9391,7 +8975,7 @@
+@@ -9391,7 +8975,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -6947,7 +7107,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -9399,10 +8983,10 @@
+@@ -9399,10 +8983,10 @@ $as_echo_n "checking if we can lock with
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -6960,7 +7120,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -9415,7 +8999,7 @@
+@@ -9415,7 +8999,7 @@ fi
@@ -6969,7 +7129,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -9475,6 +9059,9 @@
+@@ -9475,6 +9059,9 @@ $as_echo_n "checking whether the $compil
openbsd*)
with_gnu_ld=no
;;
@@ -6979,7 +7139,7 @@
esac
ld_shlibs=yes
-@@ -9657,7 +9244,7 @@
+@@ -9657,7 +9244,7 @@ _LT_EOF
fi
;;
@@ -6988,7 +7148,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9832,6 +9419,7 @@
+@@ -9832,6 +9419,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -6996,7 +7156,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9857,11 +9445,7 @@
+@@ -9857,11 +9445,7 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -7009,7 +7169,7 @@
/* end confdefs.h. */
int
-@@ -9872,27 +9456,7 @@
+@@ -9872,27 +9456,7 @@ main ()
return 0;
}
_ACEOF
@@ -7038,7 +7198,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -9906,16 +9470,9 @@
+@@ -9906,16 +9470,9 @@ aix_libpath=`dump -H conftest$ac_exeext
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -7057,7 +7217,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -9928,11 +9485,7 @@
+@@ -9928,11 +9485,7 @@ if test -z "$aix_libpath"; then aix_libp
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -7070,7 +7230,7 @@
/* end confdefs.h. */
int
-@@ -9943,27 +9496,7 @@
+@@ -9943,27 +9496,7 @@ main ()
return 0;
}
_ACEOF
@@ -7099,7 +7259,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -9977,16 +9510,9 @@
+@@ -9977,16 +9510,9 @@ aix_libpath=`dump -H conftest$ac_exeext
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -7118,7 +7278,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10198,42 +9724,16 @@
+@@ -10198,42 +9724,16 @@ if test -z "$aix_libpath"; then aix_libp
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -7166,7 +7326,7 @@
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10246,7 +9746,7 @@
+@@ -10246,7 +9746,7 @@ rm -f core conftest.err conftest.$ac_obj
link_all_deplibs=yes
;;
@@ -7175,7 +7335,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10489,7 +9989,7 @@
+@@ -10489,7 +9989,7 @@ rm -f core conftest.err conftest.$ac_obj
fi
fi
@@ -7184,7 +7344,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -10526,16 +10026,16 @@
+@@ -10526,16 +10026,16 @@ x|xyes)
# 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.
@@ -7205,7 +7365,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -10549,11 +10049,11 @@
+@@ -10549,11 +10049,11 @@ $as_echo_n "checking whether -lc should
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -7220,7 +7380,7 @@
then
archive_cmds_need_lc=no
else
-@@ -10564,7 +10064,7 @@
+@@ -10564,7 +10064,7 @@ $as_echo_n "checking whether -lc should
cat conftest.err 1>&5
fi
$RM conftest*
@@ -7229,7 +7389,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -10728,7 +10228,7 @@
+@@ -10728,7 +10228,7 @@ esac
@@ -7238,7 +7398,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -11150,11 +10650,7 @@
+@@ -11150,11 +10650,7 @@ linux* | k*bsd*-gnu)
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -7251,7 +7411,7 @@
/* end confdefs.h. */
int
-@@ -11165,41 +10661,13 @@
+@@ -11165,41 +10661,13 @@ main ()
return 0;
}
_ACEOF
@@ -7297,7 +7457,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -11208,13 +10676,10 @@
+@@ -11208,13 +10676,10 @@ rm -f core conftest.err conftest.$ac_obj
# before this can be enabled.
hardcode_into_libs=yes
@@ -7312,7 +7472,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -11226,6 +10691,18 @@
+@@ -11226,6 +10691,18 @@ rm -f core conftest.err conftest.$ac_obj
dynamic_linker='GNU/Linux ld.so'
;;
@@ -7331,7 +7491,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11414,7 +10891,7 @@
+@@ -11414,7 +10891,7 @@ uts4*)
dynamic_linker=no
;;
esac
@@ -7340,7 +7500,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -11516,7 +10993,7 @@
+@@ -11516,7 +10993,7 @@ fi
@@ -7349,7 +7509,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -11541,7 +11018,7 @@
+@@ -11541,7 +11018,7 @@ else
# directories.
hardcode_action=unsupported
fi
@@ -7358,7 +7518,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -11586,18 +11063,14 @@
+@@ -11586,18 +11063,14 @@ else
darwin*)
# if libdl is installed we need to link against it
@@ -7380,7 +7540,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11615,43 +11088,18 @@
+@@ -11615,43 +11088,18 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -7430,7 +7590,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11664,33 +11112,19 @@
+@@ -11664,33 +11112,19 @@ fi
;;
*)
@@ -7474,7 +7634,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -11699,13 +11133,6 @@
+@@ -11699,13 +11133,6 @@ cat >>conftest.$ac_ext <<_ACEOF
extern "C"
#endif
char shl_load ();
@@ -7488,7 +7648,7 @@
int
main ()
{
-@@ -11714,212 +11141,32 @@
+@@ -11714,212 +11141,32 @@ return shl_load ();
return 0;
}
_ACEOF
@@ -7712,7 +7872,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11937,57 +11184,28 @@
+@@ -11937,57 +11184,28 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -7779,7 +7939,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12005,57 +11223,28 @@
+@@ -12005,57 +11223,28 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -7846,7 +8006,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12073,43 +11262,18 @@
+@@ -12073,43 +11262,18 @@ return dld_link ();
return 0;
}
_ACEOF
@@ -7896,7 +8056,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -12148,9 +11312,9 @@
+@@ -12148,9 +11312,9 @@ fi
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -7908,7 +8068,7 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12159,7 +11323,7 @@
+@@ -12159,7 +11323,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -7917,7 +8077,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12218,11 +11382,11 @@
+@@ -12218,11 +11382,11 @@ int main ()
return status;
}
_LT_EOF
@@ -7932,7 +8092,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -12239,14 +11403,14 @@
+@@ -12239,14 +11403,14 @@ rm -fr conftest*
fi
@@ -7950,7 +8110,7 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12255,7 +11419,7 @@
+@@ -12255,7 +11419,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -7959,7 +8119,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12314,11 +11478,11 @@
+@@ -12314,11 +11478,11 @@ int main ()
return status;
}
_LT_EOF
@@ -7974,7 +8134,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -12335,7 +11499,7 @@
+@@ -12335,7 +11499,7 @@ rm -fr conftest*
fi
@@ -7983,7 +8143,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -12374,12 +11538,12 @@
+@@ -12374,12 +11538,12 @@ fi
striplib=
old_striplib=
@@ -7998,7 +8158,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -12388,15 +11552,15 @@
+@@ -12388,15 +11552,15 @@ else
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -8017,7 +8177,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -12414,12 +11578,12 @@
+@@ -12414,12 +11578,12 @@ fi
# Report which library types will actually be built
@@ -8033,7 +8193,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -12440,14 +11604,14 @@
+@@ -12440,14 +11604,14 @@ $as_echo_n "checking whether to build sh
fi
;;
esac
@@ -8051,7 +8211,7 @@
$as_echo "$enable_static" >&6; }
-@@ -12484,9 +11648,9 @@
+@@ -12484,9 +11648,9 @@ CC="$lt_save_CC"
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -8063,7 +8223,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -12499,14 +11663,14 @@
+@@ -12499,14 +11663,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8081,7 +8241,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -12515,31 +11679,27 @@
+@@ -12515,31 +11679,27 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -8119,7 +8279,7 @@
/* end confdefs.h. */
int
-@@ -12555,63 +11715,63 @@
+@@ -12555,63 +11715,63 @@ _ACEOF
# existing .o file with -o, though they will create one.
ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
rm -f conftest2.*
@@ -8208,7 +8368,7 @@
then
# cc works too.
:
-@@ -12628,15 +11788,13 @@
+@@ -12628,15 +11788,13 @@ rm -f core conftest*
fi
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -8227,7 +8387,7 @@
fi
-@@ -12660,102 +11818,9 @@
+@@ -12660,102 +11818,9 @@ fi
# Make libtool use --silent when --silent is passed to make
LIBTOOL="${LIBTOOL} \$(shell echo \"\$(MFLAGS)\" | awk '/^[^ ]*s/ { print \"--silent\" }')"
@@ -8332,7 +8492,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -12764,16 +11829,12 @@
+@@ -12764,16 +11829,12 @@ _ACEOF
fi
@@ -8352,7 +8512,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <signal.h>
-@@ -12786,35 +11847,14 @@
+@@ -12786,35 +11847,14 @@ return *(signal (0, 0)) (0) == 1;
return 0;
}
_ACEOF
@@ -8391,7 +8551,7 @@
$as_echo "$ac_cv_type_signal" >&6; }
cat >>confdefs.h <<_ACEOF
-@@ -12822,126 +11862,29 @@
+@@ -12822,126 +11862,29 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
@@ -8536,7 +8696,7 @@
ac_cv_type_uid_t=yes
else
ac_cv_type_uid_t=no
-@@ -12949,659 +11892,90 @@
+@@ -12949,659 +11892,90 @@ fi
rm -f conftest*
fi
@@ -9235,7 +9395,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -13614,14 +11988,14 @@
+@@ -13614,14 +11988,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9253,7 +9413,7 @@
IFS=$as_save_IFS
;;
-@@ -13629,10 +12003,10 @@
+@@ -13629,10 +12003,10 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -9266,7 +9426,7 @@
$as_echo "no" >&6; }
fi
-@@ -13642,9 +12016,9 @@
+@@ -13642,9 +12016,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -9278,7 +9438,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -13657,14 +12031,14 @@
+@@ -13657,14 +12031,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9296,7 +9456,7 @@
IFS=$as_save_IFS
;;
-@@ -13672,10 +12046,10 @@
+@@ -13672,10 +12046,10 @@ esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -9309,7 +9469,7 @@
$as_echo "no" >&6; }
fi
-@@ -13684,7 +12058,7 @@
+@@ -13684,7 +12058,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9318,7 +9478,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -13697,13 +12071,13 @@
+@@ -13697,13 +12071,13 @@ fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -9335,7 +9495,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -13712,7 +12086,7 @@
+@@ -13712,7 +12086,7 @@ fi
# Check whether --with-html-dir was given.
@@ -9344,7 +9504,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -13722,7 +12096,7 @@
+@@ -13722,7 +12096,7 @@ fi
# Check whether --enable-gtk-doc was given.
@@ -9353,7 +9513,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -13731,31 +12105,29 @@
+@@ -13731,31 +12105,29 @@ fi
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -9393,7 +9553,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_CHECK in
-@@ -13768,14 +12140,14 @@
+@@ -13768,14 +12140,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9411,7 +9571,7 @@
IFS=$as_save_IFS
;;
-@@ -13783,10 +12155,10 @@
+@@ -13783,10 +12155,10 @@ esac
fi
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
if test -n "$GTKDOC_CHECK"; then
@@ -9424,7 +9584,7 @@
$as_echo "no" >&6; }
fi
-@@ -13817,40 +12189,44 @@
+@@ -13817,40 +12189,44 @@ DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-
pkg_failed=no
@@ -9488,7 +9648,7 @@
fi
-@@ -13863,25 +12239,14 @@
+@@ -13863,25 +12239,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9517,7 +9677,7 @@
$GLIB_PKG_ERRORS
-@@ -13891,22 +12256,11 @@
+@@ -13891,22 +12256,11 @@ installed software in a non-standard pre
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.
@@ -9543,7 +9703,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -13915,12 +12269,11 @@
+@@ -13915,12 +12269,11 @@ and GLIB_LIBS to avoid the need to call
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -9558,7 +9718,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -13929,40 +12282,44 @@
+@@ -13929,40 +12282,44 @@ fi
pkg_failed=no
@@ -9622,7 +9782,7 @@
fi
-@@ -13975,14 +12332,14 @@
+@@ -13975,14 +12332,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9640,7 +9800,7 @@
$DBUS_PKG_ERRORS
-@@ -13992,33 +12349,11 @@
+@@ -13992,33 +12349,11 @@ installed software in a non-standard pre
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.
@@ -9677,7 +9837,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14027,12 +12362,11 @@
+@@ -14027,12 +12362,11 @@ and DBUS_LIBS to avoid the need to call
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -9692,7 +9852,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14041,7 +12375,7 @@
+@@ -14041,7 +12375,7 @@ fi
# Check whether --with-dbus_service_dir was given.
@@ -9701,7 +9861,7 @@
withval=$with_dbus_service_dir; with_dbus_service_dir="$withval"
else
with_dbus_service_dir=$datadir/dbus-1/services
-@@ -14055,16 +12389,16 @@
+@@ -14055,16 +12389,16 @@ giomodulesdir=$libdir/gio/modules
@@ -9721,7 +9881,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -14072,35 +12406,31 @@
+@@ -14072,35 +12406,31 @@ $as_echo "$USE_NLS" >&6; }
case "$am__api_version" in
1.01234)
@@ -9763,7 +9923,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -14113,14 +12443,14 @@
+@@ -14113,14 +12443,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9781,7 +9941,7 @@
IFS=$as_save_IFS
;;
-@@ -14128,19 +12458,19 @@
+@@ -14128,19 +12458,19 @@ esac
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -9805,7 +9965,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -14153,14 +12483,14 @@
+@@ -14153,14 +12483,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9823,7 +9983,7 @@
IFS=$as_save_IFS
;;
-@@ -14168,19 +12498,19 @@
+@@ -14168,19 +12498,19 @@ esac
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -9847,7 +10007,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -14193,14 +12523,14 @@
+@@ -14193,14 +12523,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9865,7 +10025,7 @@
IFS=$as_save_IFS
;;
-@@ -14208,18 +12538,16 @@
+@@ -14208,18 +12538,16 @@ esac
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -9887,7 +10047,7 @@
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 $< $@'
-@@ -14341,9 +12669,9 @@
+@@ -14341,9 +12669,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -9899,7 +10059,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -14356,14 +12684,14 @@
+@@ -14356,14 +12684,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9917,7 +10077,7 @@
IFS=$as_save_IFS
;;
-@@ -14371,19 +12699,19 @@
+@@ -14371,19 +12699,19 @@ esac
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -9941,7 +10101,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -14396,14 +12724,14 @@
+@@ -14396,14 +12724,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9959,7 +10119,7 @@
IFS=$as_save_IFS
;;
-@@ -14411,19 +12739,19 @@
+@@ -14411,19 +12739,19 @@ esac
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -9983,7 +10143,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -14436,14 +12764,14 @@
+@@ -14436,14 +12764,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10001,7 +10161,7 @@
IFS=$as_save_IFS
;;
-@@ -14451,19 +12779,19 @@
+@@ -14451,19 +12779,19 @@ esac
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -10025,7 +10185,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -14476,14 +12804,14 @@
+@@ -14476,14 +12804,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10043,7 +10203,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -14492,33 +12820,29 @@
+@@ -14492,33 +12820,29 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -10083,7 +10243,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -14531,14 +12855,14 @@
+@@ -14531,14 +12855,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10101,7 +10261,7 @@
IFS=$as_save_IFS
;;
-@@ -14546,41 +12870,35 @@
+@@ -14546,41 +12870,35 @@ esac
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -10152,7 +10312,7 @@
fi
fi
-@@ -14590,11 +12908,7 @@
+@@ -14590,11 +12908,7 @@ fi
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -10165,7 +10325,7 @@
/* end confdefs.h. */
int
-@@ -14606,120 +12920,13 @@
+@@ -14606,120 +12920,13 @@ extern int _nl_msg_cat_cntr;
return 0;
}
_ACEOF
@@ -10290,7 +10450,7 @@
DATADIRNAME=share
else
DATADIRNAME=lib
-@@ -14731,10 +12938,8 @@
+@@ -14731,10 +12938,8 @@ fi
;;
esac
fi
@@ -10303,7 +10463,7 @@
fi
-@@ -14750,146 +12955,12 @@
+@@ -14750,146 +12955,12 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
@@ -10455,7 +10615,7 @@
_ACEOF
fi
-@@ -14897,16 +12968,12 @@
+@@ -14897,16 +12968,12 @@ fi
done
if test $ac_cv_header_locale_h = yes; then
@@ -10475,7 +10635,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -14917,46 +12984,19 @@
+@@ -14917,46 +12984,19 @@ return LC_MESSAGES
return 0;
}
_ACEOF
@@ -10528,7 +10688,7 @@
fi
fi
-@@ -14969,150 +13009,20 @@
+@@ -14969,150 +13009,20 @@ _ACEOF
XGETTEXT=:
INTLLIBS=
@@ -10684,7 +10844,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -15125,54 +13035,25 @@
+@@ -15125,54 +13035,25 @@ return !ngettext ("","", 1)
return 0;
}
_ACEOF
@@ -10747,7 +10907,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -15185,145 +13066,30 @@
+@@ -15185,145 +13066,30 @@ return !dgettext ("","")
return 0;
}
_ACEOF
@@ -10906,7 +11066,7 @@
fi
-@@ -15334,18 +13100,14 @@
+@@ -15334,18 +13100,14 @@ done
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -10928,7 +11088,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15363,55 +13125,26 @@
+@@ -15363,55 +13125,26 @@ return bindtextdomain ();
return 0;
}
_ACEOF
@@ -10993,7 +11153,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15429,55 +13162,26 @@
+@@ -15429,55 +13162,26 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -11058,7 +11218,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15495,43 +13199,18 @@
+@@ -15495,43 +13199,18 @@ return dgettext ();
return 0;
}
_ACEOF
@@ -11108,7 +11268,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -15541,22 +13220,18 @@
+@@ -15541,22 +13220,18 @@ fi
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -11136,7 +11296,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15574,55 +13249,26 @@
+@@ -15574,55 +13249,26 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -11201,7 +11361,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15640,43 +13286,18 @@
+@@ -15640,43 +13286,18 @@ return dcgettext ();
return 0;
}
_ACEOF
@@ -11251,7 +11411,7 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -15698,102 +13319,12 @@
+@@ -15698,102 +13319,12 @@ fi
glib_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
@@ -11359,7 +11519,7 @@
_ACEOF
fi
-@@ -15823,15 +13354,13 @@
+@@ -15823,15 +13354,13 @@ done
if test "$gt_cv_have_gettext" = "yes"; then
@@ -11378,7 +11538,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -15856,118 +13385,28 @@
+@@ -15856,118 +13385,28 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -11505,7 +11665,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -15982,14 +13421,14 @@
+@@ -15982,14 +13421,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -11525,7 +11685,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -15997,9 +13436,9 @@
+@@ -15997,9 +13436,9 @@ fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -11537,7 +11697,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -16012,14 +13451,14 @@
+@@ -16012,14 +13451,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11555,7 +11715,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -16028,19 +13467,19 @@
+@@ -16028,19 +13467,19 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -11579,7 +11739,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -16065,18 +13504,14 @@
+@@ -16065,18 +13504,14 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -11601,7 +11761,7 @@
/* end confdefs.h. */
int
-@@ -16088,121 +13523,14 @@
+@@ -16088,121 +13523,14 @@ extern int _nl_msg_cat_cntr;
return 0;
}
_ACEOF
@@ -11727,7 +11887,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -16217,10 +13545,8 @@
+@@ -16217,10 +13545,8 @@ fi
;;
esac
fi
@@ -11740,7 +11900,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -16234,9 +13560,7 @@
+@@ -16234,9 +13560,7 @@ fi
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -11751,7 +11911,7 @@
fi
-@@ -16244,7 +13568,7 @@
+@@ -16244,7 +13568,7 @@ _ACEOF
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -11760,7 +11920,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -16277,7 +13601,7 @@
+@@ -16277,7 +13601,7 @@ $as_echo "found xgettext program is not
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -11769,7 +11929,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -16302,7 +13626,7 @@
+@@ -16302,7 +13626,7 @@ $as_echo_n "checking for catalogs to be
fi
done
LINGUAS=$NEW_LINGUAS
@@ -11778,7 +11938,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -16345,9 +13669,9 @@
+@@ -16345,9 +13669,9 @@ $as_echo "$LINGUAS" >&6; }
# Extract the first word of "ssh", so it can be a program name with args.
set dummy ssh; ac_word=$2
@@ -11790,7 +11950,7 @@
$as_echo_n "(cached) " >&6
else
case $SSH_PROGRAM in
-@@ -16360,14 +13684,14 @@
+@@ -16360,14 +13684,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11808,7 +11968,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_SSH_PROGRAM" && ac_cv_path_SSH_PROGRAM=""ssh""
-@@ -16376,159 +13700,22 @@
+@@ -16376,159 +13700,22 @@ esac
fi
SSH_PROGRAM=$ac_cv_path_SSH_PROGRAM
if test -n "$SSH_PROGRAM"; then
@@ -11975,7 +12135,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -16539,105 +13726,12 @@
+@@ -16539,105 +13726,12 @@ done
# Check for PTY handling functions.
@@ -12086,7 +12246,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -16648,33 +13742,19 @@
+@@ -16648,33 +13742,19 @@ done
# Pull in the right libraries for various functions which might not be
# bundled into an exploded libc.
@@ -12130,7 +12290,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -16683,13 +13763,6 @@
+@@ -16683,13 +13763,6 @@ cat >>conftest.$ac_ext <<_ACEOF
extern "C"
#endif
char socketpair ();
@@ -12144,7 +12304,7 @@
int
main ()
{
-@@ -16698,134 +13771,36 @@
+@@ -16698,134 +13771,36 @@ return socketpair ();
return 0;
}
_ACEOF
@@ -12302,7 +12462,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16850,65 +13825,36 @@
+@@ -16850,65 +13825,36 @@ for ac_lib in '' util; do
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -12378,7 +12538,7 @@
enableval=$enable_http;
fi
-@@ -16918,51 +13864,55 @@
+@@ -16918,51 +13864,55 @@ HTTP_LIBS=
if test "x$enable_http" != "xno"; then
if test -n "$PKG_CONFIG" && \
@@ -12456,7 +12616,7 @@
fi
-@@ -16975,25 +13925,14 @@
+@@ -16975,25 +13925,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12485,7 +12645,7 @@
$HTTP_PKG_ERRORS
-@@ -17003,22 +13942,11 @@
+@@ -17003,22 +13942,11 @@ installed software in a non-standard pre
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.
@@ -12511,7 +12671,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -17027,19 +13955,16 @@
+@@ -17027,19 +13955,16 @@ and HTTP_LIBS to avoid the need to call
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12534,7 +12694,7 @@
fi
fi
-@@ -17065,7 +13990,7 @@
+@@ -17065,7 +13990,7 @@ fi
# Check whether --enable-avahi was given.
@@ -12543,7 +12703,7 @@
enableval=$enable_avahi;
fi
-@@ -17073,40 +13998,44 @@
+@@ -17073,40 +13998,44 @@ msg_avahi=no
if test "x$enable_avahi" != "xno"; then
pkg_failed=no
@@ -12607,7 +12767,7 @@
fi
-@@ -17119,14 +14048,14 @@
+@@ -17119,14 +14048,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12625,7 +12785,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_AVAHI_TRUE=
-@@ -17148,7 +14077,7 @@
+@@ -17148,7 +14077,7 @@ fi
else
AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS
AVAHI_LIBS=$pkg_cv_AVAHI_LIBS
@@ -12634,7 +12794,7 @@
$as_echo "yes" >&6; }
if true; then
HAVE_AVAHI_TRUE=
-@@ -17159,9 +14088,7 @@
+@@ -17159,9 +14088,7 @@ else
fi
@@ -12645,7 +12805,7 @@
msg_avahi=yes
fi
-@@ -17171,40 +14098,44 @@
+@@ -17171,40 +14098,44 @@ fi
pkg_failed=no
@@ -12709,7 +12869,7 @@
fi
-@@ -17217,14 +14148,14 @@
+@@ -17217,14 +14148,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12727,7 +12887,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_LIBXML_TRUE=
-@@ -17246,7 +14177,7 @@
+@@ -17246,7 +14177,7 @@ fi
else
LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
@@ -12736,7 +12896,7 @@
$as_echo "yes" >&6; }
if true; then
HAVE_LIBXML_TRUE=
-@@ -17257,9 +14188,7 @@
+@@ -17257,9 +14188,7 @@ else
fi
@@ -12747,7 +12907,7 @@
msg_libxml=yes
fi
-@@ -17267,7 +14196,7 @@
+@@ -17267,7 +14196,7 @@ fi
# Check whether --enable-udev was given.
@@ -12756,7 +12916,7 @@
enableval=$enable_udev;
fi
-@@ -17277,51 +14206,55 @@
+@@ -17277,51 +14206,55 @@ UDEV_LIBS=
if test "x$enable_udev" != "xno"; then
if test -n "$PKG_CONFIG" && \
@@ -12834,7 +12994,7 @@
fi
-@@ -17334,25 +14267,14 @@
+@@ -17334,25 +14267,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12863,7 +13023,7 @@
$UDEV_PKG_ERRORS
-@@ -17362,12 +14284,11 @@
+@@ -17362,12 +14284,11 @@ installed software in a non-standard pre
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.
@@ -12879,7 +13039,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -17376,29 +14297,16 @@
+@@ -17376,29 +14297,16 @@ and UDEV_LIBS to avoid the need to call
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12912,7 +13072,7 @@
fi
fi
-@@ -17407,7 +14315,7 @@
+@@ -17407,7 +14315,7 @@ fi
# Check whether --enable-fuse was given.
@@ -12921,7 +13081,7 @@
enableval=$enable_fuse;
fi
-@@ -17417,51 +14325,55 @@
+@@ -17417,51 +14325,55 @@ FUSE_CFLAGS=
if test "x$enable_fuse" != "xno"; then
if test -n "$PKG_CONFIG" && \
@@ -12999,7 +13159,7 @@
fi
-@@ -17474,25 +14386,14 @@
+@@ -17474,25 +14386,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13028,7 +13188,7 @@
$FUSE_PKG_ERRORS
-@@ -17502,22 +14403,11 @@
+@@ -17502,22 +14403,11 @@ installed software in a non-standard pre
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.
@@ -13054,7 +13214,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -17526,19 +14416,16 @@
+@@ -17526,19 +14416,16 @@ and FUSE_LIBS to avoid the need to call
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13077,7 +13237,7 @@
fi
fi
-@@ -17556,7 +14443,7 @@
+@@ -17556,7 +14443,7 @@ fi
# Check whether --enable-gconf was given.
@@ -13086,7 +13246,7 @@
enableval=$enable_gconf;
fi
-@@ -17566,51 +14453,55 @@
+@@ -17566,51 +14453,55 @@ GCONF_CFLAGS=
if test "x$enable_gconf" != "xno"; then
if test -n "$PKG_CONFIG" && \
@@ -13164,7 +13324,7 @@
fi
-@@ -17623,25 +14514,14 @@
+@@ -17623,25 +14514,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13193,7 +13353,7 @@
$GCONF_PKG_ERRORS
-@@ -17651,22 +14531,11 @@
+@@ -17651,22 +14531,11 @@ installed software in a non-standard pre
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.
@@ -13219,7 +13379,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -17675,19 +14544,16 @@
+@@ -17675,19 +14544,16 @@ and GCONF_LIBS to avoid the need to call
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13242,7 +13402,7 @@
fi
fi
-@@ -17706,7 +14572,7 @@
+@@ -17706,7 +14572,7 @@ fi
# Check whether --enable-gdu was given.
@@ -13251,7 +13411,7 @@
enableval=$enable_gdu;
fi
-@@ -17717,51 +14583,55 @@
+@@ -17717,51 +14583,55 @@ GDU_REQUIRED=2.28.0
if test "x$enable_gdu" != "xno"; then
if test -n "$PKG_CONFIG" && \
@@ -13329,7 +13489,7 @@
fi
-@@ -17774,25 +14644,14 @@
+@@ -17774,25 +14644,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13358,7 +13518,7 @@
$GDU_PKG_ERRORS
-@@ -17802,22 +14661,11 @@
+@@ -17802,22 +14661,11 @@ installed software in a non-standard pre
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.
@@ -13384,7 +13544,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -17826,19 +14674,16 @@
+@@ -17826,19 +14674,16 @@ and GDU_LIBS to avoid the need to call p
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13407,7 +13567,7 @@
fi
fi
-@@ -17856,7 +14701,7 @@
+@@ -17856,7 +14701,7 @@ fi
# Check whether --enable-hal was given.
@@ -13416,7 +13576,7 @@
enableval=$enable_hal;
fi
-@@ -17868,51 +14713,55 @@
+@@ -17868,51 +14713,55 @@ HAL_REQUIRED=0.5.10
if test "x$enable_hal" != "xno"; then
if test -n "$PKG_CONFIG" && \
@@ -13494,7 +13654,7 @@
fi
-@@ -17925,25 +14774,14 @@
+@@ -17925,25 +14774,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13523,7 +13683,7 @@
$HAL_PKG_ERRORS
-@@ -17953,12 +14791,11 @@
+@@ -17953,12 +14791,11 @@ installed software in a non-standard pre
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.
@@ -13539,7 +13699,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -17967,44 +14804,27 @@
+@@ -17967,44 +14804,27 @@ and HAL_LIBS to avoid the need to call p
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13590,7 +13750,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18022,51 +14842,24 @@
+@@ -18022,51 +14842,24 @@ return libhal_get_all_devices_with_prope
return 0;
}
_ACEOF
@@ -13649,7 +13809,7 @@
fi
LIBS="$save_libs"
-@@ -18086,7 +14879,7 @@
+@@ -18086,7 +14879,7 @@ fi
# Check whether --enable-gudev was given.
@@ -13658,7 +13818,7 @@
enableval=$enable_gudev;
fi
-@@ -18095,51 +14888,55 @@
+@@ -18095,51 +14888,55 @@ GUDEV_REQUIRED=001
if test "x$enable_gudev" != "xno"; then
if test -n "$PKG_CONFIG" && \
@@ -13736,7 +13896,7 @@
fi
-@@ -18152,25 +14949,14 @@
+@@ -18152,25 +14949,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13765,7 +13925,7 @@
$GUDEV_PKG_ERRORS
-@@ -18180,22 +14966,11 @@
+@@ -18180,22 +14966,11 @@ installed software in a non-standard pre
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.
@@ -13791,7 +13951,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -18204,19 +14979,16 @@
+@@ -18204,19 +14979,16 @@ and GUDEV_LIBS to avoid the need to call
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13814,7 +13974,7 @@
fi
fi
-@@ -18232,7 +15004,7 @@
+@@ -18232,7 +15004,7 @@ fi
# Check whether --enable-cdda was given.
@@ -13823,7 +13983,7 @@
enableval=$enable_cdda;
fi
-@@ -18242,51 +15014,55 @@
+@@ -18242,51 +15014,55 @@ CDDA_CFLAGS=
if test "x$enable_cdda" != "xno" -a \( "x$msg_hal" = "xyes" -o "x$msg_gudev" = "xyes" \); then
if test -n "$PKG_CONFIG" && \
@@ -13901,7 +14061,7 @@
fi
-@@ -18299,14 +15075,14 @@
+@@ -18299,14 +15075,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13919,7 +14079,7 @@
$CDDA_PKG_ERRORS
-@@ -18316,33 +15092,11 @@
+@@ -18316,33 +15092,11 @@ installed software in a non-standard pre
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.
@@ -13956,7 +14116,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -18351,19 +15105,16 @@
+@@ -18351,19 +15105,16 @@ and CDDA_LIBS to avoid the need to call
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13979,7 +14139,7 @@
fi
fi
-@@ -18381,7 +15132,7 @@
+@@ -18381,7 +15132,7 @@ fi
# Check whether --enable-obexftp was given.
@@ -13988,7 +14148,7 @@
enableval=$enable_obexftp;
fi
-@@ -18391,26 +15142,22 @@
+@@ -18391,26 +15142,22 @@ OBEXFTP_CFLAGS=
if test "x$enable_obexftp" != "xno"; then
if test -n "$PKG_CONFIG" && \
@@ -14021,7 +14181,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18428,183 +15175,24 @@
+@@ -18428,183 +15175,24 @@ return XML_ParserCreate_MM ();
return 0;
}
_ACEOF
@@ -14216,7 +14376,7 @@
_ACEOF
have_expat=true
else
-@@ -18621,40 +15209,44 @@
+@@ -18621,40 +15209,44 @@ fi
if test "x$msg_obexftp" = "xyes" -a "x$have_expat" = "xtrue"; then
pkg_failed=no
@@ -14280,7 +14440,7 @@
fi
-@@ -18667,25 +15259,14 @@
+@@ -18667,25 +15259,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14309,7 +14469,7 @@
$OBEXFTP_PKG_ERRORS
-@@ -18695,22 +15276,11 @@
+@@ -18695,22 +15276,11 @@ installed software in a non-standard pre
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.
@@ -14335,7 +14495,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -18719,12 +15289,11 @@
+@@ -18719,12 +15289,11 @@ and OBEXFTP_LIBS to avoid the need to ca
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -14350,7 +14510,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -18733,9 +15302,7 @@
+@@ -18733,9 +15302,7 @@ fi
msg_obexftp=yes
@@ -14361,7 +14521,7 @@
XML_CFLAGS=""
XML_LIBS="-lexpat"
-@@ -18757,7 +15324,7 @@
+@@ -18757,7 +15324,7 @@ fi
# Check whether --enable-gphoto2 was given.
@@ -14370,7 +14530,7 @@
enableval=$enable_gphoto2;
fi
-@@ -18767,11 +15334,11 @@
+@@ -18767,11 +15334,11 @@ GPHOTO2_CFLAGS=
if test "x$enable_gphoto2" != "xno" -a \( "x$msg_hal" = "xyes" -o "x$msg_gudev" = "xyes" \); then
if test -n "$PKG_CONFIG" && \
@@ -14385,7 +14545,7 @@
msg_gphoto2=yes
fi
-@@ -18789,40 +15356,44 @@
+@@ -18789,40 +15356,44 @@ fi
if test "x$use_gphoto2" = "xyes"; then
pkg_failed=no
@@ -14449,7 +14609,7 @@
fi
-@@ -18835,25 +15406,14 @@
+@@ -18835,25 +15406,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14478,7 +14638,7 @@
$GPHOTO2_PKG_ERRORS
-@@ -18863,22 +15423,11 @@
+@@ -18863,22 +15423,11 @@ installed software in a non-standard pre
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.
@@ -14504,7 +14664,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -18887,22 +15436,19 @@
+@@ -18887,22 +15436,19 @@ and GPHOTO2_LIBS to avoid the need to ca
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -14531,7 +14691,7 @@
$as_echo "$as_me: WARNING: Not building with gphoto2 support. Need OS tweaks in hal volume monitor." >&2;}
msg_gphoto2=no
fi
-@@ -18922,7 +15468,7 @@
+@@ -18922,7 +15468,7 @@ fi
# Check whether --enable-keyring was given.
@@ -14540,7 +14700,7 @@
enableval=$enable_keyring;
fi
-@@ -18932,51 +15478,55 @@
+@@ -18932,51 +15478,55 @@ KEYRING_CFLAGS=
if test "x$enable_keyring" != "xno"; then
if test -n "$PKG_CONFIG" && \
@@ -14618,7 +14778,7 @@
fi
-@@ -18989,25 +15539,14 @@
+@@ -18989,25 +15539,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14647,7 +14807,7 @@
$KEYRING_PKG_ERRORS
-@@ -19017,22 +15556,11 @@
+@@ -19017,22 +15556,11 @@ installed software in a non-standard pre
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.
@@ -14673,7 +14833,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -19041,19 +15569,16 @@
+@@ -19041,19 +15569,16 @@ and KEYRING_LIBS to avoid the need to ca
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -14696,7 +14856,7 @@
fi
fi
-@@ -19072,7 +15597,7 @@
+@@ -19072,7 +15597,7 @@ fi
# Check whether --enable-samba was given.
@@ -14705,7 +14865,7 @@
enableval=$enable_samba;
fi
-@@ -19080,7 +15605,7 @@
+@@ -19080,7 +15605,7 @@ msg_samba="no"
if test "x$enable_samba" != "xno"; then
# Check whether --with-samba-includes was given.
@@ -14714,7 +14874,7 @@
withval=$with_samba_includes; with_samba_includes="$withval"
else
with_samba_includes="/usr/include"
-@@ -19091,135 +15616,9 @@
+@@ -19091,135 +15616,9 @@ fi
CPPFLAGS_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$with_samba_includes"
@@ -14853,7 +15013,7 @@
fi
-@@ -19234,213 +15633,19 @@
+@@ -19234,213 +15633,19 @@ fi
fi
CPPFLAGS="$CPPFLAGS -I$with_samba_includes"
@@ -15075,7 +15235,7 @@
fi
-@@ -19451,7 +15656,7 @@
+@@ -19451,7 +15656,7 @@ fi
fi
# Check whether --with-samba-libs was given.
@@ -15084,7 +15244,7 @@
withval=$with_samba_libs; with_samba_libs="$withval"
else
with_samba_libs="/usr/lib"
-@@ -19461,18 +15666,14 @@
+@@ -19461,18 +15666,14 @@ fi
LDFLAGS_save="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$with_samba_libs"
@@ -15106,7 +15266,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19490,43 +15691,18 @@
+@@ -19490,43 +15691,18 @@ return smbc_option_get ();
return 0;
}
_ACEOF
@@ -15156,7 +15316,7 @@
samba_libs="yes"
else
samba_libs="no"
-@@ -19535,9 +15711,7 @@
+@@ -19535,9 +15711,7 @@ fi
LDFLAGS="$LDFLAGS_save"
if test "x${samba_libs}" != "xno"; then
@@ -15167,7 +15327,7 @@
msg_samba="yes"
if test x$with_samba_libs != x/usr/lib; then
-@@ -19546,18 +15720,14 @@
+@@ -19546,18 +15720,14 @@ _ACEOF
SAMBA_LIBS="-lsmbclient"
fi
else
@@ -15189,7 +15349,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19575,43 +15745,18 @@
+@@ -19575,43 +15745,18 @@ return smbc_new_context ();
return 0;
}
_ACEOF
@@ -15239,7 +15399,7 @@
samba_old_libs="yes"
else
samba_old_libs="no"
-@@ -19624,9 +15769,9 @@
+@@ -19624,9 +15769,9 @@ fi
SAMBA_LIBS=""
fi
fi
@@ -15251,7 +15411,7 @@
$as_echo "$msg_samba" >&6; }
fi
if test "$msg_samba" = "yes"; then
-@@ -19643,7 +15788,7 @@
+@@ -19643,7 +15788,7 @@ fi
# Check whether --enable-archive was given.
@@ -15260,7 +15420,7 @@
enableval=$enable_archive;
fi
-@@ -19651,7 +15796,7 @@
+@@ -19651,7 +15796,7 @@ msg_archive="no"
if test "x$enable_archive" != "xno"; then
# Check whether --with-archive-includes was given.
@@ -15269,7 +15429,7 @@
withval=$with_archive_includes; with_archive_includes="$withval"
else
with_archive_includes="/usr/include"
-@@ -19662,175 +15807,45 @@
+@@ -19662,175 +15807,45 @@ fi
CPPFLAGS_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$with_archive_includes"
@@ -15468,7 +15628,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19848,43 +15863,18 @@
+@@ -19848,43 +15863,18 @@ return archive_entry_filetype ();
return 0;
}
_ACEOF
@@ -15518,7 +15678,7 @@
archive_libs="yes"
else
archive_libs="no"
-@@ -19893,9 +15883,7 @@
+@@ -19893,9 +15883,7 @@ fi
LDFLAGS="$LDFLAGS_save"
if test "x${archive_libs}" != "xno"; then
@@ -15529,7 +15689,7 @@
msg_archive="yes"
if test x$with_archive_libs != x/usr/lib; then
-@@ -19904,18 +15892,14 @@
+@@ -19904,18 +15892,14 @@ _ACEOF
ARCHIVE_LIBS="-larchive"
fi
else
@@ -15551,7 +15711,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19933,43 +15917,18 @@
+@@ -19933,43 +15917,18 @@ return archive_entry_filetype ();
return 0;
}
_ACEOF
@@ -15601,7 +15761,7 @@
archive_old_libs="yes"
else
archive_old_libs="no"
-@@ -19982,9 +15941,9 @@
+@@ -19982,9 +15941,9 @@ fi
ARCHIVE_LIBS=""
fi
fi
@@ -15613,7 +15773,7 @@
$as_echo "$msg_archive" >&6; }
fi
if test "$msg_archive" = "yes"; then
-@@ -19999,7 +15958,7 @@
+@@ -19999,7 +15958,7 @@ fi
# Check whether --enable-bash-completion was given.
@@ -15622,7 +15782,7 @@
enableval=$enable_bash_completion; msg_bash_completion=$enableval
else
msg_bash_completion=yes
-@@ -20019,7 +15978,7 @@
+@@ -20019,7 +15978,7 @@ fi
# Check whether --with-bash-completion-dir was given.
@@ -15631,7 +15791,7 @@
withval=$with_bash_completion_dir; with_bashcomp_dir=$withval
else
with_bashcomp_dir=$sysconfdir/profile.d
-@@ -20030,24 +15989,20 @@
+@@ -20030,24 +15989,20 @@ BASHCOMP_DIR=$with_bashcomp_dir
@@ -15660,7 +15820,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -20060,14 +16015,14 @@
+@@ -20060,14 +16015,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15678,7 +15838,7 @@
IFS=$as_save_IFS
;;
-@@ -20075,158 +16030,22 @@
+@@ -20075,158 +16030,22 @@ esac
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -15844,7 +16004,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -20235,101 +16054,12 @@
+@@ -20235,101 +16054,12 @@ fi
done
@@ -15951,7 +16111,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -20337,70 +16067,7 @@
+@@ -20337,70 +16067,7 @@ _ACEOF
fi
done
@@ -16023,7 +16183,7 @@
#include <sys/stat.h>
#include <unistd.h>
#ifdef HAVE_SYS_STATFS_H
-@@ -20412,51 +16079,8 @@
+@@ -20412,51 +16079,8 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef HAVE_SYS_MOUNT_H
#include <sys/mount.h>
#endif
@@ -16077,7 +16237,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_STATFS_F_FSTYPENAME 1
-@@ -20464,70 +16088,7 @@
+@@ -20464,70 +16088,7 @@ _ACEOF
fi
@@ -16149,7 +16309,7 @@
#include <sys/stat.h>
#include <unistd.h>
#ifdef HAVE_SYS_STATFS_H
-@@ -20539,51 +16100,8 @@
+@@ -20539,51 +16100,8 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef HAVE_SYS_MOUNT_H
#include <sys/mount.h>
#endif
@@ -16203,7 +16363,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_STATFS_F_BAVAIL 1
-@@ -20592,106 +16110,11 @@
+@@ -20592,106 +16110,11 @@ _ACEOF
fi
@@ -16315,7 +16475,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_STATVFS_F_BASETYPE 1
_ACEOF
-@@ -20701,13 +16124,9 @@
+@@ -20701,13 +16124,9 @@ fi
if test "$ac_cv_func_statfs" = yes ; then
@@ -16331,7 +16491,7 @@
/* end confdefs.h. */
#include <unistd.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -20731,42 +16150,16 @@
+@@ -20731,42 +16150,16 @@ struct statfs st;
return 0;
}
_ACEOF
@@ -16378,7 +16538,7 @@
/* end confdefs.h. */
#include <unistd.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -20790,53 +16183,27 @@
+@@ -20790,53 +16183,27 @@ struct statfs st;
return 0;
}
_ACEOF
@@ -16438,7 +16598,7 @@
enableval=$enable_more_warnings; set_more_warnings="$enableval"
else
-@@ -20849,10 +16216,10 @@
+@@ -20849,10 +16216,10 @@ fi
fi
@@ -16451,7 +16611,7 @@
$as_echo "yes" >&6; }
CFLAGS="\
-Wall \
-@@ -20864,13 +16231,9 @@
+@@ -20864,13 +16231,9 @@ $as_echo "yes" >&6; }
for option in -Wno-strict-aliasing -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -16467,7 +16627,7 @@
/* end confdefs.h. */
int
-@@ -20881,44 +16244,23 @@
+@@ -20881,44 +16244,23 @@ main ()
return 0;
}
_ACEOF
@@ -16516,7 +16676,7 @@
$as_echo "no" >&6; }
fi
-@@ -20951,13 +16293,13 @@
+@@ -20951,13 +16293,13 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -16532,7 +16692,7 @@
esac ;;
esac
done
-@@ -20965,8 +16307,8 @@
+@@ -20965,8 +16307,8 @@ $as_echo "$as_me: WARNING: cache variabl
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -16543,7 +16703,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -20989,11 +16331,11 @@
+@@ -20989,11 +16331,11 @@ $as_echo "$as_me: WARNING: cache variabl
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -16557,7 +16717,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -21013,8 +16355,8 @@
+@@ -21013,8 +16355,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i"
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
@@ -16568,7 +16728,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -21029,193 +16371,123 @@
+@@ -21029,193 +16371,123 @@ else
am__EXEEXT_FALSE=
fi
@@ -16819,7 +16979,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -21225,17 +16497,18 @@
+@@ -21225,17 +16497,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -16845,7 +17005,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -21243,23 +16516,15 @@
+@@ -21243,23 +16516,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -16874,7 +17034,7 @@
as_nl='
'
export as_nl
-@@ -21267,7 +16532,13 @@
+@@ -21267,7 +16532,13 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -16889,7 +17049,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -21278,7 +16549,7 @@
+@@ -21278,7 +16549,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -16898,7 +17058,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -21301,13 +16572,6 @@
+@@ -21301,13 +16572,6 @@ if test "${PATH_SEPARATOR+set}" != set;
}
fi
@@ -16912,7 +17072,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -21317,15 +16581,15 @@
+@@ -21317,15 +16581,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -16931,7 +17091,7 @@
IFS=$as_save_IFS
;;
-@@ -21337,12 +16601,16 @@
+@@ -21337,12 +16601,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -16952,7 +17112,7 @@
done
PS1='$ '
PS2='> '
-@@ -21354,7 +16622,89 @@
+@@ -21354,7 +16622,89 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
@@ -17043,7 +17203,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -21368,8 +16718,12 @@
+@@ -21368,8 +16718,12 @@ else
as_basename=false
fi
@@ -17057,7 +17217,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -21389,76 +16743,25 @@
+@@ -21389,76 +16743,25 @@ $as_echo X/"$0" |
}
s/.*/./; q'`
@@ -17145,7 +17305,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -21487,8 +16790,56 @@
+@@ -21487,8 +16790,56 @@ fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -17203,7 +17363,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -21507,10 +16858,10 @@
+@@ -21507,10 +16858,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
@@ -17216,7 +17376,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -21525,13 +16876,19 @@
+@@ -21525,13 +16876,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
exec 6>&1
@@ -17238,7 +17398,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -21563,10 +16920,11 @@
+@@ -21563,10 +16920,11 @@ _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -17253,7 +17413,7 @@
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
-@@ -21588,16 +16946,16 @@
+@@ -21588,16 +16946,16 @@ $config_headers
Configuration commands:
$config_commands
@@ -17273,7 +17433,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -21640,20 +16998,19 @@
+@@ -21640,20 +16998,19 @@ do
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -17298,7 +17458,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -21661,11 +17018,10 @@
+@@ -21661,11 +17018,10 @@ Try \`$0 --help' for more information."
ac_cs_silent=: ;;
# This is an error.
@@ -17313,7 +17473,7 @@
ac_need_defaults=false ;;
esac
-@@ -21993,9 +17349,7 @@
+@@ -21993,9 +17349,7 @@ do
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -17324,7 +17484,7 @@
esac
done
-@@ -22022,7 +17376,7 @@
+@@ -22022,7 +17376,7 @@ $debug ||
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -17333,7 +17493,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -22033,11 +17387,7 @@
+@@ -22033,11 +17387,7 @@ $debug ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -17346,7 +17506,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -22045,10 +17395,16 @@
+@@ -22045,10 +17395,16 @@ $debug ||
if test -n "$CONFIG_FILES"; then
@@ -17365,7 +17525,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -22062,24 +17418,18 @@
+@@ -22062,24 +17418,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -17393,7 +17553,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -22168,9 +17518,7 @@
+@@ -22168,9 +17518,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -17404,7 +17564,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -22211,9 +17559,7 @@
+@@ -22211,9 +17559,7 @@ for ac_last_try in false false :; do
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -17415,7 +17575,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -22298,9 +17644,7 @@
+@@ -22298,9 +17644,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -17426,7 +17586,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -22313,9 +17657,7 @@
+@@ -22313,9 +17657,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -17437,7 +17597,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -22343,12 +17685,10 @@
+@@ -22343,12 +17685,10 @@ $as_echo "$as_me: error: invalid tag $ac
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -17452,7 +17612,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -22359,7 +17699,7 @@
+@@ -22359,7 +17699,7 @@ $as_echo "$as_me: error: cannot find inp
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -17461,7 +17621,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -22372,9 +17712,7 @@
+@@ -22372,9 +17712,7 @@ $as_echo "$as_me: creating $ac_file" >&6
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -17472,7 +17632,7 @@
esac
;;
esac
-@@ -22402,47 +17740,7 @@
+@@ -22402,47 +17740,7 @@ $as_echo X"$ac_file" |
q
}
s/.*/./; q'`
@@ -17521,7 +17681,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -22499,7 +17797,6 @@
+@@ -22499,7 +17797,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -17529,7 +17689,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -22509,12 +17806,11 @@
+@@ -22509,12 +17806,11 @@ ac_sed_dataroot='
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -17544,7 +17704,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -22524,7 +17820,7 @@
+@@ -22524,7 +17820,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -17553,7 +17713,7 @@
esac
_ACEOF
-@@ -22553,14 +17849,12 @@
+@@ -22553,14 +17849,12 @@ 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 \
@@ -17570,7 +17730,7 @@
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;}
-@@ -22570,9 +17864,7 @@
+@@ -22570,9 +17864,7 @@ which seems to be undefined. Please mak
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -17581,7 +17741,7 @@
;;
:H)
#
-@@ -22583,25 +17875,19 @@
+@@ -22583,25 +17875,19 @@ $as_echo "$as_me: error: could not creat
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -17611,7 +17771,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -22639,7 +17925,7 @@
+@@ -22639,7 +17925,7 @@ $as_echo X"$_am_arg" |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -17620,7 +17780,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -22734,47 +18020,7 @@
+@@ -22734,47 +18020,7 @@ $as_echo X"$file" |
q
}
s/.*/./; q'`
@@ -17669,7 +17829,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -23421,9 +18667,7 @@
+@@ -23421,9 +18667,7 @@ _LT_EOF
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -17680,7 +17840,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -23446,15 +18690,12 @@
+@@ -23446,15 +18690,12 @@ $as_echo "$as_me: error: po/Makefile.in.
done # for ac_tag
@@ -17698,7 +17858,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -23475,10 +18716,10 @@
+@@ -23475,10 +18716,10 @@ 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.
@@ -17711,7 +17871,7 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-@@ -23506,17 +18747,17 @@
+@@ -23506,17 +18747,17 @@ 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" && \
@@ -17735,9 +17895,149 @@
fi
Index: gvfs-1.4.1/daemon/Makefile.in
===================================================================
---- gvfs-1.4.1.orig/daemon/Makefile.in 2009-10-20 11:03:30.000000000 +0200
-+++ gvfs-1.4.1/daemon/Makefile.in 2009-10-20 10:56:17.000000000 +0200
-@@ -417,6 +417,7 @@
+--- gvfs-1.4.1.orig/daemon/Makefile.in 2009-11-16 20:19:09.490112204 +0100
++++ gvfs-1.4.1/daemon/Makefile.in 2009-11-16 20:22:26.974110173 +0100
+@@ -79,27 +79,57 @@ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libdaemon_la_LIBADD =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++ *) f=$$p;; \
++ esac;
++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
++am__install_max = 40
++am__nobase_strip_setup = \
++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
++am__nobase_strip = \
++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
++am__nobase_list = $(am__nobase_strip_setup); \
++ for p in $$list; do echo "$$p $$p"; done | \
++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
++ if (++n[$$2] == $(am__install_max)) \
++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
++ END { for (dir in files) print dir, files[dir] }'
++am__base_list = \
++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__installdirs = "$(DESTDIR)$(privlibdir)" "$(DESTDIR)$(libexecdir)" \
++ "$(DESTDIR)$(mountdir)" "$(DESTDIR)$(servicedir)"
++LTLIBRARIES = $(privlib_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++libgvfsdaemon_la_DEPENDENCIES = \
++ $(top_builddir)/common/libgvfscommon.la $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am__objects_1 =
+-am_libdaemon_la_OBJECTS = gvfsdaemon.lo gvfsbackend.lo gvfschannel.lo \
+- gvfsreadchannel.lo gvfswritechannel.lo gvfsmonitor.lo \
+- gvfsdaemonutils.lo gvfsjob.lo gvfsjobsource.lo gvfsjobdbus.lo \
+- gvfsjobmount.lo gvfsjobunmount.lo gvfsjobmountmountable.lo \
+- gvfsjobunmountmountable.lo gvfsjobstartmountable.lo \
+- gvfsjobstopmountable.lo gvfsjobpollmountable.lo \
+- gvfsjobopenforread.lo gvfsjobopeniconforread.lo gvfsjobread.lo \
+- gvfsjobseekread.lo gvfsjobcloseread.lo gvfsjobopenforwrite.lo \
+- gvfsjobwrite.lo gvfsjobseekwrite.lo gvfsjobclosewrite.lo \
+- gvfsjobqueryinfo.lo gvfsjobqueryinforead.lo \
+- gvfsjobqueryinfowrite.lo gvfsjobqueryfsinfo.lo \
+- gvfsjobenumerate.lo gvfsjobsetdisplayname.lo gvfsjobtrash.lo \
+- gvfsjobdelete.lo gvfsjobcopy.lo gvfsjobmove.lo gvfsjobpush.lo \
+- gvfsjobpull.lo gvfsjobmakedirectory.lo gvfsjobmakesymlink.lo \
++am_libgvfsdaemon_la_OBJECTS = gvfsdaemon.lo gvfsbackend.lo \
++ gvfschannel.lo gvfsreadchannel.lo gvfswritechannel.lo \
++ gvfsmonitor.lo gvfsdaemonutils.lo gvfsjob.lo gvfsjobsource.lo \
++ gvfsjobdbus.lo gvfsjobmount.lo gvfsjobunmount.lo \
++ gvfsjobmountmountable.lo gvfsjobunmountmountable.lo \
++ gvfsjobstartmountable.lo gvfsjobstopmountable.lo \
++ gvfsjobpollmountable.lo gvfsjobopenforread.lo \
++ gvfsjobopeniconforread.lo gvfsjobread.lo gvfsjobseekread.lo \
++ gvfsjobcloseread.lo gvfsjobopenforwrite.lo gvfsjobwrite.lo \
++ gvfsjobseekwrite.lo gvfsjobclosewrite.lo gvfsjobqueryinfo.lo \
++ gvfsjobqueryinforead.lo gvfsjobqueryinfowrite.lo \
++ gvfsjobqueryfsinfo.lo gvfsjobenumerate.lo \
++ gvfsjobsetdisplayname.lo gvfsjobtrash.lo gvfsjobdelete.lo \
++ gvfsjobcopy.lo gvfsjobmove.lo gvfsjobpush.lo gvfsjobpull.lo \
++ gvfsjobmakedirectory.lo gvfsjobmakesymlink.lo \
+ gvfsjobsetattribute.lo gvfsjobqueryattributes.lo \
+ gvfsjobcreatemonitor.lo dbus-gmain.lo gvfskeyring.lo \
+ $(am__objects_1)
+-libdaemon_la_OBJECTS = $(am_libdaemon_la_OBJECTS)
++libgvfsdaemon_la_OBJECTS = $(am_libgvfsdaemon_la_OBJECTS)
++libgvfsdaemon_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(libgvfsdaemon_la_LDFLAGS) $(LDFLAGS) -o $@
+ @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)
+@@ -109,16 +139,13 @@ libdaemon_la_OBJECTS = $(am_libdaemon_la
+ @USE_OBEXFTP_TRUE at am__EXEEXT_6 = gvfsd-obexftp$(EXEEXT)
+ @HAVE_AVAHI_TRUE at am__EXEEXT_7 = gvfsd-dnssd$(EXEEXT)
+ @HAVE_ARCHIVE_TRUE at am__EXEEXT_8 = gvfsd-archive$(EXEEXT)
+-am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(mountdir)" \
+- "$(DESTDIR)$(servicedir)"
+ am__EXEEXT_9 =
+ PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS)
+ am_gvfsd_OBJECTS = mount.$(OBJEXT) main.$(OBJEXT)
+ gvfsd_OBJECTS = $(am_gvfsd_OBJECTS)
+-am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = libdaemon.la \
++am__DEPENDENCIES_2 = libgvfsdaemon.la \
+ $(top_builddir)/common/libgvfscommon.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++ $(am__DEPENDENCIES_1)
+ gvfsd_DEPENDENCIES = $(am__DEPENDENCIES_2)
+ am_gvfsd_archive_OBJECTS = gvfsd_archive-gvfsbackendarchive.$(OBJEXT) \
+ gvfsd_archive-daemon-main.$(OBJEXT) \
+@@ -249,7 +276,7 @@ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+-SOURCES = $(libdaemon_la_SOURCES) $(gvfsd_SOURCES) \
++SOURCES = $(libgvfsdaemon_la_SOURCES) $(gvfsd_SOURCES) \
+ $(gvfsd_archive_SOURCES) $(gvfsd_burn_SOURCES) \
+ $(gvfsd_cdda_SOURCES) $(gvfsd_computer_SOURCES) \
+ $(gvfsd_dav_SOURCES) $(gvfsd_dnssd_SOURCES) \
+@@ -259,7 +286,7 @@ SOURCES = $(libdaemon_la_SOURCES) $(gvfs
+ $(gvfsd_sftp_SOURCES) $(gvfsd_smb_SOURCES) \
+ $(gvfsd_smb_browse_SOURCES) $(gvfsd_test_SOURCES) \
+ $(gvfsd_trash_SOURCES)
+-DIST_SOURCES = $(libdaemon_la_SOURCES) $(gvfsd_SOURCES) \
++DIST_SOURCES = $(libgvfsdaemon_la_SOURCES) $(gvfsd_SOURCES) \
+ $(gvfsd_archive_SOURCES) $(gvfsd_burn_SOURCES) \
+ $(gvfsd_cdda_SOURCES) $(gvfsd_computer_SOURCES) \
+ $(gvfsd_dav_SOURCES) $(gvfsd_dnssd_SOURCES) \
+@@ -276,27 +303,6 @@ RECURSIVE_TARGETS = all-recursive check-
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+-am__install_max = 40
+-am__nobase_strip_setup = \
+- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+-am__nobase_strip = \
+- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+-am__nobase_list = $(am__nobase_strip_setup); \
+- for p in $$list; do echo "$$p $$p"; done | \
+- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+- if (++n[$$2] == $(am__install_max)) \
+- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+- END { for (dir in files) print dir, files[dir] }'
+-am__base_list = \
+- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+ DATA = $(mount_DATA) $(service_DATA)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+@@ -417,6 +423,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17745,7 +18045,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -436,6 +437,7 @@
+@@ -436,6 +443,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17753,16 +18053,47 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -527,7 +529,7 @@
+@@ -527,13 +535,14 @@ INCLUDES = \
-DLIBEXEC_DIR=\"$(libexecdir)/\" \
-DMOUNTABLE_DIR=\"$(mountdir)/\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
- -DG_DISABLE_DEPRECATED
+ $(NULL)
- noinst_LTLIBRARIES = libdaemon.la
+-noinst_LTLIBRARIES = libdaemon.la
++privlibdir = $(libdir)/gvfs
++privlib_LTLIBRARIES = libgvfsdaemon.la
libraries = \
-@@ -829,7 +831,7 @@
+- libdaemon.la \
++ libgvfsdaemon.la \
+ $(top_builddir)/common/libgvfscommon.la \
+- $(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
++ $(GLIB_LIBS) $(DBUS_LIBS)
+
+ servicedir = $(DBUS_SERVICE_DIR)
+ service_in_files = gvfs-daemon.service.in
+@@ -551,7 +560,7 @@ mount_DATA = sftp.mount trash.mount comp
+ @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)
+-libdaemon_la_SOURCES = \
++libgvfsdaemon_la_SOURCES = \
+ gvfsdaemon.c gvfsdaemon.h \
+ gvfsbackend.c gvfsbackend.h \
+ gvfschannel.c gvfschannel.h \
+@@ -599,6 +608,11 @@ libdaemon_la_SOURCES = \
+ gvfskeyring.h gvfskeyring.c \
+ $(NULL)
+
++libgvfsdaemon_la_LDFLAGS = -avoid-version
++libgvfsdaemon_la_LIBADD = \
++ $(top_builddir)/common/libgvfscommon.la \
++ $(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
++
+ gvfsd_SOURCES = \
+ mount.c mount.h \
+ main.c
+@@ -829,7 +843,7 @@ all: $(BUILT_SOURCES)
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -17771,7 +18102,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -854,9 +856,9 @@
+@@ -854,22 +868,44 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17782,12 +18113,121 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-
++install-privlibLTLIBRARIES: $(privlib_LTLIBRARIES)
++ @$(NORMAL_INSTALL)
++ test -z "$(privlibdir)" || $(MKDIR_P) "$(DESTDIR)$(privlibdir)"
++ @list='$(privlib_LTLIBRARIES)'; test -n "$(privlibdir)" || list=; \
++ list2=; for p in $$list; do \
++ if test -f $$p; then \
++ list2="$$list2 $$p"; \
++ else :; fi; \
++ done; \
++ test -z "$$list2" || { \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(privlibdir)'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(privlibdir)"; \
++ }
++
++uninstall-privlibLTLIBRARIES:
++ @$(NORMAL_UNINSTALL)
++ @list='$(privlib_LTLIBRARIES)'; test -n "$(privlibdir)" || list=; \
++ for p in $$list; do \
++ $(am__strip_dir) \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(privlibdir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(privlibdir)/$$f"; \
++ done
+
+-clean-noinstLTLIBRARIES:
+- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
++clean-privlibLTLIBRARIES:
++ -test -z "$(privlib_LTLIBRARIES)" || rm -f $(privlib_LTLIBRARIES)
++ @list='$(privlib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libdaemon.la: $(libdaemon_la_OBJECTS) $(libdaemon_la_DEPENDENCIES)
+- $(LINK) $(libdaemon_la_OBJECTS) $(libdaemon_la_LIBADD) $(LIBS)
++libgvfsdaemon.la: $(libgvfsdaemon_la_OBJECTS) $(libgvfsdaemon_la_DEPENDENCIES)
++ $(libgvfsdaemon_la_LINK) -rpath $(privlibdir) $(libgvfsdaemon_la_OBJECTS) $(libgvfsdaemon_la_LIBADD) $(LIBS)
+ install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
+@@ -2272,7 +2308,7 @@ check: $(BUILT_SOURCES)
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(mountdir)" "$(DESTDIR)$(servicedir)"; do \
++ for dir in "$(DESTDIR)$(privlibdir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(mountdir)" "$(DESTDIR)$(servicedir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: $(BUILT_SOURCES)
+@@ -2306,7 +2342,7 @@ maintainer-clean-generic:
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \
+- clean-noinstLTLIBRARIES clean-noinstPROGRAMS mostlyclean-am
++ clean-noinstPROGRAMS clean-privlibLTLIBRARIES mostlyclean-am
+
+ distclean: distclean-recursive
+ -rm -rf ./$(DEPDIR)
+@@ -2326,7 +2362,8 @@ info: info-recursive
+
+ info-am:
+
+-install-data-am: install-mountDATA install-serviceDATA
++install-data-am: install-mountDATA install-privlibLTLIBRARIES \
++ install-serviceDATA
+
+ install-dvi: install-dvi-recursive
+
+@@ -2373,7 +2410,7 @@ ps: ps-recursive
+ ps-am:
+
+ uninstall-am: uninstall-libexecPROGRAMS uninstall-mountDATA \
+- uninstall-serviceDATA
++ uninstall-privlibLTLIBRARIES uninstall-serviceDATA
+
+ .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
+ ctags-recursive install install-am install-strip \
+@@ -2381,22 +2418,22 @@ uninstall-am: uninstall-libexecPROGRAMS
+
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic \
+- clean-libexecPROGRAMS clean-libtool clean-noinstLTLIBRARIES \
+- clean-noinstPROGRAMS ctags ctags-recursive distclean \
++ clean-libexecPROGRAMS clean-libtool clean-noinstPROGRAMS \
++ clean-privlibLTLIBRARIES ctags ctags-recursive distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am \
+ install-libexecPROGRAMS install-man install-mountDATA \
+- install-pdf install-pdf-am install-ps install-ps-am \
+- install-serviceDATA install-strip installcheck installcheck-am \
+- installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am \
++ install-pdf install-pdf-am install-privlibLTLIBRARIES \
++ install-ps install-ps-am install-serviceDATA install-strip \
++ installcheck installcheck-am installdirs installdirs-am \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-libexecPROGRAMS uninstall-mountDATA \
+- uninstall-serviceDATA
++ uninstall-privlibLTLIBRARIES uninstall-serviceDATA
+
+
+ # D-BUS service file
Index: gvfs-1.4.1/daemon/trashlib/Makefile.in
===================================================================
---- gvfs-1.4.1.orig/daemon/trashlib/Makefile.in 2009-10-20 11:03:31.000000000 +0200
-+++ gvfs-1.4.1/daemon/trashlib/Makefile.in 2009-10-20 10:56:17.000000000 +0200
-@@ -156,6 +156,7 @@
+--- gvfs-1.4.1.orig/daemon/trashlib/Makefile.in 2009-11-16 20:19:09.462111578 +0100
++++ gvfs-1.4.1/daemon/trashlib/Makefile.in 2009-11-16 20:22:27.098106597 +0100
+@@ -156,6 +156,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17795,7 +18235,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -175,6 +176,7 @@
+@@ -175,6 +176,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17803,7 +18243,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -268,7 +270,7 @@
+@@ -268,7 +270,7 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -17812,7 +18252,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -293,9 +295,9 @@
+@@ -293,9 +295,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17826,9 +18266,9 @@
Index: gvfs-1.4.1/gconf/Makefile.in
===================================================================
---- gvfs-1.4.1.orig/gconf/Makefile.in 2009-10-20 11:03:31.000000000 +0200
-+++ gvfs-1.4.1/gconf/Makefile.in 2009-10-20 10:56:17.000000000 +0200
-@@ -181,6 +181,7 @@
+--- gvfs-1.4.1.orig/gconf/Makefile.in 2009-11-16 20:19:09.434114863 +0100
++++ gvfs-1.4.1/gconf/Makefile.in 2009-11-16 20:22:27.214106744 +0100
+@@ -181,6 +181,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17836,7 +18276,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -200,6 +201,7 @@
+@@ -200,6 +201,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17844,7 +18284,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -290,7 +292,6 @@
+@@ -290,7 +292,6 @@ libgiogconf_la_CFLAGS = \
$(GCONF_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -17852,7 +18292,7 @@
$(NULL)
libgiogconf_la_LDFLAGS = \
-@@ -306,7 +307,7 @@
+@@ -306,7 +307,7 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -17861,7 +18301,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -331,9 +332,9 @@
+@@ -331,9 +332,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17875,8 +18315,8 @@
install-giomodulesLTLIBRARIES: $(giomodules_LTLIBRARIES)
Index: gvfs-1.4.1/INSTALL
===================================================================
---- gvfs-1.4.1.orig/INSTALL 2009-10-20 11:03:31.000000000 +0200
-+++ gvfs-1.4.1/INSTALL 2009-10-20 10:56:19.000000000 +0200
+--- gvfs-1.4.1.orig/INSTALL 2009-11-16 20:19:09.406110325 +0100
++++ gvfs-1.4.1/INSTALL 2009-11-16 20:22:28.333613053 +0100
@@ -1,3 +1,302 @@
-The ObexFTP backend requires the obex-data-server D-Bus service in
-addition to the dependencies listed in the configure. See:
@@ -18185,8 +18625,8 @@
+
Index: gvfs-1.4.1/ltmain.sh
===================================================================
---- gvfs-1.4.1.orig/ltmain.sh 2009-10-20 11:03:31.000000000 +0200
-+++ gvfs-1.4.1/ltmain.sh 2009-10-20 10:56:02.000000000 +0200
+--- gvfs-1.4.1.orig/ltmain.sh 2009-11-16 20:19:09.382111253 +0100
++++ gvfs-1.4.1/ltmain.sh 2009-11-16 20:22:16.126111673 +0100
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -18205,7 +18645,7 @@
TIMESTAMP=""
package_revision=1.3012
-@@ -5033,7 +5033,10 @@
+@@ -5033,7 +5033,10 @@ func_mode_link ()
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -18217,7 +18657,7 @@
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5344,19 +5347,19 @@
+@@ -5344,19 +5347,19 @@ func_mode_link ()
# 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"
@@ -18247,7 +18687,7 @@
continue
fi # $pass = conv
-@@ -5893,6 +5896,7 @@
+@@ -5893,6 +5896,7 @@ func_mode_link ()
if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
@@ -18255,7 +18695,7 @@
case $deplib in
-L*) path="$deplib" ;;
*.la)
-@@ -6206,6 +6210,9 @@
+@@ -6206,6 +6210,9 @@ func_mode_link ()
revision="$number_minor"
lt_irix_increment=no
;;
@@ -18267,9 +18707,9 @@
no)
Index: gvfs-1.4.1/Makefile.in
===================================================================
---- gvfs-1.4.1.orig/Makefile.in 2009-10-20 11:03:30.000000000 +0200
-+++ gvfs-1.4.1/Makefile.in 2009-10-20 10:56:19.000000000 +0200
-@@ -187,6 +187,7 @@
+--- gvfs-1.4.1.orig/Makefile.in 2009-11-16 20:19:09.358108271 +0100
++++ gvfs-1.4.1/Makefile.in 2009-11-16 20:22:28.393607550 +0100
+@@ -187,6 +187,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18277,7 +18717,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -206,6 +207,7 @@
+@@ -206,6 +207,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18285,7 +18725,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -313,7 +315,7 @@
+@@ -313,7 +315,7 @@ all: config.h
.SUFFIXES:
am--refresh:
@:
@@ -18294,7 +18734,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -340,9 +342,9 @@
+@@ -340,9 +342,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -18306,7 +18746,7 @@
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
-@@ -355,7 +357,7 @@
+@@ -355,7 +357,7 @@ config.h: stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -18317,9 +18757,9 @@
touch $@
Index: gvfs-1.4.1/monitor/gphoto2/Makefile.in
===================================================================
---- gvfs-1.4.1.orig/monitor/gphoto2/Makefile.in 2009-10-20 11:03:32.000000000 +0200
-+++ gvfs-1.4.1/monitor/gphoto2/Makefile.in 2009-10-20 10:56:18.000000000 +0200
-@@ -212,6 +212,7 @@
+--- gvfs-1.4.1.orig/monitor/gphoto2/Makefile.in 2009-11-16 20:19:09.338113202 +0100
++++ gvfs-1.4.1/monitor/gphoto2/Makefile.in 2009-11-16 20:22:27.722108808 +0100
+@@ -212,6 +212,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18327,7 +18767,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -231,6 +232,7 @@
+@@ -231,6 +232,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18335,7 +18775,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -327,7 +329,7 @@
+@@ -327,7 +329,7 @@ gvfs_gphoto2_volume_monitor_CFLAGS = -DG
-I$(top_srcdir)/common -I$(top_srcdir)/monitor/proxy \
$(GLIB_CFLAGS) $(GPHOTO2_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
@@ -18344,7 +18784,7 @@
-DG_UDEV_API_IS_SUBJECT_TO_CHANGE $(NULL) $(am__append_1) \
$(am__append_2)
gvfs_gphoto2_volume_monitor_LDFLAGS = \
-@@ -348,7 +350,7 @@
+@@ -348,7 +350,7 @@ all: $(BUILT_SOURCES)
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -18353,7 +18793,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -373,9 +375,9 @@
+@@ -373,9 +375,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18367,9 +18807,9 @@
install-libexecPROGRAMS: $(libexec_PROGRAMS)
Index: gvfs-1.4.1/monitor/hal/Makefile.in
===================================================================
---- gvfs-1.4.1.orig/monitor/hal/Makefile.in 2009-10-20 11:03:32.000000000 +0200
-+++ gvfs-1.4.1/monitor/hal/Makefile.in 2009-10-20 10:56:18.000000000 +0200
-@@ -198,6 +198,7 @@
+--- gvfs-1.4.1.orig/monitor/hal/Makefile.in 2009-11-16 20:19:09.306114443 +0100
++++ gvfs-1.4.1/monitor/hal/Makefile.in 2009-11-16 20:22:27.878106907 +0100
+@@ -198,6 +198,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18377,7 +18817,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -217,6 +218,7 @@
+@@ -217,6 +218,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18385,7 +18825,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -316,7 +318,6 @@
+@@ -316,7 +318,6 @@ gvfs_hal_volume_monitor_CFLAGS = \
$(HAL_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -18393,7 +18833,7 @@
$(NULL)
gvfs_hal_volume_monitor_LDFLAGS = \
-@@ -340,7 +341,7 @@
+@@ -340,7 +341,7 @@ all: $(BUILT_SOURCES)
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -18402,7 +18842,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -365,9 +366,9 @@
+@@ -365,9 +366,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18416,9 +18856,9 @@
install-libexecPROGRAMS: $(libexec_PROGRAMS)
Index: gvfs-1.4.1/monitor/Makefile.in
===================================================================
---- gvfs-1.4.1.orig/monitor/Makefile.in 2009-10-20 11:03:32.000000000 +0200
-+++ gvfs-1.4.1/monitor/Makefile.in 2009-10-20 10:56:17.000000000 +0200
-@@ -174,6 +174,7 @@
+--- gvfs-1.4.1.orig/monitor/Makefile.in 2009-11-16 20:19:09.278110887 +0100
++++ gvfs-1.4.1/monitor/Makefile.in 2009-11-16 20:22:27.430107652 +0100
+@@ -174,6 +174,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18426,7 +18866,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -193,6 +194,7 @@
+@@ -193,6 +194,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18434,7 +18874,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -272,7 +274,7 @@
+@@ -272,7 +274,7 @@ SUBDIRS = proxy $(am__append_1) $(am__ap
all: all-recursive
.SUFFIXES:
@@ -18443,7 +18883,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -297,9 +299,9 @@
+@@ -297,9 +299,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18457,9 +18897,9 @@
Index: gvfs-1.4.1/monitor/proxy/Makefile.in
===================================================================
---- gvfs-1.4.1.orig/monitor/proxy/Makefile.in 2009-10-20 11:03:32.000000000 +0200
-+++ gvfs-1.4.1/monitor/proxy/Makefile.in 2009-10-20 10:56:18.000000000 +0200
-@@ -201,6 +201,7 @@
+--- gvfs-1.4.1.orig/monitor/proxy/Makefile.in 2009-11-16 20:19:09.254110842 +0100
++++ gvfs-1.4.1/monitor/proxy/Makefile.in 2009-11-16 20:22:28.033607333 +0100
+@@ -201,6 +201,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18467,7 +18907,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -220,6 +221,7 @@
+@@ -220,6 +221,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18475,7 +18915,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -317,7 +319,6 @@
+@@ -317,7 +319,6 @@ libgioremote_volume_monitor_la_CFLAGS =
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DREMOTE_VOLUME_MONITORS_DIR=\"$(remote_volume_monitorsdir)\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -18483,7 +18923,7 @@
$(NULL)
libgioremote_volume_monitor_la_LDFLAGS = \
-@@ -344,7 +345,6 @@
+@@ -344,7 +345,6 @@ libgvfsproxyvolumemonitordaemon_noin_la_
$(GDU_CFLAGS) \
-DG_LOG_DOMAIN=\"GVFS-RemoteVolumeMonitorDaemon\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -18491,7 +18931,7 @@
$(NULL)
libgvfsproxyvolumemonitordaemon_noin_la_LIBADD = \
-@@ -357,7 +357,7 @@
+@@ -357,7 +357,7 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -18500,7 +18940,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -382,9 +382,9 @@
+@@ -382,9 +382,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18514,9 +18954,9 @@
install-giomodulesLTLIBRARIES: $(giomodules_LTLIBRARIES)
Index: gvfs-1.4.1/programs/Makefile.in
===================================================================
---- gvfs-1.4.1.orig/programs/Makefile.in 2009-10-20 11:03:31.000000000 +0200
-+++ gvfs-1.4.1/programs/Makefile.in 2009-10-20 10:56:18.000000000 +0200
-@@ -245,6 +245,7 @@
+--- gvfs-1.4.1.orig/programs/Makefile.in 2009-11-16 20:19:09.198114482 +0100
++++ gvfs-1.4.1/programs/Makefile.in 2009-11-16 20:22:28.197610026 +0100
+@@ -245,6 +245,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18524,7 +18964,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -264,6 +265,7 @@
+@@ -264,6 +265,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18532,7 +18972,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -345,7 +347,7 @@
+@@ -345,7 +347,7 @@ INCLUDES = \
-I$(top_builddir) \
$(GLIB_CFLAGS) \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -18541,7 +18981,7 @@
libraries = \
$(GLIB_LIBS)
-@@ -393,7 +395,7 @@
+@@ -393,7 +395,7 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -18550,7 +18990,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -418,9 +420,9 @@
+@@ -418,9 +420,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18564,9 +19004,9 @@
install-binPROGRAMS: $(bin_PROGRAMS)
Index: gvfs-1.4.1/test/Makefile.in
===================================================================
---- gvfs-1.4.1.orig/test/Makefile.in 2009-10-20 11:03:31.000000000 +0200
-+++ gvfs-1.4.1/test/Makefile.in 2009-10-20 10:56:19.000000000 +0200
-@@ -176,6 +176,7 @@
+--- gvfs-1.4.1.orig/test/Makefile.in 2009-11-16 20:19:09.174114435 +0100
++++ gvfs-1.4.1/test/Makefile.in 2009-11-16 20:22:28.301607451 +0100
+@@ -176,6 +176,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18574,7 +19014,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -195,6 +196,7 @@
+@@ -195,6 +196,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18582,7 +19022,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -275,7 +277,7 @@
+@@ -275,7 +277,7 @@ AM_CFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(GLIB_CFLAGS) \
@@ -18591,7 +19031,7 @@
AM_LDFLAGS = \
$(GLIB_LIBS)
-@@ -285,7 +287,7 @@
+@@ -285,7 +287,7 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -18600,7 +19040,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -310,9 +312,9 @@
+@@ -310,9 +312,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18614,8 +19054,8 @@
Index: gvfs-1.4.1/config.guess
===================================================================
---- gvfs-1.4.1.orig/config.guess 2009-10-20 11:03:31.000000000 +0200
-+++ gvfs-1.4.1/config.guess 2009-10-20 10:56:16.000000000 +0200
+--- gvfs-1.4.1.orig/config.guess 2009-11-16 20:19:09.146109898 +0100
++++ gvfs-1.4.1/config.guess 2009-11-16 20:22:25.849612782 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -18629,7 +19069,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
-@@ -170,7 +170,7 @@
+@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -18638,7 +19078,7 @@
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
-@@ -656,7 +656,7 @@
+@@ -656,7 +656,7 @@ EOF
# => hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
@@ -18647,7 +19087,7 @@
then
HP_ARCH="hppa2.0w"
else
-@@ -822,6 +822,9 @@
+@@ -822,6 +822,9 @@ EOF
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -18657,7 +19097,7 @@
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -882,40 +885,17 @@
+@@ -882,40 +885,17 @@ EOF
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
@@ -18703,7 +19143,7 @@
#else
CPU=
#endif
-@@ -947,7 +927,7 @@
+@@ -947,7 +927,7 @@ EOF
EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
@@ -18712,7 +19152,7 @@
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit ;;
-@@ -1001,14 +981,6 @@
+@@ -1001,14 +981,6 @@ EOF
elf32-i386)
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
;;
@@ -18727,7 +19167,7 @@
esac
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
-@@ -1074,7 +1046,7 @@
+@@ -1074,7 +1046,7 @@ EOF
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
@@ -18736,7 +19176,7 @@
echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
-@@ -1182,7 +1154,7 @@
+@@ -1182,7 +1154,7 @@ EOF
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
@@ -18747,8 +19187,8 @@
SM[BE]S:UNIX_SV:*:*)
Index: gvfs-1.4.1/config.sub
===================================================================
---- gvfs-1.4.1.orig/config.sub 2009-10-20 11:03:31.000000000 +0200
-+++ gvfs-1.4.1/config.sub 2009-10-20 10:56:16.000000000 +0200
+--- gvfs-1.4.1.orig/config.sub 2009-11-16 20:19:09.122111805 +0100
++++ gvfs-1.4.1/config.sub 2009-11-16 20:22:25.853610915 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -18762,7 +19202,7 @@
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
-@@ -153,6 +153,9 @@
+@@ -153,6 +153,9 @@ case $os in
os=
basic_machine=$1
;;
@@ -18772,7 +19212,7 @@
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
-@@ -467,6 +470,10 @@
+@@ -467,6 +470,10 @@ case $basic_machine in
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
@@ -18783,7 +19223,7 @@
c90)
basic_machine=c90-cray
os=-unicos
-@@ -1260,7 +1267,7 @@
+@@ -1260,7 +1267,7 @@ case $os in
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
@@ -18792,7 +19232,7 @@
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
| -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-@@ -1613,7 +1620,7 @@
+@@ -1613,7 +1620,7 @@ case $basic_machine in
-sunos*)
vendor=sun
;;
@@ -18803,9 +19243,9 @@
-beos*)
Index: gvfs-1.4.1/metadata/Makefile.in
===================================================================
---- gvfs-1.4.1.orig/metadata/Makefile.in 2009-10-20 11:03:31.000000000 +0200
-+++ gvfs-1.4.1/metadata/Makefile.in 2009-10-20 10:56:17.000000000 +0200
-@@ -216,6 +216,7 @@
+--- gvfs-1.4.1.orig/metadata/Makefile.in 2009-11-16 20:19:09.098114200 +0100
++++ gvfs-1.4.1/metadata/Makefile.in 2009-11-16 20:22:27.350108794 +0100
+@@ -216,6 +216,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18813,7 +19253,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -235,6 +236,7 @@
+@@ -235,6 +236,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18821,7 +19261,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -347,7 +349,7 @@
+@@ -347,7 +349,7 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -18830,7 +19270,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -372,9 +374,9 @@
+@@ -372,9 +374,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18844,9 +19284,9 @@
Index: gvfs-1.4.1/monitor/gdu/Makefile.in
===================================================================
---- gvfs-1.4.1.orig/monitor/gdu/Makefile.in 2009-10-20 11:03:32.000000000 +0200
-+++ gvfs-1.4.1/monitor/gdu/Makefile.in 2009-10-20 10:56:18.000000000 +0200
-@@ -195,6 +195,7 @@
+--- gvfs-1.4.1.orig/monitor/gdu/Makefile.in 2009-11-16 20:19:09.230113241 +0100
++++ gvfs-1.4.1/monitor/gdu/Makefile.in 2009-11-16 20:22:27.566109232 +0100
+@@ -195,6 +195,7 @@ LIBXML_LIBS = @LIBXML_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18854,7 +19294,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -214,6 +215,7 @@
+@@ -214,6 +215,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18862,7 +19302,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -332,7 +334,7 @@
+@@ -332,7 +334,7 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -18871,7 +19311,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -357,9 +359,9 @@
+@@ -357,9 +359,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
Modified: desktop/experimental/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/series?rev=22360&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/series [utf-8] Mon Nov 16 19:45:00 2009
@@ -2,5 +2,6 @@
02_deprecated.patch
03_xdg-mount.patch
04_hurd_path_max.patch
+05_shared_libdaemon.patch
90_relibtoolize.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list