r25723 - in /desktop/experimental/gvfs/debian: ./ patches/
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Wed Dec 1 19:48:19 UTC 2010
Author: pochu
Date: Wed Dec 1 19:48:18 2010
New Revision: 25723
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25723
Log:
* New upstream release.
+ debian/patches/06_sftp_timeout.patch:
- Removed, merged upstream.
+ debian/patches/*
- Updated.
+ debian/gvfs.install:
- Install the gsettings schemas and the gconf conversion files.
* debian/control:
+ User architecture wildcards everywhere.
Removed:
desktop/experimental/gvfs/debian/patches/06_sftp_timeout.patch
Modified:
desktop/experimental/gvfs/debian/changelog
desktop/experimental/gvfs/debian/control.in
desktop/experimental/gvfs/debian/gvfs.install
desktop/experimental/gvfs/debian/patches/01_maintainer_mode.patch
desktop/experimental/gvfs/debian/patches/02_deprecated.patch
desktop/experimental/gvfs/debian/patches/04_hurd_path_max.patch
desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch
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=25723&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Wed Dec 1 19:48:18 2010
@@ -1,3 +1,17 @@
+gvfs (1.7.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ + debian/patches/06_sftp_timeout.patch:
+ - Removed, merged upstream.
+ + debian/patches/*
+ - Updated.
+ + debian/gvfs.install:
+ - Install the gsettings schemas and the gconf conversion files.
+ * debian/control:
+ + User architecture wildcards everywhere.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Wed, 01 Dec 2010 20:01:56 +0100
+
gvfs (1.6.4-2) unstable; urgency=low
* 06_sftp_timeout.patch: patch from Andreas Henriksson to fix
Modified: desktop/experimental/gvfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control.in?rev=25723&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/control.in [utf-8] (original)
+++ desktop/experimental/gvfs/debian/control.in [utf-8] Wed Dec 1 19:48:18 2010
@@ -8,7 +8,7 @@
gnome-pkg-tools (>= 0.7),
pkg-config,
gtk-doc-tools,
- libglib2.0-dev (>= 2.23.4),
+ libglib2.0-dev (>= 2.27.4),
libdbus-1-dev,
intltool (>= 0.35.0),
openssh-client,
@@ -17,8 +17,7 @@
libudev-dev (>= 0.138) [linux-any],
libavahi-glib-dev (>= 0.6),
libavahi-client-dev (>= 0.6),
- libfuse-dev [!hurd-i386],
- libgconf2-dev,
+ libfuse-dev [!hurd-any],
libhal-dev (>= 0.5.10) [!linux-any],
libgdu-dev (>= 2.29.0) [linux-any],
libgudev-1.0-dev (>= 001) [linux-any],
@@ -31,7 +30,7 @@
libsmbclient-dev (>= 3.0),
libarchive-dev,
libltdl-dev,
- libimobiledevice-dev (>= 0.9.7) [!hurd-i386]
+ libimobiledevice-dev (>= 0.9.7) [!hurd-any]
Standards-Version: 3.9.0
Section: libs
Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-gnome/desktop/unstable/gvfs
Modified: desktop/experimental/gvfs/debian/gvfs.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/gvfs.install?rev=25723&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/gvfs.install [utf-8] (original)
+++ desktop/experimental/gvfs/debian/gvfs.install [utf-8] Wed Dec 1 19:48:18 2010
@@ -9,6 +9,8 @@
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/glib-2.0
+debian/tmp/usr/share/GConf
debian/tmp/usr/share/locale
debian/tmp/usr/share/gvfs/mounts/burn.mount
debian/tmp/usr/share/gvfs/mounts/computer.mount
Modified: desktop/experimental/gvfs/debian/patches/01_maintainer_mode.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/01_maintainer_mode.patch?rev=25723&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/01_maintainer_mode.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/01_maintainer_mode.patch [utf-8] Wed Dec 1 19:48:18 2010
@@ -1,11 +1,9 @@
-Index: gvfs-1.6.3/configure.ac
-===================================================================
---- gvfs-1.6.3.orig/configure.ac 2010-07-12 17:22:38.000000000 +0200
-+++ gvfs-1.6.3/configure.ac 2010-07-19 18:33:51.434251172 +0200
+--- a/configure.ac
++++ b/configure.ac
@@ -1,6 +1,7 @@
AC_INIT(client/gdaemonvfs.h)
- AM_INIT_AUTOMAKE(gvfs, 1.6.4)
+ AM_INIT_AUTOMAKE(gvfs, 1.7.0)
+AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
Modified: desktop/experimental/gvfs/debian/patches/02_deprecated.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/02_deprecated.patch?rev=25723&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/02_deprecated.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/02_deprecated.patch [utf-8] Wed Dec 1 19:48:18 2010
@@ -1,7 +1,5 @@
-Index: b/client/Makefile.am
-===================================================================
---- a/client/Makefile.am 2010-05-31 10:31:51.294443409 +0200
-+++ b/client/Makefile.am 2010-05-31 10:32:07.062447083 +0200
+--- a/client/Makefile.am
++++ b/client/Makefile.am
@@ -5,7 +5,7 @@
-I$(top_srcdir)/metadata \
-I$(top_srcdir)/common \
@@ -20,10 +18,8 @@
-DDBUS_API_SUBJECT_TO_CHANGE
gvfs_fuse_daemon_LDADD = \
-Index: b/common/Makefile.am
-===================================================================
---- a/common/Makefile.am 2010-05-31 10:31:51.138446480 +0200
-+++ b/common/Makefile.am 2010-05-31 10:32:07.062447083 +0200
+--- a/common/Makefile.am
++++ b/common/Makefile.am
@@ -5,7 +5,7 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
-I$(top_srcdir)/daemon \
@@ -33,10 +29,8 @@
-DDBUS_API_SUBJECT_TO_CHANGE
libgvfscommon_la_SOURCES = \
-Index: b/daemon/Makefile.am
-===================================================================
---- a/daemon/Makefile.am 2010-05-31 10:31:51.342444554 +0200
-+++ b/daemon/Makefile.am 2010-05-31 10:32:07.102445954 +0200
+--- a/daemon/Makefile.am
++++ b/daemon/Makefile.am
@@ -17,7 +17,7 @@
-DLIBEXEC_DIR=\"$(libexecdir)/\" \
-DMOUNTABLE_DIR=\"$(mountdir)/\" \
@@ -46,22 +40,8 @@
noinst_LTLIBRARIES=libdaemon.la
-Index: b/gconf/Makefile.am
-===================================================================
---- a/gconf/Makefile.am 2010-05-31 10:31:51.094447101 +0200
-+++ b/gconf/Makefile.am 2010-05-31 10:32:07.190444361 +0200
-@@ -19,7 +19,6 @@
- $(GCONF_CFLAGS) \
- -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
- -DGVFS_LOCALEDIR=\""$(localedir)"\" \
-- -DG_DISABLE_DEPRECATED \
- $(NULL)
-
- libgiogconf_la_LDFLAGS = \
-Index: b/monitor/gphoto2/Makefile.am
-===================================================================
---- a/monitor/gphoto2/Makefile.am 2010-05-31 10:31:51.390444788 +0200
-+++ b/monitor/gphoto2/Makefile.am 2010-05-31 10:32:07.226444746 +0200
+--- a/monitor/gphoto2/Makefile.am
++++ b/monitor/gphoto2/Makefile.am
@@ -39,7 +39,6 @@
$(GPHOTO2_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
@@ -70,10 +50,8 @@
-DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
$(NULL)
-Index: b/monitor/hal/Makefile.am
-===================================================================
---- a/monitor/hal/Makefile.am 2010-05-31 10:31:51.526445791 +0200
-+++ b/monitor/hal/Makefile.am 2010-05-31 10:32:07.258443370 +0200
+--- a/monitor/hal/Makefile.am
++++ b/monitor/hal/Makefile.am
@@ -33,7 +33,6 @@
$(HAL_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
@@ -82,10 +60,8 @@
$(NULL)
gvfs_hal_volume_monitor_LDFLAGS = \
-Index: b/monitor/proxy/Makefile.am
-===================================================================
---- a/monitor/proxy/Makefile.am 2010-05-31 10:31:51.442446715 +0200
-+++ b/monitor/proxy/Makefile.am 2010-05-31 10:32:07.258443370 +0200
+--- a/monitor/proxy/Makefile.am
++++ b/monitor/proxy/Makefile.am
@@ -25,7 +25,6 @@
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DREMOTE_VOLUME_MONITORS_DIR=\"$(remote_volume_monitorsdir)\" \
@@ -102,10 +78,8 @@
$(NULL)
libgvfsproxyvolumemonitordaemon_noin_la_LIBADD = \
-Index: b/programs/Makefile.am
-===================================================================
---- a/programs/Makefile.am 2010-05-31 10:31:51.030447137 +0200
-+++ b/programs/Makefile.am 2010-05-31 10:32:07.346446739 +0200
+--- a/programs/Makefile.am
++++ b/programs/Makefile.am
@@ -5,7 +5,7 @@
-I$(top_builddir) \
$(GLIB_CFLAGS) \
@@ -115,10 +89,8 @@
libraries = \
$(GLIB_LIBS)
-Index: b/test/Makefile.am
-===================================================================
---- a/test/Makefile.am 2010-05-31 10:31:51.214445875 +0200
-+++ b/test/Makefile.am 2010-05-31 10:32:08.714447900 +0200
+--- a/test/Makefile.am
++++ b/test/Makefile.am
@@ -4,7 +4,7 @@
-I$(top_srcdir) \
-I$(top_builddir) \
Modified: desktop/experimental/gvfs/debian/patches/04_hurd_path_max.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/04_hurd_path_max.patch?rev=25723&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/04_hurd_path_max.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/04_hurd_path_max.patch [utf-8] Wed Dec 1 19:48:18 2010
@@ -1,10 +1,8 @@
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=555055
https://bugzilla.gnome.org/show_bug.cgi?id=601497
-Index: b/monitor/hal/ghalvolumemonitor.c
-===================================================================
---- a/monitor/hal/ghalvolumemonitor.c 2010-05-31 10:31:49.830445332 +0200
-+++ b/monitor/hal/ghalvolumemonitor.c 2010-05-31 10:32:12.022446679 +0200
+--- a/monitor/hal/ghalvolumemonitor.c
++++ b/monitor/hal/ghalvolumemonitor.c
@@ -739,11 +739,23 @@
}
else
@@ -30,11 +28,9 @@
}
}
-Index: b/monitor/gdu/ggduvolumemonitor.c
-===================================================================
---- a/monitor/gdu/ggduvolumemonitor.c 2010-05-31 10:31:49.806445144 +0200
-+++ b/monitor/gdu/ggduvolumemonitor.c 2010-05-31 10:32:12.022446679 +0200
-@@ -695,15 +695,27 @@
+--- a/monitor/gdu/ggduvolumemonitor.c
++++ b/monitor/gdu/ggduvolumemonitor.c
+@@ -699,15 +699,27 @@
}
else
{
@@ -63,7 +59,7 @@
}
}
-@@ -1423,15 +1435,29 @@
+@@ -1427,15 +1439,29 @@
device_file = g_unix_mount_point_get_device_path (mount_point);
if (g_str_has_prefix (device_file, "/dev/"))
{
Modified: 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=25723&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch [utf-8] Wed Dec 1 19:48:18 2010
@@ -1,7 +1,5 @@
-Index: b/daemon/Makefile.am
-===================================================================
---- a/daemon/Makefile.am 2010-05-31 10:32:07.102445954 +0200
-+++ b/daemon/Makefile.am 2010-05-31 10:32:13.950446544 +0200
+--- a/daemon/Makefile.am
++++ b/daemon/Makefile.am
@@ -19,12 +19,14 @@
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
$(NULL)
@@ -18,9 +16,9 @@
- $(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
+ $(GLIB_LIBS) $(DBUS_LIBS)
- # D-BUS service file
- %.service: %.service.in ../config.log
-@@ -116,7 +118,7 @@
+ gvfs_gschemas =
+ gvfs_gschemas_convert =
+@@ -127,7 +129,7 @@
gvfsd-test \
$(NULL)
@@ -29,7 +27,7 @@
gvfsdaemon.c gvfsdaemon.h \
gvfsbackend.c gvfsbackend.h \
gvfschannel.c gvfschannel.h \
-@@ -164,6 +166,12 @@
+@@ -175,6 +177,12 @@
gvfskeyring.h gvfskeyring.c \
$(NULL)
@@ -42,10 +40,8 @@
gvfsd_SOURCES = \
mount.c mount.h \
main.c
-Index: b/common/Makefile.am
-===================================================================
---- a/common/Makefile.am 2010-05-31 10:32:07.062447083 +0200
-+++ b/common/Makefile.am 2010-05-31 10:32:13.998447192 +0200
+--- a/common/Makefile.am
++++ b/common/Makefile.am
@@ -1,6 +1,8 @@
NULL =
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=25723&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/90_relibtoolize.patch [utf-8] Wed Dec 1 19:48:18 2010
@@ -6,10 +6,8 @@
rm -rf autom4te.cache/
diff '-x*config.guess' '-x*config.sub' -Naur gvfs-1.6.2.old/aclocal.m4 gvfs-1.6.2/aclocal.m4
-Index: quilt-UA6TYS/aclocal.m4
-===================================================================
---- quilt-UA6TYS.orig/aclocal.m4 2010-09-27 16:52:38.000000000 +0200
-+++ quilt-UA6TYS/aclocal.m4 2010-10-01 13:00:01.000000000 +0200
+--- a/aclocal.m4
++++ b/aclocal.m4
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -21,7 +19,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'.])])
-@@ -711,8 +711,7 @@
+@@ -795,8 +795,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -31,7 +29,7 @@
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
-@@ -721,8 +720,7 @@
+@@ -805,8 +804,7 @@
m4_define([_LT_COPYING], [dnl
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -41,7 +39,7 @@
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
-@@ -749,7 +747,7 @@
+@@ -833,7 +831,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
])
@@ -50,7 +48,7 @@
# LT_PREREQ(VERSION)
-@@ -778,7 +776,6 @@
+@@ -862,7 +860,6 @@
# ------------------
AC_DEFUN([LT_INIT],
[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
@@ -58,7 +56,7 @@
AC_BEFORE([$0], [LT_LANG])dnl
AC_BEFORE([$0], [LT_OUTPUT])dnl
AC_BEFORE([$0], [LTDL_INIT])dnl
-@@ -795,8 +792,6 @@
+@@ -879,8 +876,6 @@
AC_REQUIRE([LTOBSOLETE_VERSION])dnl
m4_require([_LT_PROG_LTMAIN])dnl
@@ -67,7 +65,7 @@
dnl Parse OPTIONS
_LT_SET_OPTIONS([$0], [$1])
-@@ -833,7 +828,7 @@
+@@ -917,7 +912,7 @@
*) break;;
esac
done
@@ -76,7 +74,7 @@
])
-@@ -853,9 +848,6 @@
+@@ -937,9 +932,6 @@
m4_defun([_LT_SETUP],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
@@ -86,7 +84,7 @@
_LT_DECL([], [host_alias], [0], [The host system])dnl
_LT_DECL([], [host], [0])dnl
_LT_DECL([], [host_os], [0])dnl
-@@ -897,6 +889,7 @@
+@@ -981,6 +973,7 @@
_LT_CHECK_OBJDIR
m4_require([_LT_TAG_COMPILER])dnl
@@ -94,7 +92,7 @@
case $host_os in
aix3*)
-@@ -910,6 +903,23 @@
+@@ -994,6 +987,23 @@
;;
esac
@@ -118,7 +116,7 @@
# Global variables:
ofile=libtool
can_build_shared=yes
-@@ -950,28 +960,6 @@
+@@ -1034,28 +1044,6 @@
])# _LT_SETUP
@@ -147,7 +145,7 @@
# _LT_PROG_LTMAIN
# ---------------
# Note that this code is called both from `configure', and `config.status'
-@@ -1124,7 +1112,7 @@
+@@ -1208,7 +1196,7 @@
# declaration there will have the same value as in `configure'. VARNAME
# must have a single quote delimited value for this to work.
m4_define([_LT_CONFIG_STATUS_DECLARE],
@@ -156,7 +154,7 @@
# _LT_CONFIG_STATUS_DECLARATIONS
-@@ -1134,7 +1122,7 @@
+@@ -1218,7 +1206,7 @@
# embedded single quotes properly. In configure, this macro expands
# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
#
@@ -165,7 +163,7 @@
m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
[m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-@@ -1233,20 +1221,12 @@
+@@ -1317,20 +1305,12 @@
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
@@ -188,7 +186,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -1257,9 +1237,9 @@
+@@ -1341,9 +1321,9 @@
# Double-quote double-evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
@@ -200,7 +198,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -1267,38 +1247,16 @@
+@@ -1351,38 +1331,16 @@
esac
done
@@ -246,7 +244,7 @@
# LT_OUTPUT
# ---------
-@@ -1308,11 +1266,20 @@
+@@ -1392,11 +1350,20 @@
AC_DEFUN([LT_OUTPUT],
[: ${CONFIG_LT=./config.lt}
AC_MSG_NOTICE([creating $CONFIG_LT])
@@ -270,7 +268,7 @@
exec AS_MESSAGE_LOG_FD>>config.log
{
echo
-@@ -1338,7 +1305,7 @@
+@@ -1422,7 +1389,7 @@
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
configured by $[0], generated by m4_PACKAGE_STRING.
@@ -279,7 +277,7 @@
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
-@@ -1383,13 +1350,15 @@
+@@ -1467,13 +1434,15 @@
# appending to config.log, which fails on DOS, as config.log is still kept
# open by configure. Here we exec the FD to /dev/null, effectively closing
# config.log, so it can be properly (re)opened and appended to by config.lt.
@@ -302,7 +300,7 @@
])# LT_OUTPUT
-@@ -1566,13 +1535,11 @@
+@@ -1650,13 +1619,11 @@
AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
@@ -316,7 +314,7 @@
# _LT_TAG_COMPILER
-@@ -1677,31 +1644,6 @@
+@@ -1761,31 +1728,6 @@
[lt_cv_ld_exported_symbols_list=no])
LDFLAGS="$save_LDFLAGS"
])
@@ -348,7 +346,7 @@
case $host_os in
rhapsody* | darwin1.[[012]])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -1729,7 +1671,7 @@
+@@ -1813,7 +1755,7 @@
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
@@ -357,7 +355,7 @@
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
-@@ -1749,11 +1691,7 @@
+@@ -1833,11 +1775,7 @@
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -370,7 +368,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -1761,7 +1699,7 @@
+@@ -1845,7 +1783,7 @@
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -379,7 +377,7 @@
_LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
_LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
_LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -1807,65 +1745,170 @@
+@@ -1891,65 +1829,170 @@
# _LT_SHELL_INIT(ARG)
# -------------------
m4_define([_LT_SHELL_INIT],
@@ -597,7 +595,7 @@
])# _LT_PROG_ECHO_BACKSLASH
-@@ -1897,7 +1940,7 @@
+@@ -1981,7 +2024,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -606,7 +604,7 @@
if AC_TRY_EVAL(ac_compile); then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
-@@ -2049,19 +2092,10 @@
+@@ -2133,19 +2176,10 @@
esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -626,7 +624,7 @@
])# _LT_CMD_OLD_ARCHIVE
-@@ -2086,15 +2120,15 @@
+@@ -2170,15 +2204,15 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -645,7 +643,7 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
-@@ -2134,7 +2168,7 @@
+@@ -2218,7 +2252,7 @@
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&AS_MESSAGE_LOG_FD
@@ -654,7 +652,7 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
-@@ -2197,11 +2231,6 @@
+@@ -2281,11 +2315,6 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -666,7 +664,7 @@
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
-@@ -2266,8 +2295,8 @@
+@@ -2350,8 +2379,8 @@
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
@@ -677,7 +675,7 @@
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
-@@ -2318,7 +2347,7 @@
+@@ -2402,7 +2431,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -686,7 +684,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -2359,13 +2388,7 @@
+@@ -2443,13 +2472,7 @@
# endif
#endif
@@ -701,7 +699,7 @@
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -2374,11 +2397,7 @@
+@@ -2458,11 +2481,7 @@
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -714,7 +712,7 @@
/* dlclose (self); */
}
else
-@@ -2554,16 +2573,16 @@
+@@ -2638,16 +2657,16 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -734,7 +732,7 @@
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-@@ -2722,7 +2741,6 @@
+@@ -2806,7 +2825,6 @@
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_OBJDUMP])dnl
m4_require([_LT_DECL_SED])dnl
@@ -742,7 +740,7 @@
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
-@@ -2731,23 +2749,16 @@
+@@ -2815,23 +2833,16 @@
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
@@ -772,7 +770,7 @@
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
-@@ -2760,7 +2771,7 @@
+@@ -2844,7 +2855,7 @@
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
@@ -781,7 +779,7 @@
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
-@@ -2780,13 +2791,7 @@
+@@ -2864,13 +2875,7 @@
if (lt_foo != "") { lt_freq[[lt_foo]]++; }
if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
}'`
@@ -796,7 +794,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi])
-@@ -2874,7 +2879,7 @@
+@@ -2958,7 +2963,7 @@
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -805,7 +803,7 @@
;;
esac
;;
-@@ -2927,12 +2932,23 @@
+@@ -3011,12 +3016,23 @@
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
@@ -831,7 +829,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
-@@ -3032,19 +3048,6 @@
+@@ -3116,19 +3132,6 @@
hardcode_into_libs=yes
;;
@@ -851,7 +849,7 @@
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
-@@ -3087,10 +3090,8 @@
+@@ -3171,10 +3174,8 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -863,7 +861,7 @@
;;
interix[[3-9]]*)
-@@ -3157,35 +3158,26 @@
+@@ -3241,35 +3242,26 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -910,7 +908,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -3197,6 +3189,18 @@
+@@ -3281,6 +3273,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -929,7 +927,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -3417,8 +3421,6 @@
+@@ -3501,8 +3505,6 @@
The last name is the one that the linker finds with -lNAME]])
_LT_DECL([], [soname_spec], [1],
[[The coded name of the library, if different from the real name]])
@@ -938,7 +936,7 @@
_LT_DECL([], [postinstall_cmds], [2],
[Command to use after installation of a shared archive])
_LT_DECL([], [postuninstall_cmds], [2],
-@@ -3531,7 +3533,6 @@
+@@ -3615,7 +3617,6 @@
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
m4_require([_LT_DECL_SED])dnl
m4_require([_LT_DECL_EGREP])dnl
@@ -946,7 +944,7 @@
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
-@@ -3661,8 +3662,8 @@
+@@ -3745,8 +3746,8 @@
fi
;;
esac
@@ -957,7 +955,7 @@
])# _LT_CMD_RELOAD
-@@ -3714,18 +3715,16 @@
+@@ -3798,18 +3799,16 @@
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
@@ -979,7 +977,7 @@
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
-@@ -3755,10 +3754,6 @@
+@@ -3839,10 +3838,6 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -990,7 +988,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
-@@ -3767,11 +3762,11 @@
+@@ -3851,11 +3846,11 @@
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
@@ -1004,7 +1002,7 @@
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
-@@ -3797,7 +3792,7 @@
+@@ -3881,7 +3876,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -1013,7 +1011,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -3935,19 +3930,7 @@
+@@ -4019,19 +4014,7 @@
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
@@ -1034,7 +1032,7 @@
AC_SUBST([DUMPBIN])
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
-@@ -3960,13 +3943,13 @@
+@@ -4044,13 +4027,13 @@
AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
[lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
@@ -1051,7 +1049,7 @@
cat conftest.out >&AS_MESSAGE_LOG_FD
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -3989,7 +3972,7 @@
+@@ -4073,7 +4056,7 @@
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
@@ -1060,7 +1058,7 @@
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
-@@ -4017,12 +4000,7 @@
+@@ -4101,12 +4084,7 @@
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
if test "$GCC" = yes; then
@@ -1074,7 +1072,7 @@
_LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
lt_cv_prog_compiler_rtti_exceptions,
-@@ -4039,7 +4017,6 @@
+@@ -4123,7 +4101,6 @@
m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_PROG_CC])dnl
@@ -1082,7 +1080,7 @@
AC_REQUIRE([LT_PATH_NM])dnl
AC_REQUIRE([LT_PATH_LD])dnl
m4_require([_LT_DECL_SED])dnl
-@@ -4165,7 +4142,7 @@
+@@ -4249,7 +4226,7 @@
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
@@ -1091,7 +1089,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -4327,11 +4304,6 @@
+@@ -4411,11 +4388,6 @@
# DJGPP does not support shared libraries at all
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -1103,7 +1101,7 @@
interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
-@@ -4470,8 +4442,8 @@
+@@ -4554,8 +4526,8 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -1114,7 +1112,7 @@
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-@@ -4501,7 +4473,7 @@
+@@ -4585,7 +4557,7 @@
;;
esac
;;
@@ -1123,7 +1121,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -4533,7 +4505,7 @@
+@@ -4617,7 +4589,7 @@
;;
solaris*)
case $cc_basename in
@@ -1132,7 +1130,7 @@
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4637,12 +4609,6 @@
+@@ -4721,12 +4693,6 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -1145,7 +1143,7 @@
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
-@@ -4685,13 +4651,6 @@
+@@ -4769,13 +4735,6 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
esac
@@ -1159,7 +1157,7 @@
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
-@@ -4755,7 +4714,7 @@
+@@ -4839,7 +4798,7 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
;;
@@ -1168,7 +1166,7 @@
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -4767,26 +4726,26 @@
+@@ -4851,26 +4810,26 @@
# All Alpha code is PIC.
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -1203,7 +1201,7 @@
esac
;;
esac
-@@ -4817,7 +4776,7 @@
+@@ -4901,7 +4860,7 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
case $cc_basename in
@@ -1212,7 +1210,7 @@
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-@@ -4927,10 +4886,8 @@
+@@ -5011,10 +4970,8 @@
aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -1224,7 +1222,7 @@
else
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
-@@ -4941,6 +4898,9 @@
+@@ -5025,6 +4982,9 @@
cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -1234,7 +1232,7 @@
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -5005,36 +4965,13 @@
+@@ -5089,36 +5049,13 @@
openbsd*)
with_gnu_ld=no
;;
@@ -1274,7 +1272,7 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-@@ -5068,12 +5005,11 @@
+@@ -5152,12 +5089,11 @@
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
@@ -1290,7 +1288,7 @@
_LT_EOF
fi
-@@ -5109,7 +5045,6 @@
+@@ -5193,7 +5129,6 @@
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1298,7 +1296,7 @@
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-@@ -5131,11 +5066,6 @@
+@@ -5215,11 +5150,6 @@
fi
;;
@@ -1310,7 +1308,7 @@
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -5165,12 +5095,11 @@
+@@ -5249,12 +5179,11 @@
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
@@ -1326,7 +1324,7 @@
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
-@@ -5181,17 +5110,13 @@
+@@ -5265,17 +5194,13 @@
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
@@ -1346,7 +1344,7 @@
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
-@@ -5207,17 +5132,17 @@
+@@ -5291,17 +5216,17 @@
fi
case $cc_basename in
@@ -1367,7 +1365,7 @@
fi
;;
esac
-@@ -5226,7 +5151,7 @@
+@@ -5310,7 +5235,7 @@
fi
;;
@@ -1376,7 +1374,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -5338,10 +5263,8 @@
+@@ -5422,10 +5347,8 @@
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -1388,7 +1386,7 @@
else
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
-@@ -5403,6 +5326,7 @@
+@@ -5487,6 +5410,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -1396,7 +1394,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -5430,7 +5354,7 @@
+@@ -5514,7 +5438,7 @@
# empty executable.
_LT_SYS_MODULE_PATH_AIX
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1405,7 +1403,7 @@
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-@@ -5445,13 +5369,8 @@
+@@ -5529,13 +5453,8 @@
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1421,7 +1419,7 @@
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared libraries.
_LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-@@ -5490,7 +5409,7 @@
+@@ -5574,7 +5493,7 @@
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
@@ -1430,7 +1428,7 @@
# The linker will automatically build a .lib file if we build a DLL.
_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
-@@ -5557,7 +5476,7 @@
+@@ -5641,7 +5560,7 @@
;;
hpux10*)
@@ -1439,7 +1437,7 @@
_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-@@ -5576,7 +5495,7 @@
+@@ -5660,7 +5579,7 @@
;;
hpux11*)
@@ -1448,7 +1446,7 @@
case $host_cpu in
hppa*64*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -5597,14 +5516,7 @@
+@@ -5681,14 +5600,7 @@
_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -1464,7 +1462,7 @@
;;
esac
fi
-@@ -5632,19 +5544,19 @@
+@@ -5716,19 +5628,19 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1488,7 +1486,7 @@
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-@@ -5653,7 +5565,7 @@
+@@ -5737,7 +5649,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1497,7 +1495,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -5706,17 +5618,17 @@
+@@ -5790,17 +5702,17 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_TAGVAR(hardcode_minus_L, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -1518,7 +1516,7 @@
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-@@ -5726,13 +5638,13 @@
+@@ -5810,13 +5722,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1535,7 +1533,7 @@
# Both c and cxx compiler support -rpath directly
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -5923,38 +5835,36 @@
+@@ -6007,38 +5919,36 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -1604,7 +1602,7 @@
;;
esac
fi
-@@ -6120,14 +6030,14 @@
+@@ -6204,14 +6114,14 @@
])# _LT_LANG_C_CONFIG
@@ -1627,7 +1625,7 @@
if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
(test "X$CXX" != "Xg++"))) ; then
-@@ -6135,6 +6045,22 @@
+@@ -6219,6 +6129,22 @@
else
_lt_caught_CXX_error=yes
fi
@@ -1650,7 +1648,7 @@
AC_LANG_PUSH(C++)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-@@ -6156,8 +6082,6 @@
+@@ -6240,8 +6166,6 @@
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -1659,7 +1657,7 @@
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -6260,7 +6184,7 @@
+@@ -6344,7 +6268,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -1668,7 +1666,7 @@
else
GXX=no
-@@ -6372,7 +6296,7 @@
+@@ -6456,7 +6380,7 @@
_LT_SYS_MODULE_PATH_AIX
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1677,7 +1675,7 @@
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-@@ -6387,13 +6311,8 @@
+@@ -6471,13 +6395,8 @@
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1693,7 +1691,7 @@
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
-@@ -6426,7 +6345,6 @@
+@@ -6510,7 +6429,6 @@
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1701,7 +1699,7 @@
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-@@ -6487,11 +6405,6 @@
+@@ -6571,11 +6489,6 @@
gnu*)
;;
@@ -1713,7 +1711,7 @@
hpux9*)
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -6516,7 +6429,7 @@
+@@ -6600,7 +6513,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1722,7 +1720,7 @@
;;
*)
if test "$GXX" = yes; then
-@@ -6581,7 +6494,7 @@
+@@ -6665,7 +6578,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1731,7 +1729,7 @@
;;
*)
if test "$GXX" = yes; then
-@@ -6624,7 +6537,7 @@
+@@ -6708,7 +6621,7 @@
case $cc_basename in
CC*)
# SGI C++
@@ -1740,7 +1738,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -6635,9 +6548,9 @@
+@@ -6719,9 +6632,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -1752,7 +1750,7 @@
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
-@@ -6666,7 +6579,7 @@
+@@ -6750,7 +6663,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1761,7 +1759,7 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -6703,26 +6616,26 @@
+@@ -6787,26 +6700,26 @@
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
@@ -1794,7 +1792,7 @@
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
-@@ -6730,7 +6643,7 @@
+@@ -6814,7 +6727,7 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -1803,7 +1801,7 @@
;;
cxx*)
# Compaq C++
-@@ -6749,9 +6662,9 @@
+@@ -6833,9 +6746,9 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1815,7 +1813,7 @@
# IBM XL 8.0 on PPC, with GNU ld
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -6771,13 +6684,13 @@
+@@ -6855,13 +6768,13 @@
_LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
@@ -1831,7 +1829,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -6846,7 +6759,7 @@
+@@ -6930,7 +6843,7 @@
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
_LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
@@ -1840,7 +1838,7 @@
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -6881,15 +6794,15 @@
+@@ -6965,15 +6878,15 @@
case $host in
osf3*)
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1859,7 +1857,7 @@
$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
-@@ -6905,17 +6818,17 @@
+@@ -6989,17 +6902,17 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1880,7 +1878,7 @@
;;
esac
-@@ -6925,7 +6838,7 @@
+@@ -7009,7 +6922,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -1889,7 +1887,7 @@
else
# FIXME: insert proper C++ library support
-@@ -6961,7 +6874,7 @@
+@@ -7045,7 +6958,7 @@
solaris*)
case $cc_basename in
@@ -1898,7 +1896,7 @@
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-@@ -6982,7 +6895,7 @@
+@@ -7066,7 +6979,7 @@
esac
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -1907,7 +1905,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -7009,7 +6922,7 @@
+@@ -7093,7 +7006,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -1916,7 +1914,7 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
-@@ -7020,7 +6933,7 @@
+@@ -7104,7 +7017,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -1925,7 +1923,7 @@
fi
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-@@ -7074,10 +6987,6 @@
+@@ -7158,10 +7071,6 @@
CC*)
_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -1936,7 +1934,7 @@
;;
*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -7324,7 +7233,7 @@
+@@ -7408,7 +7317,7 @@
solaris*)
case $cc_basename in
@@ -1945,7 +1943,7 @@
# The more standards-conforming stlport4 library is
# incompatible with the Cstd library. Avoid specifying
# it if it's in CXXFLAGS. Ignore libCrun as
-@@ -7368,16 +7277,32 @@
+@@ -7452,16 +7361,32 @@
])# _LT_SYS_HIDDEN_LIBDEPS
@@ -1982,7 +1980,7 @@
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -7396,8 +7321,6 @@
+@@ -7480,8 +7405,6 @@
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -1991,7 +1989,7 @@
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -7497,17 +7420,32 @@
+@@ -7581,17 +7504,32 @@
])# _LT_LANG_F77_CONFIG
@@ -2029,7 +2027,7 @@
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -7526,8 +7464,6 @@
+@@ -7610,8 +7548,6 @@
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -2038,7 +2036,7 @@
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -7673,8 +7609,6 @@
+@@ -7757,8 +7693,6 @@
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -2047,7 +2045,7 @@
if test -n "$compiler"; then
_LT_COMPILER_NO_RTTI($1)
-@@ -8036,7 +7970,7 @@
+@@ -8120,7 +8054,7 @@
func_dirname ()
{
# Extract subdirectory from the argument.
@@ -2056,7 +2054,7 @@
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
-@@ -8047,7 +7981,7 @@
+@@ -8131,7 +8065,7 @@
# func_basename file
func_basename ()
{
@@ -2065,7 +2063,7 @@
}
dnl func_dirname_and_basename
-@@ -8063,8 +7997,10 @@
+@@ -8147,8 +8081,10 @@
func_stripname ()
{
case ${2} in
@@ -2078,7 +2076,7 @@
esac
}
-@@ -8075,20 +8011,20 @@
+@@ -8159,20 +8095,20 @@
# func_opt_split
func_opt_split ()
{
@@ -2103,7 +2101,7 @@
}
# func_arith arithmetic-term...
-@@ -8136,15 +8072,14 @@
+@@ -8220,15 +8156,14 @@
# Helper functions for option handling. -*- Autoconf -*-
#
@@ -2121,7 +2119,7 @@
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-@@ -8259,7 +8194,7 @@
+@@ -8343,7 +8278,7 @@
[enable_win32_dll=yes
case $host in
@@ -2130,7 +2128,7 @@
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
-@@ -8267,13 +8202,13 @@
+@@ -8351,13 +8286,13 @@
esac
test -z "$AS" && AS=as
@@ -2147,7 +2145,7 @@
])# win32-dll
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-@@ -8633,29 +8568,29 @@
+@@ -8717,29 +8652,29 @@
# Generated from ltversion.in.
@@ -2184,7 +2182,7 @@
# These exist entirely to fool aclocal when bootstrapping libtool.
#
-@@ -8725,6 +8660,7 @@
+@@ -8809,6 +8744,7 @@
m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
@@ -2192,7 +2190,7 @@
m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-@@ -8737,13 +8673,6 @@
+@@ -8821,13 +8757,6 @@
m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
@@ -2206,25 +2204,25 @@
# nls.m4 serial 5 (gettext-0.18)
dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
-@@ -8915,7 +8844,7 @@
+@@ -8999,7 +8928,7 @@
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-_PKG_TEXT])
-+_PKG_TEXT])dnl
++_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
-@@ -8926,7 +8855,7 @@
+@@ -9010,7 +8939,7 @@
_PKG_TEXT
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-@@ -9516,6 +9445,46 @@
+@@ -9600,6 +9529,46 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
@@ -2271,10 +2269,8 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
-Index: quilt-UA6TYS/client/Makefile.in
-===================================================================
---- quilt-UA6TYS.orig/client/Makefile.in 2010-09-27 16:52:39.000000000 +0200
-+++ quilt-UA6TYS/client/Makefile.in 2010-10-01 13:00:04.000000000 +0200
+--- a/client/Makefile.in
++++ b/client/Makefile.in
@@ -45,7 +45,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -2292,7 +2288,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -323,6 +324,7 @@
+@@ -324,6 +325,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -2300,7 +2296,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -344,7 +346,7 @@
+@@ -345,7 +347,7 @@
-I$(top_srcdir)/metadata \
-I$(top_srcdir)/common \
$(GLIB_CFLAGS) $(DBUS_CFLAGS) \
@@ -2309,7 +2305,7 @@
-DGVFS_MODULE_DIR=\"$(libdir)/gvfs/modules\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
-DDBUS_API_SUBJECT_TO_CHANGE
-@@ -396,7 +398,7 @@
+@@ -397,7 +399,7 @@
@USE_FUSE_TRUE@ -I$(top_srcdir) \
@USE_FUSE_TRUE@ -I$(top_srcdir)/common \
@USE_FUSE_TRUE@ $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(FUSE_CFLAGS) \
@@ -2318,7 +2314,7 @@
@USE_FUSE_TRUE@ -DDBUS_API_SUBJECT_TO_CHANGE
@USE_FUSE_TRUE at gvfs_fuse_daemon_LDADD = \
-@@ -407,7 +409,7 @@
+@@ -408,7 +410,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -2327,7 +2323,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -432,9 +434,9 @@
+@@ -433,9 +435,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2339,10 +2335,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-giomodulesLTLIBRARIES: $(giomodules_LTLIBRARIES)
-Index: quilt-UA6TYS/common/Makefile.in
-===================================================================
---- quilt-UA6TYS.orig/common/Makefile.in 2010-09-27 16:52:39.000000000 +0200
-+++ quilt-UA6TYS/common/Makefile.in 2010-10-01 13:00:04.000000000 +0200
+--- a/common/Makefile.in
++++ b/common/Makefile.in
@@ -41,7 +41,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -2385,7 +2379,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -304,6 +306,7 @@
+@@ -305,6 +307,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -2393,7 +2387,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -320,11 +323,12 @@
+@@ -321,11 +324,12 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
NULL =
@@ -2408,7 +2402,7 @@
-DDBUS_API_SUBJECT_TO_CHANGE
libgvfscommon_la_SOURCES = \
-@@ -342,7 +346,7 @@
+@@ -343,7 +347,7 @@
# needed by cygwin (see bug #564003)
@@ -2417,7 +2411,7 @@
libgvfscommon_la_LIBADD = \
$(DBUS_LIBS) \
$(GLIB_LIBS) \
-@@ -356,6 +360,7 @@
+@@ -357,6 +361,7 @@
@HAVE_AVAHI_TRUE at libgvfscommon_dnssd_la_CFLAGS = \
@HAVE_AVAHI_TRUE@ $(AVAHI_CFLAGS)
@@ -2425,7 +2419,7 @@
@HAVE_AVAHI_TRUE at libgvfscommon_dnssd_la_LIBADD = \
@HAVE_AVAHI_TRUE@ libgvfscommon.la \
@HAVE_AVAHI_TRUE@ $(AVAHI_LIBS) \
-@@ -365,7 +370,7 @@
+@@ -366,7 +371,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -2434,7 +2428,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -390,37 +395,37 @@
+@@ -391,37 +396,37 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2486,7 +2480,7 @@
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
-@@ -429,7 +434,7 @@
+@@ -430,7 +435,7 @@
libgvfscommon-dnssd.la: $(libgvfscommon_dnssd_la_OBJECTS) $(libgvfscommon_dnssd_la_DEPENDENCIES)
$(AM_V_CCLD)$(libgvfscommon_dnssd_la_LINK) $(am_libgvfscommon_dnssd_la_rpath) $(libgvfscommon_dnssd_la_OBJECTS) $(libgvfscommon_dnssd_la_LIBADD) $(LIBS)
libgvfscommon.la: $(libgvfscommon_la_OBJECTS) $(libgvfscommon_la_DEPENDENCIES)
@@ -2495,7 +2489,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -582,7 +587,7 @@
+@@ -583,7 +588,7 @@
check: check-am
all-am: Makefile $(LTLIBRARIES)
installdirs:
@@ -2504,7 +2498,7 @@
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
-@@ -612,7 +617,7 @@
+@@ -613,7 +618,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
@@ -2513,7 +2507,7 @@
mostlyclean-am
distclean: distclean-am
-@@ -633,13 +638,13 @@
+@@ -634,13 +639,13 @@
info-am:
@@ -2529,7 +2523,7 @@
install-html: install-html-am
-@@ -679,23 +684,23 @@
+@@ -680,23 +685,23 @@
ps-am:
@@ -2558,10 +2552,8 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-Index: quilt-UA6TYS/configure
-===================================================================
---- quilt-UA6TYS.orig/configure 2010-09-27 16:52:42.000000000 +0200
-+++ quilt-UA6TYS/configure 2010-10-01 13:00:08.000000000 +0200
+--- a/configure
++++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -2780,7 +2772,7 @@
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
-@@ -999,8 +1138,9 @@
+@@ -997,8 +1136,9 @@
fi
case $ac_option in
@@ -2792,7 +2784,7 @@
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -1554,6 +1694,8 @@
+@@ -1552,6 +1692,8 @@
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
@@ -2801,7 +2793,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]
-@@ -1731,7 +1873,7 @@
+@@ -1727,7 +1869,7 @@
if $ac_init_version; then
cat <<\_ACEOF
configure
@@ -2810,7 +2802,7 @@
Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
-@@ -1849,7 +1991,7 @@
+@@ -1845,7 +1987,7 @@
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -2819,7 +2811,7 @@
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
-@@ -2163,7 +2305,7 @@
+@@ -2159,7 +2301,7 @@
else
ac_header_preproc=no
fi
@@ -2828,7 +2820,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
-@@ -2207,7 +2349,7 @@
+@@ -2203,7 +2345,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
@@ -2837,7 +2829,7 @@
$ $0 $@
-@@ -2465,7 +2607,7 @@
+@@ -2461,7 +2603,7 @@
|| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "failed to load site script $ac_site_file
@@ -2846,7 +2838,7 @@
fi
done
-@@ -2690,11 +2832,11 @@
+@@ -2686,11 +2828,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -2860,7 +2852,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -3062,6 +3204,29 @@
+@@ -3058,6 +3200,29 @@
@@ -2890,7 +2882,7 @@
ac_config_headers="$ac_config_headers config.h"
-@@ -3076,11 +3241,11 @@
+@@ -3072,11 +3237,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -2904,7 +2896,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -3481,7 +3646,7 @@
+@@ -3477,7 +3642,7 @@
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "no acceptable C compiler found in \$PATH
@@ -2913,7 +2905,7 @@
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -3596,7 +3761,7 @@
+@@ -3592,7 +3757,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "C compiler cannot create executables
@@ -2922,7 +2914,7 @@
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-@@ -3639,7 +3804,7 @@
+@@ -3635,7 +3800,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of executables: cannot compile and link
@@ -2931,7 +2923,7 @@
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -3698,7 +3863,7 @@
+@@ -3694,7 +3859,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
@@ -2940,7 +2932,7 @@
fi
fi
fi
-@@ -3750,7 +3915,7 @@
+@@ -3746,7 +3911,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of object files: cannot compile
@@ -2949,7 +2941,7 @@
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-@@ -4535,7 +4700,7 @@
+@@ -4531,7 +4696,7 @@
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "no acceptable C compiler found in \$PATH
@@ -2958,7 +2950,7 @@
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -4943,7 +5108,7 @@
+@@ -4939,7 +5104,7 @@
# Broken: fails on valid input.
continue
fi
@@ -2967,7 +2959,7 @@
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
-@@ -4959,11 +5124,11 @@
+@@ -4955,11 +5120,11 @@
ac_preproc_ok=:
break
fi
@@ -2981,7 +2973,7 @@
if $ac_preproc_ok; then :
break
fi
-@@ -5002,7 +5167,7 @@
+@@ -4998,7 +5163,7 @@
# Broken: fails on valid input.
continue
fi
@@ -2990,7 +2982,7 @@
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
-@@ -5018,18 +5183,18 @@
+@@ -5014,18 +5179,18 @@
ac_preproc_ok=:
break
fi
@@ -3012,7 +3004,7 @@
fi
ac_ext=c
-@@ -5120,8 +5285,8 @@
+@@ -5116,8 +5281,8 @@
@@ -3023,7 +3015,7 @@
-@@ -5159,7 +5324,7 @@
+@@ -5155,7 +5320,7 @@
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
@@ -3032,7 +3024,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -5192,7 +5357,7 @@
+@@ -5188,7 +5353,7 @@
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
@@ -3041,7 +3033,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -5208,75 +5373,6 @@
+@@ -5204,75 +5369,6 @@
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -3117,7 +3109,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
if test "${ac_cv_path_SED+set}" = set; then :
-@@ -5742,11 +5838,8 @@
+@@ -5738,11 +5834,8 @@
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
@@ -3131,7 +3123,7 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-@@ -5790,7 +5883,7 @@
+@@ -5786,7 +5879,7 @@
fi
if test -z "$DUMPBIN"; then
ac_ct_DUMPBIN=$DUMPBIN
@@ -3140,7 +3132,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-@@ -5845,15 +5938,6 @@
+@@ -5841,15 +5934,6 @@
fi
fi
@@ -3156,24 +3148,24 @@
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
-@@ -5873,13 +5957,13 @@
+@@ -5869,13 +5953,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:5960: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:5956: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:5963: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:5959: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-+ (eval echo "\"\$as_me:5966: output\"" >&5)
++ (eval echo "\"\$as_me:5962: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -5925,11 +6009,6 @@
+@@ -5921,11 +6005,6 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -3185,7 +3177,7 @@
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
-@@ -5994,8 +6073,8 @@
+@@ -5990,8 +6069,8 @@
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
@@ -3196,7 +3188,7 @@
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
-@@ -6266,18 +6345,16 @@
+@@ -6262,18 +6341,16 @@
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
@@ -3218,7 +3210,7 @@
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
-@@ -6307,10 +6384,6 @@
+@@ -6303,10 +6380,6 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3229,7 +3221,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
-@@ -6319,11 +6392,11 @@
+@@ -6315,11 +6388,11 @@
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
@@ -3243,7 +3235,7 @@
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
-@@ -6349,7 +6422,7 @@
+@@ -6345,7 +6418,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3252,7 +3244,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
-@@ -6761,18 +6834,6 @@
+@@ -6757,18 +6830,6 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -3271,7 +3263,7 @@
-@@ -6942,8 +7003,8 @@
+@@ -6938,8 +6999,8 @@
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
@@ -3282,16 +3274,16 @@
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && test -s "$nlist"; then
-@@ -7096,7 +7157,7 @@
+@@ -7092,7 +7153,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-+ echo '#line 7160 "configure"' > conftest.$ac_ext
++ echo '#line 7156 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7808,38 +7869,6 @@
+@@ -7804,38 +7865,6 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
@@ -3330,7 +3322,7 @@
case $host_os in
rhapsody* | darwin1.[012])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -7867,7 +7896,7 @@
+@@ -7863,7 +7892,7 @@
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
@@ -3339,7 +3331,7 @@
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
-@@ -8020,8 +8049,6 @@
+@@ -8016,8 +8045,6 @@
@@ -3348,7 +3340,7 @@
# Set options
-@@ -8144,7 +8171,6 @@
+@@ -8140,7 +8167,6 @@
@@ -3356,7 +3348,7 @@
test -z "$LN_S" && LN_S="ln -s"
-@@ -8194,6 +8220,19 @@
+@@ -8190,6 +8216,19 @@
@@ -3376,7 +3368,7 @@
case $host_os in
aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
-@@ -8206,6 +8245,23 @@
+@@ -8202,6 +8241,23 @@
;;
esac
@@ -3400,7 +3392,7 @@
# Global variables:
ofile=libtool
can_build_shared=yes
-@@ -8234,7 +8290,7 @@
+@@ -8230,7 +8286,7 @@
*) break;;
esac
done
@@ -3409,7 +3401,7 @@
# Only perform the check for file, if the check method requires it
-@@ -8439,12 +8495,7 @@
+@@ -8435,12 +8491,7 @@
lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
@@ -3423,17 +3415,17 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-@@ -8464,15 +8515,15 @@
+@@ -8460,15 +8511,15 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8518: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8514: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:8522: \$? = $ac_status" >&5
++ echo "$as_me:8518: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -3442,7 +3434,7 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
-@@ -8550,12 +8601,6 @@
+@@ -8546,12 +8597,6 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -3455,7 +3447,7 @@
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
-@@ -8598,13 +8643,6 @@
+@@ -8594,13 +8639,6 @@
lt_prog_compiler_pic='-fPIC'
;;
esac
@@ -3469,7 +3461,7 @@
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
-@@ -8667,7 +8705,7 @@
+@@ -8663,7 +8701,7 @@
lt_prog_compiler_pic='--shared'
lt_prog_compiler_static='--static'
;;
@@ -3478,7 +3470,7 @@
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
-@@ -8679,26 +8717,26 @@
+@@ -8675,26 +8713,26 @@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -3513,7 +3505,7 @@
esac
;;
esac
-@@ -8729,7 +8767,7 @@
+@@ -8725,7 +8763,7 @@
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
case $cc_basename in
@@ -3522,17 +3514,17 @@
lt_prog_compiler_wl='-Qoption ld ';;
*)
lt_prog_compiler_wl='-Wl,';;
-@@ -8816,15 +8854,15 @@
+@@ -8812,15 +8850,15 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8857: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8853: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:8861: \$? = $ac_status" >&5
++ echo "$as_me:8857: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -3541,7 +3533,7 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works=yes
-@@ -8872,7 +8910,7 @@
+@@ -8868,7 +8906,7 @@
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
@@ -3550,17 +3542,17 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works=yes
-@@ -8921,16 +8959,16 @@
+@@ -8917,16 +8955,16 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8962: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8958: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:8966: \$? = $ac_status" >&5
++ echo "$as_me:8962: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -3570,17 +3562,17 @@
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
-@@ -8976,16 +9014,16 @@
+@@ -8972,16 +9010,16 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9017: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9013: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:9021: \$? = $ac_status" >&5
++ echo "$as_me:9017: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -3590,7 +3582,7 @@
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
-@@ -9095,36 +9133,13 @@
+@@ -9091,36 +9129,13 @@
openbsd*)
with_gnu_ld=no
;;
@@ -3630,7 +3622,7 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-@@ -9158,12 +9173,11 @@
+@@ -9154,12 +9169,11 @@
ld_shlibs=no
cat <<_LT_EOF 1>&2
@@ -3646,7 +3638,7 @@
_LT_EOF
fi
-@@ -9199,7 +9213,6 @@
+@@ -9195,7 +9209,6 @@
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -3654,7 +3646,7 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
-@@ -9221,11 +9234,6 @@
+@@ -9217,11 +9230,6 @@
fi
;;
@@ -3666,7 +3658,7 @@
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
-@@ -9255,12 +9263,11 @@
+@@ -9251,12 +9259,11 @@
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
@@ -3682,7 +3674,7 @@
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
-@@ -9271,17 +9278,13 @@
+@@ -9267,17 +9274,13 @@
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
@@ -3702,7 +3694,7 @@
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
-@@ -9297,17 +9300,17 @@
+@@ -9293,17 +9296,17 @@
fi
case $cc_basename in
@@ -3723,7 +3715,7 @@
fi
;;
esac
-@@ -9316,7 +9319,7 @@
+@@ -9312,7 +9315,7 @@
fi
;;
@@ -3732,7 +3724,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9428,10 +9431,8 @@
+@@ -9424,10 +9427,8 @@
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -3744,7 +3736,7 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
-@@ -9493,6 +9494,7 @@
+@@ -9489,6 +9490,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -3752,7 +3744,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9549,7 +9551,7 @@
+@@ -9545,7 +9547,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -3761,7 +3753,7 @@
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-@@ -9593,13 +9595,8 @@
+@@ -9589,13 +9591,8 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -3777,7 +3769,7 @@
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds its shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-@@ -9638,7 +9635,7 @@
+@@ -9634,7 +9631,7 @@
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
@@ -3786,7 +3778,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_from_new_cmds='true'
# FIXME: Should let the user specify the lib program.
-@@ -9654,11 +9651,7 @@
+@@ -9650,11 +9647,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
@@ -3799,7 +3791,7 @@
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -9666,7 +9659,7 @@
+@@ -9662,7 +9655,7 @@
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -3808,7 +3800,7 @@
archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -9732,7 +9725,7 @@
+@@ -9728,7 +9721,7 @@
;;
hpux10*)
@@ -3817,7 +3809,7 @@
archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-@@ -9751,7 +9744,7 @@
+@@ -9747,7 +9740,7 @@
;;
hpux11*)
@@ -3826,7 +3818,7 @@
case $host_cpu in
hppa*64*)
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -9772,46 +9765,7 @@
+@@ -9768,46 +9761,7 @@
archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -3874,7 +3866,7 @@
;;
esac
fi
-@@ -9839,7 +9793,7 @@
+@@ -9835,7 +9789,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -3883,7 +3875,7 @@
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
-@@ -9850,15 +9804,15 @@
+@@ -9846,15 +9800,15 @@
int foo(void) {}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -3902,7 +3894,7 @@
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -9867,7 +9821,7 @@
+@@ -9863,7 +9817,7 @@
link_all_deplibs=yes
;;
@@ -3911,7 +3903,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9920,17 +9874,17 @@
+@@ -9916,17 +9870,17 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -3932,7 +3924,7 @@
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -9940,13 +9894,13 @@
+@@ -9936,13 +9890,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -3949,7 +3941,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10149,50 +10103,44 @@
+@@ -10145,50 +10099,44 @@
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
@@ -4029,7 +4021,7 @@
;;
esac
fi
-@@ -10363,23 +10311,16 @@
+@@ -10359,23 +10307,16 @@
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
@@ -4059,7 +4051,7 @@
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
-@@ -10392,7 +10333,7 @@
+@@ -10388,7 +10329,7 @@
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
@@ -4068,7 +4060,7 @@
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
-@@ -10412,13 +10353,7 @@
+@@ -10408,13 +10349,7 @@
if (lt_foo != "") { lt_freq[lt_foo]++; }
if (lt_freq[lt_foo] == 1) { print lt_foo; }
}'`
@@ -4083,7 +4075,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -10506,7 +10441,7 @@
+@@ -10502,7 +10437,7 @@
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4092,7 +4084,7 @@
;;
esac
;;
-@@ -10559,12 +10494,23 @@
+@@ -10555,12 +10490,23 @@
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -4118,7 +4110,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
-@@ -10664,19 +10610,6 @@
+@@ -10660,19 +10606,6 @@
hardcode_into_libs=yes
;;
@@ -4138,7 +4130,7 @@
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
-@@ -10719,10 +10652,8 @@
+@@ -10715,10 +10648,8 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -4150,7 +4142,7 @@
;;
interix[3-9]*)
-@@ -10789,17 +10720,12 @@
+@@ -10785,17 +10716,12 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -4173,7 +4165,7 @@
/* end confdefs.h. */
int
-@@ -10812,31 +10738,23 @@
+@@ -10808,31 +10734,23 @@
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
@@ -4210,7 +4202,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10848,6 +10766,18 @@
+@@ -10844,6 +10762,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4229,7 +4221,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11138,11 +11068,6 @@
+@@ -11134,11 +11064,6 @@
@@ -4241,16 +4233,16 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
-@@ -11473,7 +11398,7 @@
+@@ -11469,7 +11394,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-+#line 11401 "configure"
++#line 11397 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11514,13 +11439,7 @@
+@@ -11510,13 +11435,7 @@
# endif
#endif
@@ -4265,7 +4257,7 @@
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11529,11 +11448,7 @@
+@@ -11525,11 +11444,7 @@
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -4278,16 +4270,16 @@
/* dlclose (self); */
}
else
-@@ -11579,7 +11494,7 @@
+@@ -11575,7 +11490,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-+#line 11497 "configure"
++#line 11493 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11620,13 +11535,7 @@
+@@ -11616,13 +11531,7 @@
# endif
#endif
@@ -4302,7 +4294,7 @@
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11635,11 +11544,7 @@
+@@ -11631,11 +11540,7 @@
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -4315,7 +4307,16 @@
/* dlclose (self); */
}
else
-@@ -12672,7 +12577,6 @@
+@@ -12196,7 +12101,7 @@
+ enableval=$enable_schemas_compile; case ${enableval} in
+ yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;
+ no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
+- *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;;
+ esac
+ fi
+
+@@ -12781,7 +12686,6 @@
Alternatively, you may set the environment variables GLIB_CFLAGS
and GLIB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4323,7 +4324,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -12687,8 +12591,7 @@
+@@ -12796,8 +12700,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4333,7 +4334,7 @@
else
GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
GLIB_LIBS=$pkg_cv_GLIB_LIBS
-@@ -12764,7 +12667,6 @@
+@@ -12873,7 +12776,6 @@
Alternatively, you may set the environment variables DBUS_CFLAGS
and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4341,7 +4342,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -12779,8 +12681,7 @@
+@@ -12888,8 +12790,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4351,7 +4352,7 @@
else
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
DBUS_LIBS=$pkg_cv_DBUS_LIBS
-@@ -14354,7 +14255,6 @@
+@@ -14463,7 +14364,6 @@
Alternatively, you may set the environment variables HTTP_CFLAGS
and HTTP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4359,7 +4360,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -14369,8 +14269,7 @@
+@@ -14478,8 +14378,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4369,7 +4370,7 @@
else
HTTP_CFLAGS=$pkg_cv_HTTP_CFLAGS
HTTP_LIBS=$pkg_cv_HTTP_LIBS
-@@ -14691,7 +14590,6 @@
+@@ -14800,7 +14699,6 @@
Alternatively, you may set the environment variables UDEV_CFLAGS
and UDEV_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4377,7 +4378,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -14706,8 +14604,7 @@
+@@ -14815,8 +14713,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4387,7 +4388,7 @@
else
UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS
UDEV_LIBS=$pkg_cv_UDEV_LIBS
-@@ -14808,7 +14705,6 @@
+@@ -14917,7 +14814,6 @@
Alternatively, you may set the environment variables FUSE_CFLAGS
and FUSE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4395,7 +4396,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -14823,8 +14719,7 @@
+@@ -14932,8 +14828,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4405,33 +4406,15 @@
else
FUSE_CFLAGS=$pkg_cv_FUSE_CFLAGS
FUSE_LIBS=$pkg_cv_FUSE_LIBS
-@@ -14934,7 +14829,6 @@
- Alternatively, you may set the environment variables GCONF_CFLAGS
- and GCONF_LIBS to avoid the need to call pkg-config.
+@@ -15111,7 +15006,6 @@
+ Alternatively, you may set the environment variables GDU_CFLAGS
+ and GDU_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
-
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -14949,8 +14843,7 @@
- See the pkg-config man page for more details.
-
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details" "$LINENO" 5; }
--
-+See \`config.log' for more details" "$LINENO" 5 ; }
- else
- GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
- GCONF_LIBS=$pkg_cv_GCONF_LIBS
-@@ -15128,7 +15021,6 @@
- Alternatively, you may set the environment variables GDU_CFLAGS
- and GDU_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details." "$LINENO" 5
--
- elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -15143,8 +15035,7 @@
+@@ -15126,8 +15020,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4441,7 +4424,7 @@
else
GDU_CFLAGS=$pkg_cv_GDU_CFLAGS
GDU_LIBS=$pkg_cv_GDU_LIBS
-@@ -15256,7 +15147,6 @@
+@@ -15239,7 +15132,6 @@
Alternatively, you may set the environment variables HAL_CFLAGS
and HAL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4449,7 +4432,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -15271,8 +15161,7 @@
+@@ -15254,8 +15146,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4459,7 +4442,7 @@
else
HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
HAL_LIBS=$pkg_cv_HAL_LIBS
-@@ -15429,7 +15318,6 @@
+@@ -15412,7 +15303,6 @@
Alternatively, you may set the environment variables GUDEV_CFLAGS
and GUDEV_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4467,7 +4450,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -15444,8 +15332,7 @@
+@@ -15427,8 +15317,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4477,7 +4460,7 @@
else
GUDEV_CFLAGS=$pkg_cv_GUDEV_CFLAGS
GUDEV_LIBS=$pkg_cv_GUDEV_LIBS
-@@ -15564,7 +15451,6 @@
+@@ -15547,7 +15436,6 @@
Alternatively, you may set the environment variables CDDA_CFLAGS
and CDDA_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4485,7 +4468,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -15579,8 +15465,7 @@
+@@ -15562,8 +15450,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4495,7 +4478,7 @@
else
CDDA_CFLAGS=$pkg_cv_CDDA_CFLAGS
CDDA_LIBS=$pkg_cv_CDDA_LIBS
-@@ -15690,7 +15575,6 @@
+@@ -15673,7 +15560,6 @@
Alternatively, you may set the environment variables AFC_CFLAGS
and AFC_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4503,7 +4486,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -15705,8 +15589,7 @@
+@@ -15688,8 +15574,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4513,7 +4496,7 @@
else
AFC_CFLAGS=$pkg_cv_AFC_CFLAGS
AFC_LIBS=$pkg_cv_AFC_LIBS
-@@ -15819,7 +15702,6 @@
+@@ -15802,7 +15687,6 @@
Alternatively, you may set the environment variables OBEXFTP_CFLAGS
and OBEXFTP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4521,7 +4504,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -15834,8 +15716,7 @@
+@@ -15817,8 +15701,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4531,7 +4514,7 @@
else
OBEXFTP_CFLAGS=$pkg_cv_OBEXFTP_CFLAGS
OBEXFTP_LIBS=$pkg_cv_OBEXFTP_LIBS
-@@ -15962,7 +15843,6 @@
+@@ -15945,7 +15828,6 @@
Alternatively, you may set the environment variables GPHOTO2_CFLAGS
and GPHOTO2_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4539,7 +4522,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -15977,8 +15857,7 @@
+@@ -15960,8 +15842,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4549,7 +4532,7 @@
else
GPHOTO2_CFLAGS=$pkg_cv_GPHOTO2_CFLAGS
GPHOTO2_LIBS=$pkg_cv_GPHOTO2_LIBS
-@@ -16093,7 +15972,6 @@
+@@ -16076,7 +15957,6 @@
Alternatively, you may set the environment variables KEYRING_CFLAGS
and KEYRING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4557,7 +4540,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -16108,8 +15986,7 @@
+@@ -16091,8 +15971,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4567,7 +4550,7 @@
else
KEYRING_CFLAGS=$pkg_cv_KEYRING_CFLAGS
KEYRING_LIBS=$pkg_cv_KEYRING_LIBS
-@@ -16949,6 +16826,10 @@
+@@ -16932,6 +16811,10 @@
am__EXEEXT_FALSE=
fi
@@ -4578,7 +4561,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
as_fn_error $? "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
-@@ -17478,7 +17359,7 @@
+@@ -17457,7 +17340,7 @@
# values after options handling.
ac_log="
This file was extended by $as_me, which was
@@ -4587,7 +4570,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -17544,7 +17425,7 @@
+@@ -17523,7 +17406,7 @@
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
config.status
@@ -4596,7 +4579,7 @@
with options \\"\$ac_cs_config\\"
Copyright (C) 2010 Free Software Foundation, Inc.
-@@ -17565,11 +17446,16 @@
+@@ -17544,11 +17427,16 @@
while test $# != 0
do
case $1 in
@@ -4614,7 +4597,7 @@
*)
ac_option=$1
ac_optarg=$2
-@@ -17591,6 +17477,7 @@
+@@ -17570,6 +17458,7 @@
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
@@ -4622,7 +4605,7 @@
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
-@@ -17666,143 +17553,131 @@
+@@ -17645,143 +17534,131 @@
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
@@ -4885,7 +4868,7 @@
GREP \
EGREP \
FGREP \
-@@ -17826,6 +17701,8 @@
+@@ -17805,6 +17682,8 @@
lt_cv_sys_global_symbol_to_cdecl \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -4894,7 +4877,7 @@
lt_prog_compiler_no_builtin_flag \
lt_prog_compiler_wl \
lt_prog_compiler_pic \
-@@ -17855,13 +17732,12 @@
+@@ -17834,13 +17713,12 @@
libname_spec \
library_names_spec \
soname_spec \
@@ -4910,7 +4893,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -17888,9 +17764,9 @@
+@@ -17867,9 +17745,9 @@
finish_cmds \
sys_lib_search_path_spec \
sys_lib_dlsearch_path_spec; do
@@ -4922,7 +4905,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -17898,6 +17774,12 @@
+@@ -17877,6 +17755,12 @@
esac
done
@@ -4935,7 +4918,7 @@
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
-@@ -17949,7 +17831,7 @@
+@@ -17927,7 +17811,7 @@
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -4944,7 +4927,7 @@
esac
done
-@@ -18265,7 +18147,7 @@
+@@ -18243,7 +18127,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -4953,7 +4936,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -18293,7 +18175,7 @@
+@@ -18271,7 +18155,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -4962,7 +4945,7 @@
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
-@@ -18320,7 +18202,7 @@
+@@ -18298,7 +18182,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -4971,7 +4954,7 @@
esac
;;
esac
-@@ -18656,8 +18538,7 @@
+@@ -18634,8 +18518,7 @@
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -4981,7 +4964,7 @@
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
-@@ -18705,12 +18586,6 @@
+@@ -18683,12 +18566,6 @@
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
@@ -4994,7 +4977,7 @@
# The host system.
host_alias=$host_alias
host=$host
-@@ -18760,6 +18635,10 @@
+@@ -18738,6 +18615,10 @@
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
@@ -5005,7 +4988,7 @@
# An object symbol dumper.
OBJDUMP=$lt_OBJDUMP
-@@ -18781,9 +18660,6 @@
+@@ -18759,9 +18640,6 @@
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
@@ -5015,7 +4998,7 @@
# A C compiler.
LTCC=$lt_CC
-@@ -18805,6 +18681,12 @@
+@@ -18783,6 +18661,12 @@
# The name of the directory that contains temporary libtool files.
objdir=$objdir
@@ -5028,7 +5011,7 @@
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
-@@ -18867,9 +18749,6 @@
+@@ -18845,9 +18729,6 @@
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
@@ -5038,7 +5021,7 @@
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
-@@ -18909,10 +18788,6 @@
+@@ -18887,10 +18768,6 @@
# The linker used to build libraries.
LD=$lt_LD
@@ -5049,7 +5032,7 @@
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
-@@ -19172,7 +19047,7 @@
+@@ -19150,7 +19027,7 @@
func_dirname ()
{
# Extract subdirectory from the argument.
@@ -5058,7 +5041,7 @@
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
-@@ -19183,7 +19058,7 @@
+@@ -19161,7 +19038,7 @@
# func_basename file
func_basename ()
{
@@ -5067,7 +5050,7 @@
}
-@@ -19196,8 +19071,10 @@
+@@ -19174,8 +19051,10 @@
func_stripname ()
{
case ${2} in
@@ -5080,7 +5063,7 @@
esac
}
-@@ -19208,20 +19085,20 @@
+@@ -19186,20 +19065,20 @@
# func_opt_split
func_opt_split ()
{
@@ -5105,11 +5088,9 @@
}
# func_arith arithmetic-term...
-Index: quilt-UA6TYS/daemon/Makefile.in
-===================================================================
---- quilt-UA6TYS.orig/daemon/Makefile.in 2010-09-27 16:52:40.000000000 +0200
-+++ quilt-UA6TYS/daemon/Makefile.in 2010-10-01 13:00:05.000000000 +0200
-@@ -78,34 +78,65 @@
+--- a/daemon/Makefile.in
++++ b/daemon/Makefile.in
+@@ -80,34 +80,66 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -5142,6 +5123,7 @@
+ 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)$(gvfs_gschemas_convertdir)" \
+ "$(DESTDIR)$(mountdir)" "$(DESTDIR)$(servicedir)"
+LTLIBRARIES = $(privlib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
@@ -5193,13 +5175,14 @@
@HAVE_HTTP_TRUE at am__EXEEXT_1 = gvfsd-http$(EXEEXT) gvfsd-dav$(EXEEXT)
@HAVE_SAMBA_TRUE at am__EXEEXT_2 = gvfsd-smb-browse$(EXEEXT) \
@HAVE_SAMBA_TRUE@ gvfsd-smb$(EXEEXT)
-@@ -116,16 +147,13 @@
- @HAVE_AVAHI_TRUE at am__EXEEXT_7 = gvfsd-dnssd$(EXEEXT)
- @HAVE_ARCHIVE_TRUE at am__EXEEXT_8 = gvfsd-archive$(EXEEXT)
- @USE_AFC_TRUE at am__EXEEXT_9 = gvfsd-afc$(EXEEXT)
--am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(mountdir)" \
-- "$(DESTDIR)$(servicedir)"
- am__EXEEXT_10 =
+@@ -117,17 +149,13 @@
+ @HAVE_AVAHI_TRUE at am__EXEEXT_6 = gvfsd-dnssd$(EXEEXT)
+ @HAVE_ARCHIVE_TRUE at am__EXEEXT_7 = gvfsd-archive$(EXEEXT)
+ @USE_AFC_TRUE at am__EXEEXT_8 = gvfsd-afc$(EXEEXT)
+-am__installdirs = "$(DESTDIR)$(libexecdir)" \
+- "$(DESTDIR)$(gvfs_gschemas_convertdir)" \
+- "$(DESTDIR)$(mountdir)" "$(DESTDIR)$(servicedir)"
+ am__EXEEXT_9 =
PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS)
am_gvfsd_OBJECTS = mount.$(OBJEXT) main.$(OBJEXT)
gvfsd_OBJECTS = $(am_gvfsd_OBJECTS)
@@ -5255,7 +5238,7 @@
-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)
+ DATA = $(gvfs_gschemas_convert_DATA) $(mount_DATA) $(service_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
@@ -450,6 +457,7 @@
@@ -5266,7 +5249,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -529,6 +537,7 @@
+@@ -530,6 +538,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -5274,7 +5257,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -560,13 +569,14 @@
+@@ -561,13 +570,14 @@
-DLIBEXEC_DIR=\"$(libexecdir)/\" \
-DMOUNTABLE_DIR=\"$(mountdir)/\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -5291,18 +5274,18 @@
- $(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
+ $(GLIB_LIBS) $(DBUS_LIBS)
- servicedir = $(DBUS_SERVICE_DIR)
- service_in_files = gvfs-daemon.service.in
-@@ -584,7 +594,7 @@
- @USE_OBEXFTP_TRUE at BUILT_SOURCES = obexftp-marshal.c obexftp-marshal.h
- EXTRA_DIST = gvfs-daemon.service.in $(mount_in_files) obexftp-marshal.list
- DISTCLEANFILES = gvfs-daemon.service $(mount_DATA)
+ gvfs_gschemas = $(am__append_6) $(am__append_16)
+ gvfs_gschemas_convert = $(am__append_7) $(am__append_17)
+@@ -600,7 +610,7 @@
+ $(gsettings__enum_file) \
+ *.gschema.valid
+
-libdaemon_la_SOURCES = \
+libgvfsdaemon_la_SOURCES = \
gvfsdaemon.c gvfsdaemon.h \
gvfsbackend.c gvfsbackend.h \
gvfschannel.c gvfschannel.h \
-@@ -632,6 +642,11 @@
+@@ -648,6 +658,11 @@
gvfskeyring.h gvfskeyring.c \
$(NULL)
@@ -5314,7 +5297,7 @@
gvfsd_SOURCES = \
mount.c mount.h \
main.c
-@@ -878,7 +893,7 @@
+@@ -898,7 +913,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -5323,7 +5306,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -903,22 +918,44 @@
+@@ -923,22 +938,44 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -5375,16 +5358,16 @@
install-libexecPROGRAMS: $(libexec_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-@@ -2508,7 +2545,7 @@
+@@ -2548,7 +2585,7 @@
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 \
+- for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(gvfs_gschemas_convertdir)" "$(DESTDIR)$(mountdir)" "$(DESTDIR)$(servicedir)"; do \
++ for dir in "$(DESTDIR)$(privlibdir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(gvfs_gschemas_convertdir)" "$(DESTDIR)$(mountdir)" "$(DESTDIR)$(servicedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
-@@ -2542,7 +2579,7 @@
+@@ -2583,7 +2620,7 @@
clean: clean-recursive
clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \
@@ -5393,26 +5376,25 @@
distclean: distclean-recursive
-rm -rf ./$(DEPDIR)
-@@ -2562,7 +2599,8 @@
-
+@@ -2604,7 +2641,7 @@
info-am:
--install-data-am: install-mountDATA install-serviceDATA
-+install-data-am: install-mountDATA install-privlibLTLIBRARIES \
-+ install-serviceDATA
+ install-data-am: install-gvfs_gschemas_convertDATA install-mountDATA \
+- install-serviceDATA
++ install-privlibLTLIBRARIES install-serviceDATA
install-dvi: install-dvi-recursive
-@@ -2609,7 +2647,7 @@
- ps-am:
-
- uninstall-am: uninstall-libexecPROGRAMS uninstall-mountDATA \
+@@ -2652,7 +2689,7 @@
+
+ uninstall-am: uninstall-gvfs_gschemas_convertDATA \
+ 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 \
-@@ -2617,22 +2655,22 @@
+@@ -2660,8 +2697,8 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic \
@@ -5423,31 +5405,30 @@
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
+@@ -2669,13 +2706,15 @@
+ install-gvfs_gschemas_convertDATA 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-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-gvfs_gschemas_convertDATA uninstall-libexecPROGRAMS \
+- uninstall-mountDATA uninstall-serviceDATA
++ uninstall-mountDATA uninstall-privlibLTLIBRARIES \
++ uninstall-serviceDATA
# D-BUS service file
-Index: quilt-UA6TYS/daemon/trashlib/Makefile.in
-===================================================================
---- quilt-UA6TYS.orig/daemon/trashlib/Makefile.in 2010-09-27 16:52:40.000000000 +0200
-+++ quilt-UA6TYS/daemon/trashlib/Makefile.in 2010-10-01 13:00:05.000000000 +0200
+--- a/daemon/trashlib/Makefile.in
++++ b/daemon/trashlib/Makefile.in
@@ -40,7 +40,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -5465,7 +5446,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -262,6 +263,7 @@
+@@ -263,6 +264,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -5473,7 +5454,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -295,7 +297,7 @@
+@@ -296,7 +298,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -5482,7 +5463,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -320,9 +322,9 @@
+@@ -321,9 +323,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -5494,68 +5475,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-Index: quilt-UA6TYS/gconf/Makefile.in
-===================================================================
---- quilt-UA6TYS.orig/gconf/Makefile.in 2010-09-27 16:52:40.000000000 +0200
-+++ quilt-UA6TYS/gconf/Makefile.in 2010-10-01 13:00:05.000000000 +0200
-@@ -40,7 +40,7 @@
- am__aclocal_m4_deps = $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -206,6 +206,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -285,6 +286,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-@@ -315,7 +317,6 @@
- $(GCONF_CFLAGS) \
- -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
- -DGVFS_LOCALEDIR=\""$(localedir)"\" \
-- -DG_DISABLE_DEPRECATED \
- $(NULL)
-
- libgiogconf_la_LDFLAGS = \
-@@ -331,7 +332,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-@@ -356,9 +357,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
- install-giomodulesLTLIBRARIES: $(giomodules_LTLIBRARIES)
-Index: quilt-UA6TYS/gtk-doc.make
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ quilt-UA6TYS/gtk-doc.make 2010-10-01 12:59:44.000000000 +0200
+--- /dev/null
++++ b/gtk-doc.make
@@ -0,0 +1,230 @@
+# -*- mode: makefile -*-
+
@@ -5787,10 +5708,8 @@
+ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
-Index: quilt-UA6TYS/ltmain.sh
-===================================================================
---- quilt-UA6TYS.orig/ltmain.sh 2010-08-13 04:09:38.000000000 +0200
-+++ quilt-UA6TYS/ltmain.sh 2010-10-01 12:59:52.000000000 +0200
+--- a/ltmain.sh
++++ b/ltmain.sh
@@ -1,10 +1,9 @@
# Generated from ltmain.m4sh.
@@ -8893,10 +8812,8 @@
esac
$ECHO > $output "\
# $outputname - a libtool library file
-Index: quilt-UA6TYS/Makefile.in
-===================================================================
---- quilt-UA6TYS.orig/Makefile.in 2010-09-27 16:52:41.000000000 +0200
-+++ quilt-UA6TYS/Makefile.in 2010-10-01 13:00:06.000000000 +0200
+--- a/Makefile.in
++++ b/Makefile.in
@@ -38,14 +38,14 @@
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
@@ -8922,7 +8839,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -280,6 +281,7 @@
+@@ -281,6 +282,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -8960,10 +8877,8 @@
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
-Index: quilt-UA6TYS/metadata/Makefile.in
-===================================================================
---- quilt-UA6TYS.orig/metadata/Makefile.in 2010-09-27 16:52:40.000000000 +0200
-+++ quilt-UA6TYS/metadata/Makefile.in 2010-10-01 13:00:05.000000000 +0200
+--- a/metadata/Makefile.in
++++ b/metadata/Makefile.in
@@ -45,7 +45,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -8981,7 +8896,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -319,6 +320,7 @@
+@@ -320,6 +321,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -8989,7 +8904,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -371,7 +373,7 @@
+@@ -372,7 +374,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -8998,7 +8913,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -396,9 +398,9 @@
+@@ -397,9 +399,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9010,10 +8925,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-Index: quilt-UA6TYS/mkinstalldirs
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ quilt-UA6TYS/mkinstalldirs 2010-10-01 13:00:06.000000000 +0200
+--- /dev/null
++++ b/mkinstalldirs
@@ -0,0 +1,162 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
@@ -9177,10 +9090,8 @@
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
-Index: quilt-UA6TYS/monitor/afc/Makefile.in
-===================================================================
---- quilt-UA6TYS.orig/monitor/afc/Makefile.in 2010-09-27 16:52:40.000000000 +0200
-+++ quilt-UA6TYS/monitor/afc/Makefile.in 2010-10-01 13:00:05.000000000 +0200
+--- a/monitor/afc/Makefile.in
++++ b/monitor/afc/Makefile.in
@@ -42,7 +42,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -9198,7 +9109,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -296,6 +297,7 @@
+@@ -297,6 +298,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -9206,7 +9117,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -350,7 +352,7 @@
+@@ -351,7 +353,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -9215,7 +9126,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -375,9 +377,9 @@
+@@ -376,9 +378,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9227,10 +9138,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-libexecPROGRAMS: $(libexec_PROGRAMS)
-Index: quilt-UA6TYS/monitor/gdu/Makefile.in
-===================================================================
---- quilt-UA6TYS.orig/monitor/gdu/Makefile.in 2010-09-27 16:52:40.000000000 +0200
-+++ quilt-UA6TYS/monitor/gdu/Makefile.in 2010-10-01 13:00:05.000000000 +0200
+--- a/monitor/gdu/Makefile.in
++++ b/monitor/gdu/Makefile.in
@@ -42,7 +42,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -9248,7 +9157,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -298,6 +299,7 @@
+@@ -299,6 +300,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -9256,7 +9165,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -356,7 +358,7 @@
+@@ -357,7 +359,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -9265,7 +9174,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -381,9 +383,9 @@
+@@ -382,9 +384,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9277,10 +9186,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-libexecPROGRAMS: $(libexec_PROGRAMS)
-Index: quilt-UA6TYS/monitor/gphoto2/Makefile.in
-===================================================================
---- quilt-UA6TYS.orig/monitor/gphoto2/Makefile.in 2010-09-27 16:52:40.000000000 +0200
-+++ quilt-UA6TYS/monitor/gphoto2/Makefile.in 2010-10-01 13:00:06.000000000 +0200
+--- a/monitor/gphoto2/Makefile.in
++++ b/monitor/gphoto2/Makefile.in
@@ -46,7 +46,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -9298,7 +9205,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -315,6 +316,7 @@
+@@ -316,6 +317,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -9306,7 +9213,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -351,7 +353,7 @@
+@@ -352,7 +354,7 @@
-I$(top_srcdir)/common -I$(top_srcdir)/monitor/proxy \
$(GLIB_CFLAGS) $(GPHOTO2_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
@@ -9315,7 +9222,7 @@
-DG_UDEV_API_IS_SUBJECT_TO_CHANGE $(NULL) $(am__append_1) \
$(am__append_2)
gvfs_gphoto2_volume_monitor_LDFLAGS = \
-@@ -372,7 +374,7 @@
+@@ -373,7 +375,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -9324,7 +9231,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -397,9 +399,9 @@
+@@ -398,9 +400,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9336,10 +9243,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-libexecPROGRAMS: $(libexec_PROGRAMS)
-Index: quilt-UA6TYS/monitor/hal/Makefile.in
-===================================================================
---- quilt-UA6TYS.orig/monitor/hal/Makefile.in 2010-09-27 16:52:41.000000000 +0200
-+++ quilt-UA6TYS/monitor/hal/Makefile.in 2010-10-01 13:00:06.000000000 +0200
+--- a/monitor/hal/Makefile.in
++++ b/monitor/hal/Makefile.in
@@ -42,7 +42,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -9357,7 +9262,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -301,6 +302,7 @@
+@@ -302,6 +303,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -9365,7 +9270,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -340,7 +342,6 @@
+@@ -341,7 +343,6 @@
$(HAL_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -9373,7 +9278,7 @@
$(NULL)
gvfs_hal_volume_monitor_LDFLAGS = \
-@@ -364,7 +365,7 @@
+@@ -365,7 +366,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -9382,7 +9287,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -389,9 +390,9 @@
+@@ -390,9 +391,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9394,10 +9299,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-libexecPROGRAMS: $(libexec_PROGRAMS)
-Index: quilt-UA6TYS/monitor/Makefile.in
-===================================================================
---- quilt-UA6TYS.orig/monitor/Makefile.in 2010-09-27 16:52:40.000000000 +0200
-+++ quilt-UA6TYS/monitor/Makefile.in 2010-10-01 13:00:05.000000000 +0200
+--- a/monitor/Makefile.in
++++ b/monitor/Makefile.in
@@ -43,7 +43,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -9415,7 +9318,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -267,6 +268,7 @@
+@@ -268,6 +269,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -9423,7 +9326,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -288,7 +290,7 @@
+@@ -289,7 +291,7 @@
all: all-recursive
.SUFFIXES:
@@ -9432,7 +9335,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -313,9 +315,9 @@
+@@ -314,9 +316,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9444,10 +9347,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-Index: quilt-UA6TYS/monitor/proxy/Makefile.in
-===================================================================
---- quilt-UA6TYS.orig/monitor/proxy/Makefile.in 2010-09-27 16:52:41.000000000 +0200
-+++ quilt-UA6TYS/monitor/proxy/Makefile.in 2010-10-01 13:00:06.000000000 +0200
+--- a/monitor/proxy/Makefile.in
++++ b/monitor/proxy/Makefile.in
@@ -40,7 +40,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -9465,7 +9366,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -304,6 +305,7 @@
+@@ -305,6 +306,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -9473,7 +9374,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -341,7 +343,6 @@
+@@ -342,7 +344,6 @@
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DREMOTE_VOLUME_MONITORS_DIR=\"$(remote_volume_monitorsdir)\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -9481,7 +9382,7 @@
$(NULL)
libgioremote_volume_monitor_la_LDFLAGS = \
-@@ -368,7 +369,6 @@
+@@ -369,7 +370,6 @@
$(GDU_CFLAGS) \
-DG_LOG_DOMAIN=\"GVFS-RemoteVolumeMonitorDaemon\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -9489,7 +9390,7 @@
$(NULL)
libgvfsproxyvolumemonitordaemon_noin_la_LIBADD = \
-@@ -381,7 +381,7 @@
+@@ -382,7 +382,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -9498,7 +9399,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -406,9 +406,9 @@
+@@ -407,9 +407,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9510,10 +9411,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-giomodulesLTLIBRARIES: $(giomodules_LTLIBRARIES)
-Index: quilt-UA6TYS/programs/Makefile.in
-===================================================================
---- quilt-UA6TYS.orig/programs/Makefile.in 2010-09-27 16:52:41.000000000 +0200
-+++ quilt-UA6TYS/programs/Makefile.in 2010-10-01 13:00:06.000000000 +0200
+--- a/programs/Makefile.in
++++ b/programs/Makefile.in
@@ -49,7 +49,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -9531,7 +9430,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -348,6 +349,7 @@
+@@ -349,6 +350,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -9539,7 +9438,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -369,7 +371,7 @@
+@@ -370,7 +372,7 @@
-I$(top_builddir) \
$(GLIB_CFLAGS) \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -9548,7 +9447,7 @@
libraries = \
$(GLIB_LIBS)
-@@ -417,7 +419,7 @@
+@@ -418,7 +420,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -9557,7 +9456,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -442,9 +444,9 @@
+@@ -443,9 +445,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9569,10 +9468,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-binPROGRAMS: $(bin_PROGRAMS)
-Index: quilt-UA6TYS/test/Makefile.in
-===================================================================
---- quilt-UA6TYS.orig/test/Makefile.in 2010-09-27 16:52:41.000000000 +0200
-+++ quilt-UA6TYS/test/Makefile.in 2010-10-01 13:00:06.000000000 +0200
+--- a/test/Makefile.in
++++ b/test/Makefile.in
@@ -45,7 +45,7 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -9590,7 +9487,7 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -279,6 +280,7 @@
+@@ -280,6 +281,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -9598,7 +9495,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -299,7 +301,7 @@
+@@ -300,7 +302,7 @@
-I$(top_srcdir) \
-I$(top_builddir) \
$(GLIB_CFLAGS) \
@@ -9607,7 +9504,7 @@
AM_LDFLAGS = \
$(GLIB_LIBS)
-@@ -309,7 +311,7 @@
+@@ -310,7 +312,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -9616,7 +9513,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -334,9 +336,9 @@
+@@ -335,9 +337,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9628,10 +9525,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-Index: quilt-UA6TYS/INSTALL
-===================================================================
---- quilt-UA6TYS.orig/INSTALL 2010-09-27 16:52:36.000000000 +0200
-+++ quilt-UA6TYS/INSTALL 2010-10-01 13:00:06.000000000 +0200
+--- a/INSTALL
++++ b/INSTALL
@@ -1,3 +1,365 @@
-The ObexFTP backend requires the obex-data-server D-Bus service in
-addition to the dependencies listed in the configure. See:
@@ -10001,10 +9896,8 @@
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
-Index: quilt-UA6TYS/config.guess
-===================================================================
---- quilt-UA6TYS.orig/config.guess 2010-03-29 13:21:24.000000000 +0200
-+++ quilt-UA6TYS/config.guess 2010-10-01 13:00:04.000000000 +0200
+--- a/config.guess
++++ b/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -10030,10 +9923,8 @@
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-Index: quilt-UA6TYS/config.sub
-===================================================================
---- quilt-UA6TYS.orig/config.sub 2010-03-29 13:21:24.000000000 +0200
-+++ quilt-UA6TYS/config.sub 2010-10-01 13:00:04.000000000 +0200
+--- a/config.sub
++++ b/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
Modified: desktop/experimental/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/series?rev=25723&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/series [utf-8] Wed Dec 1 19:48:18 2010
@@ -3,6 +3,5 @@
03_xdg-mount.patch
04_hurd_path_max.patch
05_shared_libdaemon.patch
-06_sftp_timeout.patch
90_relibtoolize.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list