r20148 - in /desktop/unstable/gvfs/debian: changelog patches/01_maintainer_mode.patch patches/90_relibtoolize.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri May 29 07:13:13 UTC 2009
Author: joss
Date: Fri May 29 07:13:13 2009
New Revision: 20148
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20148
Log:
* New upstream release.
* Refresh a pair of patches accordingly.
Modified:
desktop/unstable/gvfs/debian/changelog
desktop/unstable/gvfs/debian/patches/01_maintainer_mode.patch
desktop/unstable/gvfs/debian/patches/90_relibtoolize.patch
Modified: desktop/unstable/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/changelog?rev=20148&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog (original)
+++ desktop/unstable/gvfs/debian/changelog Fri May 29 07:13:13 2009
@@ -1,4 +1,4 @@
-gvfs (1.2.2-3) unstable; urgency=low
+gvfs (1.2.3-1) unstable; urgency=low
* Add back fuse and cdio support for kfreebsd.
* 10_kfreebsd.patch: patch from Aurélien Jarno to add gphoto2 support
@@ -8,6 +8,8 @@
Closes: #530435.
* Only suggest obex-data-server, it’s not as if it was so much related
to gvfs which does file browsing, not file sharing.
+ * New upstream release.
+ * Refresh a pair of patches accordingly.
-- Josselin Mouette <joss at debian.org> Fri, 29 May 2009 09:03:00 +0200
Modified: desktop/unstable/gvfs/debian/patches/01_maintainer_mode.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/01_maintainer_mode.patch?rev=20148&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/01_maintainer_mode.patch (original)
+++ desktop/unstable/gvfs/debian/patches/01_maintainer_mode.patch Fri May 29 07:13:13 2009
@@ -1,11 +1,11 @@
-Index: gvfs-1.2.2/configure.ac
+Index: gvfs-1.2.3/configure.ac
===================================================================
---- gvfs-1.2.2.orig/configure.ac 2009-04-03 09:30:54.000000000 +0200
-+++ gvfs-1.2.2/configure.ac 2009-04-27 22:24:55.449419153 +0200
+--- gvfs-1.2.3.orig/configure.ac 2009-05-18 13:54:03.000000000 +0200
++++ gvfs-1.2.3/configure.ac 2009-05-29 09:07:58.509607353 +0200
@@ -1,6 +1,7 @@
AC_INIT(client/gdaemonvfs.h)
- AM_INIT_AUTOMAKE(gvfs, 1.2.2)
+ AM_INIT_AUTOMAKE(gvfs, 1.2.3)
+AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
Modified: desktop/unstable/gvfs/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/90_relibtoolize.patch?rev=20148&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/90_relibtoolize.patch (original)
+++ desktop/unstable/gvfs/debian/patches/90_relibtoolize.patch Fri May 29 07:13:13 2009
@@ -5,9 +5,10 @@
autoconf
rm -rf autom4te.cache config.h.in~
-diff -pruN gvfs-1.2.2/aclocal.m4 gvfs-1.2.2.new/aclocal.m4
---- gvfs-1.2.2/aclocal.m4 2009-04-13 19:30:53.000000000 +0200
-+++ gvfs-1.2.2.new/aclocal.m4 2009-04-27 22:37:49.899678011 +0200
+Index: gvfs-1.2.3/aclocal.m4
+===================================================================
+--- gvfs-1.2.3.orig/aclocal.m4 2009-05-18 14:10:01.000000000 +0200
++++ gvfs-1.2.3/aclocal.m4 2009-05-29 09:12:28.557107248 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
@@ -10719,7 +10720,7 @@
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-@@ -6475,1922 +5821,3955 @@ x|xyes)
+@@ -6475,1940 +5821,3955 @@ x|xyes)
lib=conftest
libobjs=conftest.$ac_objext
deplibs=
@@ -15552,7 +15553,28 @@
- fi
- else
- posrcprefix="../"
-+
+- fi
+- rm -f po/POTFILES
+- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+- < $srcdir/po/POTFILES.in > po/POTFILES
+- ])
+
+-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+-# -------------------------------
+-# Define VARIABLE to the location where catalog files will
+-# be installed by po/Makefile.
+-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
+-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
+-glib_save_prefix="$prefix"
+-glib_save_exec_prefix="$exec_prefix"
+-glib_save_datarootdir="$datarootdir"
+-test "x$prefix" = xNONE && prefix=$ac_default_prefix
+-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+-datarootdir=`eval echo "${datarootdir}"`
+-if test "x$CATOBJEXT" = "x.mo" ; then
+- localedir=`eval echo "${libdir}/locale"`
+-else
+- localedir=`eval echo "${datadir}/locale"`
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
@@ -15618,7 +15640,12 @@
+ if test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
-+fi
+ fi
+-prefix="$glib_save_prefix"
+-exec_prefix="$glib_save_exec_prefix"
+-datarootdir="$glib_save_datarootdir"
+-AC_DEFINE_UNQUOTED($1, "$localedir",
+- [Define the location where the catalogs will be installed])
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
@@ -15679,7 +15706,7 @@
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-+])
+ ])
+])
+
+
@@ -15750,7 +15777,14 @@
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
-+
+
+-dnl
+-dnl Now the definitions that aclocal will find
+-dnl
+-ifdef(glib_configure_in,[],[
+-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+-])dnl
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+ dnl maintainer-mode is disabled by default
@@ -15765,19 +15799,42 @@
+ AC_SUBST(MAINT)dnl
+]
+)
-+
+
+-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+-#
+-# Create a temporary file with TEST-FILE as its contents and pass the
+-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
+-# 0 and perform ACTION-IF-FAIL for any other exit status.
+-AC_DEFUN([GLIB_RUN_PROG],
+-[cat >conftest.foo <<_ACEOF
+-$2
+-_ACEOF
+-if AC_RUN_LOG([$1 conftest.foo]); then
+- m4_ifval([$3], [$3], [:])
+-m4_ifvaln([$4], [else $4])dnl
+-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+-fi])
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+
+
+# Check to see how 'make' treats includes. -*- Autoconf -*-
-+
+
+-dnl -*- mode: autoconf -*-
+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-+
+
+-# serial 1
+# serial 3
-+
+
+-dnl Usage:
+-dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
+-AC_DEFUN([GTK_DOC_CHECK],
+-[
+- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
@@ -15812,63 +15869,18 @@
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
- fi
-- rm -f po/POTFILES
-- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-- < $srcdir/po/POTFILES.in > po/POTFILES
-- ])
--
--# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
--# -------------------------------
--# Define VARIABLE to the location where catalog files will
--# be installed by po/Makefile.
--glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
--[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
--glib_save_prefix="$prefix"
--glib_save_exec_prefix="$exec_prefix"
--glib_save_datarootdir="$datarootdir"
--test "x$prefix" = xNONE && prefix=$ac_default_prefix
--test "x$exec_prefix" = xNONE && exec_prefix=$prefix
--datarootdir=`eval echo "${datarootdir}"`
--if test "x$CATOBJEXT" = "x.mo" ; then
-- localedir=`eval echo "${libdir}/locale"`
--else
-- localedir=`eval echo "${datadir}/locale"`
- fi
--prefix="$glib_save_prefix"
--exec_prefix="$glib_save_exec_prefix"
--datarootdir="$glib_save_datarootdir"
--AC_DEFINE_UNQUOTED($1, "$localedir",
-- [Define the location where the catalogs will be installed])
++ fi
++fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
- ])
-
--dnl
--dnl Now the definitions that aclocal will find
--dnl
--ifdef(glib_configure_in,[],[
--AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
--AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
--])dnl
--
--# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
--#
--# Create a temporary file with TEST-FILE as its contents and pass the
--# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
--# 0 and perform ACTION-IF-FAIL for any other exit status.
--AC_DEFUN([GLIB_RUN_PROG],
--[cat >conftest.foo <<_ACEOF
--$2
--_ACEOF
--if AC_RUN_LOG([$1 conftest.foo]); then
-- m4_ifval([$3], [$3], [:])
--m4_ifvaln([$4], [else $4])dnl
--echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
--sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
--fi])
++])
+
+- dnl check for tools we added during development
+- AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
+- AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
+- AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
@@ -15876,9 +15888,19 @@
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+- dnl for overriding the documentation installation directory
+- AC_ARG_WITH([html-dir],
+- AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+- [with_html_dir='${datadir}/gtk-doc/html'])
+- HTML_DIR="$with_html_dir"
+- AC_SUBST([HTML_DIR])
+# serial 6
--dnl -*- mode: autoconf -*-
+- dnl enable/disable documentation building
+- AC_ARG_ENABLE([gtk-doc],
+- AS_HELP_STRING([--enable-gtk-doc],
+- [use gtk-doc to build documentation [[default=no]]]),,
+- [enable_gtk_doc=no])
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
@@ -15905,42 +15927,6 @@
+ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+])
--# serial 1
-+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
--dnl Usage:
--dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
--AC_DEFUN([GTK_DOC_CHECK],
--[
-- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-- dnl for overriding the documentation installation directory
-- AC_ARG_WITH([html-dir],
-- AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-- [with_html_dir='${datadir}/gtk-doc/html'])
-- HTML_DIR="$with_html_dir"
-- AC_SUBST([HTML_DIR])
-+# serial 5
-
-- dnl enable/disable documentation building
-- AC_ARG_ENABLE([gtk-doc],
-- AS_HELP_STRING([--enable-gtk-doc],
-- [use gtk-doc to build documentation [[default=no]]]),,
-- [enable_gtk_doc=no])
-+# AM_MISSING_PROG(NAME, PROGRAM)
-+# ------------------------------
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])
-+$1=${$1-"${am_missing_run}$2"}
-+AC_SUBST($1)])
-
- if test x$enable_gtk_doc = xyes; then
- ifelse([$1],[],
- [PKG_CHECK_EXISTS([gtk-doc],,
@@ -15948,9 +15934,44 @@
- [PKG_CHECK_EXISTS([gtk-doc >= $1],,
- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
- fi
++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
- AC_MSG_CHECKING([whether to build gtk-doc documentation])
- AC_MSG_RESULT($enable_gtk_doc)
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+- dnl enable/disable output formats
+- AC_ARG_ENABLE([gtk-doc-html],
+- AS_HELP_STRING([--enable-gtk-doc-html],
+- [build documentation in html format [[default=yes]]]),,
+- [enable_gtk_doc_html=yes])
+- AC_ARG_ENABLE([gtk-doc-pdf],
+- AS_HELP_STRING([--enable-gtk-doc-pdf],
+- [build documentation in pdf format [[default=no]]]),,
+- [enable_gtk_doc_pdf=no])
++# serial 5
+
+- if test -n "$GTKDOC_MKPDF"; then
+- enable_gtk_doc_pdf=no
+- fi
++# AM_MISSING_PROG(NAME, PROGRAM)
++# ------------------------------
++AC_DEFUN([AM_MISSING_PROG],
++[AC_REQUIRE([AM_MISSING_HAS_RUN])
++$1=${$1-"${am_missing_run}$2"}
++AC_SUBST($1)])
+
+
+- AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
+- AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
+- AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
+- AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+- AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
@@ -15966,20 +15987,26 @@
+ am_missing_run=
+ AC_MSG_WARN([`missing' script is too old or missing])
+fi
-+])
-
-- dnl check for tools we added during development
-- AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
-- AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
+ ])
+
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-- AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
-- AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
-- AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
+-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+-# serial 40 IT_PROG_INTLTOOL
+-AC_DEFUN([IT_PROG_INTLTOOL], [
+-AC_PREREQ([2.50])dnl
+-AC_REQUIRE([AM_NLS])dnl
+-
+-case "$am__api_version" in
+- 1.[01234])
+- AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
+- ;;
+- *)
+- ;;
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
@@ -15997,37 +16024,12 @@
+case $mkdir_p in
+ [[\\/$]]* | ?:[[\\/]]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
- ])
-
-+# Helper functions for option handling. -*- Autoconf -*-
-
--dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
--# serial 40 IT_PROG_INTLTOOL
--AC_DEFUN([IT_PROG_INTLTOOL], [
--AC_PREREQ([2.50])dnl
--AC_REQUIRE([AM_NLS])dnl
-+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--case "$am__api_version" in
-- 1.[01234])
-- AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-- ;;
-- *)
-- ;;
--esac
-+# serial 4
+ esac
++])
-if test -n "$1"; then
- AC_MSG_CHECKING([for intltool >= $1])
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++# Helper functions for option handling. -*- Autoconf -*-
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
@@ -16037,11 +16039,11 @@
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
- AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
-fi
-+# _AM_SET_OPTION(NAME)
-+# ------------------------------
-+# Set option NAME. Presently that only means defining a flag for this option.
-+AC_DEFUN([_AM_SET_OPTION],
-+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
++# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
@@ -16049,11 +16051,7 @@
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
- AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
-fi
-+# _AM_SET_OPTIONS(OPTIONS)
-+# ----------------------------------
-+# OPTIONS is a space-separated list of Automake options.
-+AC_DEFUN([_AM_SET_OPTIONS],
-+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++# serial 4
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
@@ -16074,6 +16072,23 @@
- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++# _AM_MANGLE_OPTION(NAME)
++# -----------------------
++AC_DEFUN([_AM_MANGLE_OPTION],
++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++
++# _AM_SET_OPTION(NAME)
++# ------------------------------
++# Set option NAME. Presently that only means defining a flag for this option.
++AC_DEFUN([_AM_SET_OPTION],
++[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
++
++# _AM_SET_OPTIONS(OPTIONS)
++# ----------------------------------
++# OPTIONS is a space-separated list of Automake options.
++AC_DEFUN([_AM_SET_OPTIONS],
++[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
@@ -16377,9 +16392,10 @@
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
-diff -pruN gvfs-1.2.2/client/Makefile.in gvfs-1.2.2.new/client/Makefile.in
---- gvfs-1.2.2/client/Makefile.in 2009-04-13 19:30:55.000000000 +0200
-+++ gvfs-1.2.2.new/client/Makefile.in 2009-04-27 22:38:10.164182725 +0200
+Index: gvfs-1.2.3/client/Makefile.in
+===================================================================
+--- gvfs-1.2.3.orig/client/Makefile.in 2009-05-18 14:10:03.000000000 +0200
++++ gvfs-1.2.3/client/Makefile.in 2009-05-29 09:12:32.289603758 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -16414,15 +16430,16 @@
FUSE_CFLAGS = @FUSE_CFLAGS@
FUSE_LIBS = @FUSE_LIBS@
GCONF_CFLAGS = @GCONF_CFLAGS@
-@@ -172,7 +167,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
+@@ -172,8 +167,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
-@@ -185,48 +179,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -186,48 +179,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
@@ -16478,7 +16495,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -257,8 +239,7 @@ abs_srcdir = @abs_srcdir@
+@@ -258,8 +239,7 @@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
@@ -16488,7 +16505,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -290,6 +271,7 @@ libdir = @libdir@
+@@ -291,6 +271,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -16496,7 +16513,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -310,7 +292,7 @@ INCLUDES = -I$(top_srcdir) \
+@@ -311,7 +292,7 @@ INCLUDES = -I$(top_srcdir) \
-I$(top_srcdir)/client \
-I$(top_srcdir)/common \
$(GLIB_CFLAGS) $(DBUS_CFLAGS) \
@@ -16505,7 +16522,7 @@
-DGVFS_MODULE_DIR=\"$(libdir)/gvfs/modules\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
-DDBUS_API_SUBJECT_TO_CHANGE
-@@ -362,7 +344,7 @@ test_uri_utils_CFLAGS = $(INCLUDES)
+@@ -363,7 +344,7 @@ test_uri_utils_CFLAGS = $(INCLUDES)
@USE_FUSE_TRUE@ -I$(top_srcdir) \
@USE_FUSE_TRUE@ -I$(top_srcdir)/common \
@USE_FUSE_TRUE@ $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(FUSE_CFLAGS) \
@@ -16514,7 +16531,7 @@
@USE_FUSE_TRUE@ -DDBUS_API_SUBJECT_TO_CHANGE
@USE_FUSE_TRUE at gvfs_fuse_daemon_LDADD = \
-@@ -373,12 +355,12 @@ all: all-am
+@@ -374,12 +355,12 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -16530,7 +16547,7 @@
exit 1;; \
esac; \
done; \
-@@ -398,9 +380,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -399,9 +380,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16542,7 +16559,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-giomodulesLTLIBRARIES: $(giomodules_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -588,7 +570,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -589,7 +570,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -16551,9 +16568,10 @@
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-diff -pruN gvfs-1.2.2/common/Makefile.in gvfs-1.2.2.new/common/Makefile.in
---- gvfs-1.2.2/common/Makefile.in 2009-04-13 19:30:55.000000000 +0200
-+++ gvfs-1.2.2.new/common/Makefile.in 2009-04-27 22:38:10.300174508 +0200
+Index: gvfs-1.2.3/common/Makefile.in
+===================================================================
+--- gvfs-1.2.3.orig/common/Makefile.in 2009-05-18 14:10:03.000000000 +0200
++++ gvfs-1.2.3/common/Makefile.in 2009-05-29 09:12:32.445602363 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -16588,15 +16606,16 @@
FUSE_CFLAGS = @FUSE_CFLAGS@
FUSE_LIBS = @FUSE_LIBS@
GCONF_CFLAGS = @GCONF_CFLAGS@
-@@ -154,7 +149,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
+@@ -154,8 +149,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
-@@ -167,48 +161,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -168,48 +161,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
@@ -16652,7 +16671,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -239,8 +221,7 @@ abs_srcdir = @abs_srcdir@
+@@ -240,8 +221,7 @@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
@@ -16662,7 +16681,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -272,6 +253,7 @@ libdir = @libdir@
+@@ -273,6 +253,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -16670,7 +16689,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -292,7 +274,7 @@ lib_LTLIBRARIES = libgvfscommon.la $(am_
+@@ -293,7 +274,7 @@ lib_LTLIBRARIES = libgvfscommon.la $(am_
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
-I$(top_srcdir)/daemon \
$(GLIB_CFLAGS) $(DBUS_CFLAGS) \
@@ -16679,7 +16698,7 @@
-DDBUS_API_SUBJECT_TO_CHANGE
libgvfscommon_la_SOURCES = \
-@@ -332,12 +314,12 @@ all: all-am
+@@ -333,12 +314,12 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -16695,7 +16714,7 @@
exit 1;; \
esac; \
done; \
-@@ -357,9 +339,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -358,9 +339,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16707,7 +16726,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -458,7 +440,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -459,7 +440,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -16716,9 +16735,10 @@
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-diff -pruN gvfs-1.2.2/config.h.in gvfs-1.2.2.new/config.h.in
---- gvfs-1.2.2/config.h.in 2009-04-13 19:31:28.000000000 +0200
-+++ gvfs-1.2.2.new/config.h.in 2009-04-27 22:38:16.099678360 +0200
+Index: gvfs-1.2.3/config.h.in
+===================================================================
+--- gvfs-1.2.3.orig/config.h.in 2009-05-18 14:10:02.000000000 +0200
++++ gvfs-1.2.3/config.h.in 2009-05-29 09:12:08.913103325 +0200
@@ -156,6 +156,10 @@
/* Define to 1 if you have the <utmp.h> header file. */
#undef HAVE_UTMP_H
@@ -16730,9 +16750,10 @@
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#undef NO_MINUS_C_MINUS_O
-diff -pruN gvfs-1.2.2/configure gvfs-1.2.2.new/configure
---- gvfs-1.2.2/configure 2009-04-13 19:30:57.000000000 +0200
-+++ gvfs-1.2.2.new/configure 2009-04-27 22:38:18.880173155 +0200
+Index: gvfs-1.2.3/configure
+===================================================================
+--- gvfs-1.2.3.orig/configure 2009-05-18 14:10:05.000000000 +0200
++++ gvfs-1.2.3/configure 2009-05-29 09:12:36.313101646 +0200
@@ -575,22 +575,22 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
@@ -16986,7 +17007,7 @@
exec 7<&0 </dev/null 6>&1
# Name of the host.
-@@ -891,33 +886,28 @@ DBUS_CFLAGS
+@@ -891,38 +886,28 @@ DBUS_CFLAGS
GLIB_LIBS
GLIB_CFLAGS
DISTCHECK_CONFIGURE_FLAGS
@@ -16994,11 +17015,17 @@
-GTK_DOC_USE_REBASE_TRUE
GTK_DOC_USE_LIBTOOL_FALSE
GTK_DOC_USE_LIBTOOL_TRUE
+-GTK_DOC_BUILD_PDF_FALSE
+-GTK_DOC_BUILD_PDF_TRUE
+-GTK_DOC_BUILD_HTML_FALSE
+-GTK_DOC_BUILD_HTML_TRUE
ENABLE_GTK_DOC_FALSE
ENABLE_GTK_DOC_TRUE
+-HTML_DIR
+-GTKDOC_MKPDF
-GTKDOC_REBASE
GTKDOC_CHECK
- HTML_DIR
++HTML_DIR
LIBTOOL_EXPORT_OPTIONS
PKG_CONFIG
-LIBTOOL
@@ -17030,7 +17057,7 @@
EGREP
GREP
SED
-@@ -929,6 +919,7 @@ build_os
+@@ -934,6 +919,7 @@ build_os
build_vendor
build_cpu
build
@@ -17038,7 +17065,7 @@
LN_S
CPP
am__fastdepCC_FALSE
-@@ -947,6 +938,9 @@ CPPFLAGS
+@@ -952,6 +938,9 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
@@ -17048,7 +17075,7 @@
am__untar
am__tar
AMTAR
-@@ -1010,14 +1004,14 @@ SHELL'
+@@ -1015,18 +1004,16 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -17064,8 +17091,12 @@
-with_tags
with_html_dir
enable_gtk_doc
+-enable_gtk_doc_html
+-enable_gtk_doc_pdf
with_dbus_service_dir
-@@ -1050,12 +1044,6 @@ LDFLAGS
+ enable_nls
+ enable_http
+@@ -1057,12 +1044,6 @@ LDFLAGS
LIBS
CPPFLAGS
CPP
@@ -17078,7 +17109,7 @@
PKG_CONFIG
GLIB_CFLAGS
GLIB_LIBS
-@@ -1707,6 +1695,8 @@ Optional Features:
+@@ -1714,6 +1695,8 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
@@ -17087,7 +17118,16 @@
--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]
-@@ -1734,10 +1724,9 @@ Optional Features:
+@@ -1722,8 +1705,6 @@ Optional Features:
+ optimize for fast installation [default=yes]
+ --disable-libtool-lock avoid locking (might break parallel builds)
+ --enable-gtk-doc use gtk-doc to build documentation [default=no]
+- --enable-gtk-doc-html build documentation in html format [default=yes]
+- --enable-gtk-doc-pdf build documentation in pdf format [default=no]
+ --disable-nls do not use Native Language Support
+ --disable-http build without http/dav backend
+ --disable-avahi build without avahi support
+@@ -1743,10 +1724,9 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
@@ -17099,7 +17139,7 @@
--with-html-dir=PATH path to installed docs
--with-dbus-service-dir=PATH choose directory for dbus service files, default=PREFIX/share/dbus-1/services
--with-samba-includes=PREFIX Location of samba includes.
-@@ -1757,11 +1746,6 @@ Some influential environment variables:
+@@ -1766,11 +1746,6 @@ Some influential environment variables:
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
@@ -17111,7 +17151,7 @@
PKG_CONFIG path to pkg-config utility
GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
GLIB_LIBS linker flags for GLIB, overriding pkg-config
-@@ -2724,6 +2708,28 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+@@ -2733,6 +2708,28 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
@@ -17140,7 +17180,7 @@
ac_config_headers="$ac_config_headers config.h"
-@@ -5258,54 +5264,37 @@ fi
+@@ -5267,54 +5264,37 @@ fi
@@ -17222,7 +17262,7 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
{ { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-@@ -5391,62 +5380,87 @@ case $host_os in *\ *) host_os=`echo "$h
+@@ -5400,62 +5380,87 @@ case $host_os in *\ *) host_os=`echo "$h
{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
@@ -17350,7 +17390,7 @@
{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-@@ -5582,6 +5596,94 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
+@@ -5591,6 +5596,94 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
@@ -17445,7 +17485,7 @@
# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then
-@@ -5607,9 +5709,9 @@ $as_echo_n "checking for ld used by $CC.
+@@ -5616,9 +5709,9 @@ $as_echo_n "checking for ld used by $CC.
[\\/]* | ?:[\\/]*)
re_direlt='/[^/][^/]*/\.\./'
# Canonicalize the pathname of ld
@@ -17458,7 +17498,7 @@
done
test -z "$LD" && LD="$ac_prog"
;;
-@@ -5689,33 +5791,15 @@ $as_echo "$lt_cv_prog_gnu_ld" >&6; }
+@@ -5698,34 +5791,16 @@ $as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -17486,9 +17526,11 @@
- fi
- ;;
-esac
-
+-
-{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-$as_echo_n "checking for BSD-compatible nm... " >&6; }
+-if test "${lt_cv_path_NM+set}" = set; then
++
+
+
+
@@ -17497,10 +17539,11 @@
+
+{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
- if test "${lt_cv_path_NM+set}" = set; then
++if test "${lt_cv_path_NM+set}" = set; then
$as_echo_n "(cached) " >&6
else
-@@ -5760,623 +5844,469 @@ else
+ if test -n "$NM"; then
+@@ -5769,623 +5844,469 @@ else
done
IFS="$lt_save_ifs"
done
@@ -17639,17 +17682,29 @@
- if ( file / ) >/dev/null 2>&1; then
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
-- else
++
++ test -n "$ac_ct_DUMPBIN" && break
++done
++
++ if test "x$ac_ct_DUMPBIN" = x; then
++ DUMPBIN=":"
+ else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
-- fi
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ DUMPBIN=$ac_ct_DUMPBIN
+ fi
- ;;
++fi
-darwin* | rhapsody*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-+ test -n "$ac_ct_DUMPBIN" && break
-+done
-freebsd* | dragonfly*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
@@ -17662,24 +17717,18 @@
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
- esac
-+ if test "x$ac_ct_DUMPBIN" = x; then
-+ DUMPBIN=":"
- else
+- else
- lt_cv_deplibs_check_method=pass_all
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ DUMPBIN=$ac_ct_DUMPBIN
++ if test "$DUMPBIN" != ":"; then
++ NM="$DUMPBIN"
fi
- ;;
--
++fi
++test -z "$NM" && NM=nm
+
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-+fi
-hpux10.20* | hpux11*)
- lt_cv_file_magic_cmd=/usr/bin/file
@@ -17703,11 +17752,6 @@
- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
- ;;
-+ if test "$DUMPBIN" != ":"; then
-+ NM="$DUMPBIN"
-+ fi
-+fi
-+test -z "$NM" && NM=nm
-irix5* | irix6* | nonstopux*)
- case $LD in
@@ -17729,24 +17773,6 @@
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-- fi
-- ;;
-
--newos6*)
-- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-- lt_cv_file_magic_cmd=/usr/bin/file
-- lt_cv_file_magic_test_file=/usr/lib/libnls.so
-- ;;
-
--nto-qnx*)
-- lt_cv_deplibs_check_method=unknown
-- ;;
-
--openbsd*)
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-- else
-- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if test "${lt_cv_nm_interface+set}" = set; then
@@ -17766,21 +17792,15 @@
+ lt_cv_nm_interface="MS dumpbin"
fi
- ;;
--
--osf3* | osf4* | osf5*)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
--
--rdos*)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
+ rm -f conftest*
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
--solaris*)
-- lt_cv_deplibs_check_method=pass_all
+-newos6*)
+- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+- lt_cv_file_magic_cmd=/usr/bin/file
+- lt_cv_file_magic_test_file=/usr/lib/libnls.so
- ;;
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
@@ -17791,18 +17811,9 @@
+ i=0
+ teststring="ABCD"
--sysv4 | sysv4.3*)
-- case $host_vendor in
-- motorola)
-- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-- ;;
-- ncr)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
-- sequent)
-- lt_cv_file_magic_cmd='/bin/file'
-- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+-nto-qnx*)
+- lt_cv_deplibs_check_method=unknown
+- ;;
+ case $build_os in
+ msdosdjgpp*)
+ # On DJGPP, this test can blow up pretty badly due to problems in libc
@@ -17810,21 +17821,25 @@
+ # during glob expansion). Even if it were fixed, the result of this
+ # check would be larger than it should be.
+ lt_cv_sys_max_cmd_len=12288; # 12K is about right
- ;;
-- sni)
-- lt_cv_file_magic_cmd='/bin/file'
-- lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-- lt_cv_file_magic_test_file=/lib/libc.so
-+
++ ;;
+
+-openbsd*)
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+- else
+- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+- fi
+- ;;
+ gnu*)
+ # Under GNU Hurd, this test is not required because there is
+ # no limit to the length of command line arguments.
+ # Libtool will interpret -1 as no limit whatsoever
+ lt_cv_sys_max_cmd_len=-1;
- ;;
-- siemens)
-- lt_cv_deplibs_check_method=pass_all
-+
++ ;;
+
+-osf3* | osf4* | osf5*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+ cygwin* | mingw* | cegcc*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
@@ -17834,22 +17849,20 @@
+ # Instead, let's just punt: use the minimum linelength reported by
+ # all of the supported platforms: 8192 (on NT/2K/XP).
+ lt_cv_sys_max_cmd_len=8192;
- ;;
-- pc)
-- lt_cv_deplibs_check_method=pass_all
-+
++ ;;
+
+-rdos*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
+ lt_cv_sys_max_cmd_len=8192;
- ;;
-- esac
-- ;;
-
--sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ ;;
+
+-solaris*)
- lt_cv_deplibs_check_method=pass_all
- ;;
--esac
+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
@@ -17864,17 +17877,22 @@
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ ;;
--fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
--$as_echo "$lt_cv_deplibs_check_method" >&6; }
--file_magic_cmd=$lt_cv_file_magic_cmd
--deplibs_check_method=$lt_cv_deplibs_check_method
--test -z "$deplibs_check_method" && deplibs_check_method=unknown
+-sysv4 | sysv4.3*)
+- case $host_vendor in
+- motorola)
+- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+ interix*)
+ # We know the value 262144 and hardcode it with a safety zone (like BSD)
+ lt_cv_sys_max_cmd_len=196608
-+ ;;
-
+ ;;
+- ncr)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+- sequent)
+- lt_cv_file_magic_cmd='/bin/file'
+- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
++
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -17887,10 +17905,16 @@
+ *1*) lt_cv_sys_max_cmd_len=-1 ;;
+ esac
+ fi
-+ ;;
+ ;;
+- sni)
+- lt_cv_file_magic_cmd='/bin/file'
+- lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+- lt_cv_file_magic_test_file=/lib/libc.so
+ sco3.2v5*)
+ lt_cv_sys_max_cmd_len=102400
-+ ;;
+ ;;
+- siemens)
+- lt_cv_deplibs_check_method=pass_all
+ sysv5* | sco5v6* | sysv4.2uw2*)
+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+ if test -n "$kargmax"; then
@@ -17898,7 +17922,9 @@
+ else
+ lt_cv_sys_max_cmd_len=32768
+ fi
-+ ;;
+ ;;
+- pc)
+- lt_cv_deplibs_check_method=pass_all
+ *)
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+ if test -n "$lt_cv_sys_max_cmd_len"; then
@@ -17929,10 +17955,21 @@
+ # linker. It appears as though 1/2 is a usable value.
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ fi
-+ ;;
-+ esac
-
-+fi
+ ;;
+ esac
+- ;;
+-
+-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+-esac
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+-$as_echo "$lt_cv_deplibs_check_method" >&6; }
+-file_magic_cmd=$lt_cv_file_magic_cmd
+-deplibs_check_method=$lt_cv_deplibs_check_method
+-test -z "$deplibs_check_method" && deplibs_check_method=unknown
+if test -n $lt_cv_sys_max_cmd_len ; then
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
@@ -17943,6 +17980,8 @@
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
@@ -17956,6 +17995,32 @@
-if test "${enable_libtool_lock+set}" = set; then
- enableval=$enable_libtool_lock;
-fi
++: ${CP="cp -f"}
++: ${MV="mv -f"}
++: ${RM="rm -f"}
++
++{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
++$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
++# Try some XSI features
++xsi_shell=no
++( _lt_dummy="a/b/c"
++ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
++ = c,a/b,, \
++ && eval 'test $(( 1 + 1 )) -eq 2 \
++ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
++ && xsi_shell=yes
++{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
++$as_echo "$xsi_shell" >&6; }
++
++
++{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
++$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
++lt_shell_append=no
++( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
++ >/dev/null 2>&1 \
++ && lt_shell_append=yes
++{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
++$as_echo "$lt_shell_append" >&6; }
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
@@ -17983,7 +18048,7 @@
- ;;
-*-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 6005 "configure"' > conftest.$ac_ext
+- echo '#line 6014 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -18017,32 +18082,11 @@
- fi
- rm -rf conftest*
- ;;
-+: ${CP="cp -f"}
-+: ${MV="mv -f"}
-+: ${RM="rm -f"}
-+
-+{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
-+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-+# Try some XSI features
-+xsi_shell=no
-+( _lt_dummy="a/b/c"
-+ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-+ = c,a/b,, \
-+ && eval 'test $(( 1 + 1 )) -eq 2 \
-+ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-+ && xsi_shell=yes
-+{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
-+$as_echo "$xsi_shell" >&6; }
-+
-+
-+{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
-+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-+lt_shell_append=no
-+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-+ >/dev/null 2>&1 \
-+ && lt_shell_append=yes
-+{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
-+$as_echo "$lt_shell_append" >&6; }
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++ lt_unset=unset
++else
++ lt_unset=false
++fi
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|sparc*-*linux*)
@@ -18106,23 +18150,19 @@
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then
- $as_echo_n "(cached) " >&6
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+ lt_unset=unset
- else
+-else
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
+
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ lt_unset=false
-+fi
-int
-main ()
@@ -18137,7 +18177,18 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
--esac
++# test EBCDIC or ASCII
++case `echo X|tr X '\101'` in
++ A) # ASCII based system
++ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
++ lt_SP2NL='tr \040 \012'
++ lt_NL2SP='tr \015\012 \040\040'
++ ;;
++ *) # EBCDIC based system
++ lt_SP2NL='tr \100 \n'
++ lt_NL2SP='tr \r\n \100\100'
++ ;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
@@ -18177,13 +18228,7 @@
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
- fi
-+# test EBCDIC or ASCII
-+case `echo X|tr X '\101'` in
-+ A) # ASCII based system
-+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-+ lt_SP2NL='tr \040 \012'
-+ lt_NL2SP='tr \015\012 \040\040'
- ;;
+- ;;
-sparc*-*solaris*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
@@ -18206,11 +18251,7 @@
- esac
- fi
- rm -rf conftest*
-+ *) # EBCDIC based system
-+ lt_SP2NL='tr \100 \n'
-+ lt_NL2SP='tr \r\n \100\100'
- ;;
-+esac
+- ;;
-esac
@@ -18222,9 +18263,6 @@
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-+
-+
-+
+{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if test "${lt_cv_ld_reload_flag+set}" = set; then
@@ -18506,7 +18544,7 @@
-@@ -6386,236 +6316,229 @@ fi
+@@ -6395,236 +6316,229 @@ fi
@@ -18839,6 +18877,9 @@
- 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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CXX+set}" = set; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+ fi
+ ;;
@@ -18930,9 +18971,8 @@
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CXX+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then
$as_echo_n "(cached) " >&6
else
@@ -18943,7 +18983,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -6624,7 +6547,7 @@ do
+@@ -6633,7 +6547,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -18952,7 +18992,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -6634,32 +6557,28 @@ IFS=$as_save_IFS
+@@ -6643,32 +6557,28 @@ IFS=$as_save_IFS
fi
fi
@@ -18996,7 +19036,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -6668,7 +6587,7 @@ do
+@@ -6677,7 +6587,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -19005,7 +19045,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -6678,21 +6597,17 @@ IFS=$as_save_IFS
+@@ -6687,21 +6597,17 @@ IFS=$as_save_IFS
fi
fi
@@ -19033,7 +19073,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -6700,637 +6615,174 @@ yes:)
+@@ -6709,637 +6615,174 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -19794,7 +19834,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -7339,7 +6791,7 @@ do
+@@ -7348,7 +6791,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -19803,7 +19843,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -7349,408 +6801,125 @@ IFS=$as_save_IFS
+@@ -7358,408 +6801,125 @@ IFS=$as_save_IFS
fi
fi
@@ -20277,7 +20317,7 @@
;;
irix* | nonstopux*)
symcode='[BCDEGRST]'
-@@ -7775,44 +6944,72 @@ sysv4)
+@@ -7784,44 +6944,72 @@ sysv4)
;;
esac
@@ -20362,7 +20402,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -7834,42 +7031,44 @@ EOF
+@@ -7843,42 +7031,44 @@ EOF
fi
# Make sure that we snagged all the symbols we need.
@@ -20427,7 +20467,7 @@
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
lt_save_LIBS="$LIBS"
-@@ -7921,264 +7120,262 @@ else
+@@ -7930,264 +7120,262 @@ else
$as_echo "ok" >&6; }
fi
@@ -20914,7 +20954,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -8187,7 +7384,7 @@ do
+@@ -8196,7 +7384,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -20923,7 +20963,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -8197,10 +7394,10 @@ IFS=$as_save_IFS
+@@ -8206,10 +7394,10 @@ IFS=$as_save_IFS
fi
fi
@@ -20938,7 +20978,7 @@
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
-@@ -8208,17 +7405,17 @@ fi
+@@ -8217,17 +7405,17 @@ fi
fi
@@ -20963,7 +21003,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -8227,7 +7424,7 @@ do
+@@ -8236,7 +7424,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -20972,7 +21012,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -8237,17 +7434,17 @@ IFS=$as_save_IFS
+@@ -8246,17 +7434,17 @@ IFS=$as_save_IFS
fi
fi
@@ -20996,7 +21036,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -8255,210 +7452,22 @@ yes:)
+@@ -8264,210 +7452,22 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -21214,7 +21254,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -8467,7 +7476,7 @@ do
+@@ -8476,7 +7476,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -21223,7 +21263,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -8477,10 +7486,10 @@ IFS=$as_save_IFS
+@@ -8486,10 +7486,10 @@ IFS=$as_save_IFS
fi
fi
@@ -21238,7 +21278,7 @@
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
-@@ -8488,17 +7497,17 @@ fi
+@@ -8497,17 +7497,17 @@ fi
fi
@@ -21263,7 +21303,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -8507,7 +7516,7 @@ do
+@@ -8516,7 +7516,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -21272,7 +21312,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -8517,17 +7526,17 @@ IFS=$as_save_IFS
+@@ -8526,17 +7526,17 @@ IFS=$as_save_IFS
fi
fi
@@ -21296,7 +21336,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -8535,22 +7544,22 @@ yes:)
+@@ -8544,22 +7544,22 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -21326,7 +21366,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -8559,7 +7568,7 @@ do
+@@ -8568,7 +7568,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -21335,7 +21375,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -8569,10 +7578,10 @@ IFS=$as_save_IFS
+@@ -8578,10 +7578,10 @@ IFS=$as_save_IFS
fi
fi
@@ -21350,7 +21390,7 @@
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
-@@ -8580,17 +7589,17 @@ fi
+@@ -8589,17 +7589,17 @@ fi
fi
@@ -21375,7 +21415,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -8599,7 +7608,7 @@ do
+@@ -8608,7 +7608,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -21384,7 +21424,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -8609,17 +7618,17 @@ IFS=$as_save_IFS
+@@ -8618,17 +7618,17 @@ IFS=$as_save_IFS
fi
fi
@@ -21408,7 +21448,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -8627,32 +7636,247 @@ yes:)
+@@ -8636,32 +7636,247 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -21675,7 +21715,7 @@
fi
fi
{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-@@ -8713,27 +7937,27 @@ fi
+@@ -8722,27 +7937,27 @@ fi
rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
@@ -21713,7 +21753,7 @@
esac
;;
esac
-@@ -8743,10 +7967,10 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
+@@ -8752,10 +7967,10 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
_lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
else
@@ -21726,7 +21766,7 @@
else
_lt_dsymutil=
fi
-@@ -8754,2602 +7978,1802 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
+@@ -8763,2602 +7978,1802 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
esac
@@ -21993,11 +22033,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8850: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8859: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8854: \$? = $ac_status" >&5
+- echo "$as_me:8863: \$? = $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.
@@ -22442,11 +22482,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9140: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9149: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:9144: \$? = $ac_status" >&5
+- echo "$as_me:9153: \$? = $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.
@@ -22548,11 +22588,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9244: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9253: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:9248: \$? = $ac_status" >&5
+- echo "$as_me:9257: \$? = $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
@@ -25857,7 +25897,7 @@
;
return 0;
}
-@@ -11375,116 +9799,52 @@ $as_echo "$ac_try_echo") >&5
+@@ -11384,116 +9799,52 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -26000,7 +26040,7 @@
;
return 0;
}
-@@ -11510,5002 +9870,2794 @@ $as_echo "$ac_try_echo") >&5
+@@ -11519,5002 +9870,2794 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -26224,7 +26264,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11646 "configure"
+-#line 11655 "configure"
-#include "confdefs.h"
+ freebsd1*)
+ ld_shlibs=no
@@ -26465,7 +26505,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11746 "configure"
+-#line 11755 "configure"
-#include "confdefs.h"
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -29796,11 +29836,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14155: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14164: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:14159: \$? = $ac_status" >&5
+- echo "$as_me:14168: \$? = $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.
@@ -29914,11 +29954,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14259: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14268: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:14263: \$? = $ac_status" >&5
+- echo "$as_me:14272: \$? = $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
@@ -32315,11 +32355,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15844: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15853: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:15848: \$? = $ac_status" >&5
+- echo "$as_me:15857: \$? = $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.
@@ -32425,11 +32465,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15948: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15957: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:15952: \$? = $ac_status" >&5
+- echo "$as_me:15961: \$? = $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
@@ -33208,7 +33248,7 @@
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16513,5328 +12665,537 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -16522,5328 +12665,537 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -35338,11 +35378,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18165: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18174: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:18169: \$? = $ac_status" >&5
+- echo "$as_me:18178: \$? = $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.
@@ -35628,11 +35668,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18455: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18464: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:18459: \$? = $ac_status" >&5
+- echo "$as_me:18468: \$? = $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.
@@ -35732,11 +35772,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18559: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18568: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:18563: \$? = $ac_status" >&5
+- echo "$as_me:18572: \$? = $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
@@ -39020,7 +39060,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -21848,7 +13209,7 @@ int
+@@ -21857,7 +13209,7 @@ int
main ()
{
static struct stat ac_aggr;
@@ -39029,7 +39069,7 @@
return 0;
;
return 0;
-@@ -21872,7 +13233,7 @@ $as_echo "$ac_try_echo") >&5
+@@ -21881,7 +13233,7 @@ $as_echo "$ac_try_echo") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
@@ -39038,7 +39078,7 @@
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -21888,7 +13249,7 @@ int
+@@ -21897,7 +13249,7 @@ int
main ()
{
static struct stat ac_aggr;
@@ -39047,7 +39087,7 @@
return 0;
;
return 0;
-@@ -21912,12 +13273,12 @@ $as_echo "$ac_try_echo") >&5
+@@ -21921,12 +13273,12 @@ $as_echo "$ac_try_echo") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
@@ -39062,7 +39102,7 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-@@ -21925,19 +13286,19 @@ fi
+@@ -21934,19 +13286,19 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -39089,7 +39129,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -21951,7 +13312,7 @@ int
+@@ -21960,7 +13312,7 @@ int
main ()
{
static struct stat ac_aggr;
@@ -39098,7 +39138,7 @@
return 0;
;
return 0;
-@@ -21975,7 +13336,7 @@ $as_echo "$ac_try_echo") >&5
+@@ -21984,7 +13336,7 @@ $as_echo "$ac_try_echo") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
@@ -39107,7 +39147,7 @@
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -21991,7 +13352,7 @@ int
+@@ -22000,7 +13352,7 @@ int
main ()
{
static struct stat ac_aggr;
@@ -39116,7 +39156,7 @@
return 0;
;
return 0;
-@@ -22015,12 +13376,12 @@ $as_echo "$ac_try_echo") >&5
+@@ -22024,12 +13376,12 @@ $as_echo "$ac_try_echo") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
@@ -39131,7 +39171,7 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-@@ -22028,19 +13389,19 @@ fi
+@@ -22037,19 +13389,19 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -39158,7 +39198,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -22054,7 +13415,7 @@ int
+@@ -22063,7 +13415,7 @@ int
main ()
{
static struct stat ac_aggr;
@@ -39167,7 +39207,7 @@
return 0;
;
return 0;
-@@ -22078,7 +13439,7 @@ $as_echo "$ac_try_echo") >&5
+@@ -22087,7 +13439,7 @@ $as_echo "$ac_try_echo") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
@@ -39176,7 +39216,7 @@
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -22094,7 +13455,7 @@ int
+@@ -22103,7 +13455,7 @@ int
main ()
{
static struct stat ac_aggr;
@@ -39185,17 +39225,16 @@
return 0;
;
return 0;
-@@ -22118,408 +13479,556 @@ $as_echo "$ac_try_echo") >&5
+@@ -22127,369 +13479,556 @@ $as_echo "$ac_try_echo") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_atim_tv_nsec=yes
+ ac_cv_member_struct_stat_st_ctim_tv_nsec=yes
- else
- $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_member_struct_stat_st_atim_tv_nsec=no
++else
++ $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_member_struct_stat_st_ctim_tv_nsec=no
+fi
+
@@ -39412,11 +39451,16 @@
+if test -n "$GTKDOC_CHECK"; then
+ { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
+$as_echo "$GTKDOC_CHECK" >&6; }
-+else
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_member_struct_stat_st_atim_tv_nsec=no
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
-+fi
-+
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ test -n "$GTKDOC_CHECK" && break
+done
@@ -39428,8 +39472,9 @@
+else
+ ENABLE_GTK_DOC_TRUE='#'
+ ENABLE_GTK_DOC_FALSE=
-+fi
-+
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test -n "$LIBTOOL"; then
+ GTK_DOC_USE_LIBTOOL_TRUE=
+ GTK_DOC_USE_LIBTOOL_FALSE='#'
@@ -39437,21 +39482,15 @@
+ GTK_DOC_USE_LIBTOOL_TRUE='#'
+ GTK_DOC_USE_LIBTOOL_FALSE=
fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_atim_tv_nsec" >&5
-$as_echo "$ac_cv_member_struct_stat_st_atim_tv_nsec" >&6; }
-if test "x$ac_cv_member_struct_stat_st_atim_tv_nsec" = x""yes; then
-+DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1
-_ACEOF
++DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
-fi
-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_ctimensec" >&5
@@ -39485,6 +39524,8 @@
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
++
++
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5
+$as_echo_n "checking for GLIB... " >&6; }
@@ -39589,12 +39630,71 @@
+if test $pkg_failed = yes; then
--fi
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
+ fi
-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_ctim.tv_nsec" >&5
-$as_echo_n "checking for struct stat.st_ctim.tv_nsec... " >&6; }
-if test "${ac_cv_member_struct_stat_st_ctim_tv_nsec+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
++ if test $_pkg_short_errors_supported = yes; then
++ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.19.1 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0"`
++ else
++ GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.19.1 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GLIB_PKG_ERRORS" >&5
++
++ { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.19.1 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0) were not met:
++
++$GLIB_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++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.
++" >&5
++$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.19.1 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0) were not met:
++
++$GLIB_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++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.
++" >&2;}
++ { (exit 1); exit 1; }; }
++elif test $pkg_failed = untried; then
++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++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.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++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.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }; }
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -39621,31 +39721,43 @@
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
++ GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
++ GLIB_LIBS=$pkg_cv_GLIB_LIBS
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++ :
++fi
++
++
++
++
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5
++$as_echo_n "checking for DBUS... " >&6; }
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DBUS_CFLAGS"; then
++ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1\"") >&5
++ ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
+ ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_ctim_tv_nsec=yes
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
++ (exit $ac_status); }; then
++ pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1" 2>/dev/null`
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.19.1 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0"`
-+ else
-+ GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.19.1 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GLIB_PKG_ERRORS" >&5
-
+-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -39672,71 +39784,15 @@
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
-+ { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.19.1 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0) were not met:
-+
-+$GLIB_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+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.
-+" >&5
-+$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.19.1 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0) were not met:
-+
-+$GLIB_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+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.
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+elif test $pkg_failed = untried; then
-+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+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.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+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.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }; }
++ pkg_failed=yes
++fi
++ fi
+else
-+ GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
-+ GLIB_LIBS=$pkg_cv_GLIB_LIBS
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ :
++ pkg_failed=untried
+fi
-+
-+
-+
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5
-+$as_echo_n "checking for DBUS... " >&6; }
-+
+if test -n "$PKG_CONFIG"; then
-+ if test -n "$DBUS_CFLAGS"; then
-+ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
++ if test -n "$DBUS_LIBS"; then
++ pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1\"") >&5
@@ -39752,7 +39808,7 @@
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_ctim_tv_nsec=yes
+ (exit $ac_status); }; then
-+ pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1" 2>/dev/null`
++ pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1" 2>/dev/null`
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -39766,26 +39822,9 @@
+else
+ pkg_failed=untried
fi
--
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$DBUS_LIBS"; then
-+ pkg_cv_DBUS_LIBS="$DBUS_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_ctim_tv_nsec" >&5
-$as_echo "$ac_cv_member_struct_stat_st_ctim_tv_nsec" >&6; }
-if test "x$ac_cv_member_struct_stat_st_ctim_tv_nsec" = x""yes; then
@@ -39794,9 +39833,8 @@
-#define HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC 1
-_ACEOF
-
+if test $pkg_failed = yes; then
-+
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
@@ -39865,10 +39903,6 @@
-if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
+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.
@@ -39880,10 +39914,34 @@
+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
-
++
+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.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++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.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
++ DBUS_LIBS=$pkg_cv_DBUS_LIBS
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++ :
+ fi
+
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
@@ -39914,11 +39972,6 @@
-done
-done
-IFS=$as_save_IFS
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
- ;;
-esac
@@ -39927,21 +39980,14 @@
-if test -n "$ac_pt_PKG_CONFIG"; then
- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&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.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }; }
++
++# Check whether --with-dbus_service_dir was given.
++if test "${with_dbus_service_dir+set}" = set; then
++ withval=$with_dbus_service_dir; with_dbus_service_dir="$withval"
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-+ DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
-+ DBUS_LIBS=$pkg_cv_DBUS_LIBS
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ :
++ with_dbus_service_dir=$datadir/dbus-1/services
fi
- if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -39955,15 +40001,22 @@
-esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
- fi
-+
-+
-+
-+# Check whether --with-dbus_service_dir was given.
-+if test "${with_dbus_service_dir+set}" = set; then
-+ withval=$with_dbus_service_dir; with_dbus_service_dir="$withval"
++DBUS_SERVICE_DIR=$with_dbus_service_dir
++
++
++giomodulesdir=`pkg-config --variable=giomoduledir gio-2.0`
++
++
++
++
++ { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
++$as_echo_n "checking whether NLS is requested... " >&6; }
++ # Check whether --enable-nls was given.
++if test "${enable_nls+set}" = set; then
++ enableval=$enable_nls; USE_NLS=$enableval
else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-+ with_dbus_service_dir=$datadir/dbus-1/services
++ USE_NLS=yes
fi
-fi
@@ -39979,52 +40032,12 @@
-$as_echo "no" >&6; }
- PKG_CONFIG=""
- fi
-+DBUS_SERVICE_DIR=$with_dbus_service_dir
-
--fi
-+
-+giomodulesdir=`pkg-config --variable=giomoduledir gio-2.0`
-
-
-
--# Check whether --with-html-dir was given.
--if test "${with_html_dir+set}" = set; then
-- withval=$with_html_dir;
-+
-+ { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-+$as_echo_n "checking whether NLS is requested... " >&6; }
-+ # Check whether --enable-nls was given.
-+if test "${enable_nls+set}" = set; then
-+ enableval=$enable_nls; USE_NLS=$enableval
- else
-- with_html_dir='${datadir}/gtk-doc/html'
-+ USE_NLS=yes
- fi
-
-- HTML_DIR="$with_html_dir"
+ { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
-
-
-- # Check whether --enable-gtk-doc was given.
--if test "${enable_gtk_doc+set}" = set; then
-- enableval=$enable_gtk_doc;
--else
-- enable_gtk_doc=no
--fi
-
-
-- if test x$enable_gtk_doc = xyes; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc\"") >&5
-- ($PKG_CONFIG --exists --print-errors "gtk-doc") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- :
--else
-- { { $as_echo "$as_me:$LINENO: error: gtk-doc not installed and --enable-gtk-doc requested" >&5
--$as_echo "$as_me: error: gtk-doc not installed and --enable-gtk-doc requested" >&2;}
++
++
++
++
+case "$am__api_version" in
+ 1.01234)
+ { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
@@ -40042,20 +40055,15 @@
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+ INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-+
+
+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+ { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5
+$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}
- { (exit 1); exit 1; }; }
++ { (exit 1); exit 1; }; }
fi
-- fi
-
-- { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5
--$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
-- { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5
--$as_echo "$enable_gtk_doc" >&6; }
+
-
- # Extract the first word of "gtkdoc-check", so it can be a program name with args.
-set dummy gtkdoc-check; ac_word=$2
@@ -40075,7 +40083,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -22529,7 +14038,7 @@ do
+@@ -22499,7 +14038,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -40084,7 +40092,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -22540,28 +14049,26 @@ IFS=$as_save_IFS
+@@ -22510,28 +14049,26 @@ IFS=$as_save_IFS
;;
esac
fi
@@ -40122,7 +40130,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -22571,7 +14078,7 @@ do
+@@ -22541,7 +14078,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -40131,7 +40139,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -22582,340 +14089,269 @@ IFS=$as_save_IFS
+@@ -22552,30 +14089,26 @@ IFS=$as_save_IFS
;;
esac
fi
@@ -40150,72 +40158,60 @@
- test -n "$GTKDOC_REBASE" && break
+-done
+-test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true"
+-
+- # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
+-set dummy gtkdoc-mkpdf; ac_word=$2
+# Extract the first word of "intltool-extract", so it can be a program name with args.
+set dummy intltool-extract; ac_word=$2
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then
+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
-+ $as_echo_n "(cached) " >&6
-+else
+ $as_echo_n "(cached) " >&6
+ else
+- case $GTKDOC_MKPDF in
+ case $INTLTOOL_EXTRACT in
-+ [\\/]* | ?:[\\/]*)
+ [\\/]* | ?:[\\/]*)
+- ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path.
+ ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -22585,7 +14118,7 @@ do
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
- done
--test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true"
--
-+done
-+IFS=$as_save_IFS
-
-- if test x$enable_gtk_doc = xyes; then
-- ENABLE_GTK_DOC_TRUE=
-- ENABLE_GTK_DOC_FALSE='#'
--else
-- ENABLE_GTK_DOC_TRUE='#'
-- ENABLE_GTK_DOC_FALSE=
-+ ;;
-+esac
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -22596,411 +14129,229 @@ IFS=$as_save_IFS
+ ;;
+ esac
fi
--
-- if test -n "$LIBTOOL"; then
-- GTK_DOC_USE_LIBTOOL_TRUE=
-- GTK_DOC_USE_LIBTOOL_FALSE='#'
+-GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
+-if test -n "$GTKDOC_MKPDF"; then
+- { $as_echo "$as_me:$LINENO: result: $GTKDOC_MKPDF" >&5
+-$as_echo "$GTKDOC_MKPDF" >&6; }
+INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
+if test -n "$INTLTOOL_EXTRACT"; then
+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
+$as_echo "$INTLTOOL_EXTRACT" >&6; }
else
-- GTK_DOC_USE_LIBTOOL_TRUE='#'
-- GTK_DOC_USE_LIBTOOL_FALSE=
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
-- if test -n "$GTKDOC_REBASE"; then
-- GTK_DOC_USE_REBASE_TRUE=
-- GTK_DOC_USE_REBASE_FALSE='#'
--else
-- GTK_DOC_USE_REBASE_TRUE='#'
-- GTK_DOC_USE_REBASE_FALSE=
-+
+
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+ { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
+$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
+ { (exit 1); exit 1; }; }
- fi
-
++fi
++
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -40257,25 +40253,106 @@
+
+
+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
+
+
+-# Check whether --with-html-dir was given.
+-if test "${with_html_dir+set}" = set; then
+- withval=$with_html_dir;
+-else
+- with_html_dir='${datadir}/gtk-doc/html'
+-fi
+
+- HTML_DIR="$with_html_dir"
+
+
+- # Check whether --enable-gtk-doc was given.
+-if test "${enable_gtk_doc+set}" = set; then
+- enableval=$enable_gtk_doc;
+-else
+- enable_gtk_doc=no
+-fi
+
+
+- if test x$enable_gtk_doc = xyes; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gtk-doc") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- :
+-else
+- { { $as_echo "$as_me:$LINENO: error: gtk-doc not installed and --enable-gtk-doc requested" >&5
+-$as_echo "$as_me: error: gtk-doc not installed and --enable-gtk-doc requested" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+- fi
+
+- { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5
+-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
+- { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5
+-$as_echo "$enable_gtk_doc" >&6; }
+
+- # Check whether --enable-gtk-doc-html was given.
+-if test "${enable_gtk_doc_html+set}" = set; then
+- enableval=$enable_gtk_doc_html;
+-else
+- enable_gtk_doc_html=yes
+-fi
+
+- # Check whether --enable-gtk-doc-pdf was given.
+-if test "${enable_gtk_doc_pdf+set}" = set; then
+- enableval=$enable_gtk_doc_pdf;
+-else
+- enable_gtk_doc_pdf=no
+-fi
+
+
+- if test -n "$GTKDOC_MKPDF"; then
+- enable_gtk_doc_pdf=no
+- fi
+
+
+- if test x$enable_gtk_doc = xyes; then
+- ENABLE_GTK_DOC_TRUE=
+- ENABLE_GTK_DOC_FALSE='#'
+-else
+- ENABLE_GTK_DOC_TRUE='#'
+- ENABLE_GTK_DOC_FALSE=
+-fi
+
+- if test x$enable_gtk_doc_html = xyes; then
+- GTK_DOC_BUILD_HTML_TRUE=
+- GTK_DOC_BUILD_HTML_FALSE='#'
+-else
+- GTK_DOC_BUILD_HTML_TRUE='#'
+- GTK_DOC_BUILD_HTML_FALSE=
+-fi
+
+- if test x$enable_gtk_doc_pdf = xyes; then
+- GTK_DOC_BUILD_PDF_TRUE=
+- GTK_DOC_BUILD_PDF_FALSE='#'
+-else
+- GTK_DOC_BUILD_PDF_TRUE='#'
+- GTK_DOC_BUILD_PDF_FALSE=
+-fi
+
+- if test -n "$LIBTOOL"; then
+- GTK_DOC_USE_LIBTOOL_TRUE=
+- GTK_DOC_USE_LIBTOOL_FALSE='#'
+-else
+- GTK_DOC_USE_LIBTOOL_TRUE='#'
+- GTK_DOC_USE_LIBTOOL_FALSE=
+-fi
+
+- if test -n "$GTKDOC_REBASE"; then
+- GTK_DOC_USE_REBASE_TRUE=
+- GTK_DOC_USE_REBASE_FALSE='#'
+-else
+- GTK_DOC_USE_REBASE_TRUE='#'
+- GTK_DOC_USE_REBASE_FALSE=
+-fi
+
-DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
@@ -40654,7 +40731,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -22925,7 +14361,7 @@ do
+@@ -23010,7 +14361,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -40663,7 +40740,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -22936,26 +14372,26 @@ IFS=$as_save_IFS
+@@ -23021,26 +14372,26 @@ IFS=$as_save_IFS
;;
esac
fi
@@ -40699,7 +40776,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -22965,7 +14401,7 @@ do
+@@ -23050,7 +14401,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -40708,7 +40785,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -22973,29 +14409,44 @@ done
+@@ -23058,29 +14409,44 @@ done
done
IFS=$as_save_IFS
@@ -40762,7 +40839,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -23005,7 +14456,7 @@ do
+@@ -23090,7 +14456,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -40771,7 +40848,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -23016,307 +14467,630 @@ IFS=$as_save_IFS
+@@ -23101,307 +14467,630 @@ IFS=$as_save_IFS
;;
esac
fi
@@ -41640,7 +41717,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23324,11 +15098,12 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -23409,11 +15098,12 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -41655,7 +41732,7 @@
;
return 0;
}
-@@ -23354,16 +15129,31 @@ $as_echo "$ac_try_echo") >&5
+@@ -23439,16 +15129,31 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -41693,7 +41770,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -23372,12 +15162,12 @@ _ACEOF
+@@ -23457,12 +15162,12 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -41709,7 +41786,7 @@
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
-@@ -23387,7 +15177,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -23472,7 +15177,7 @@ cat >>conftest.$ac_ext <<_ACEOF
# include <assert.h>
#endif
@@ -41718,7 +41795,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -23395,18 +15185,18 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -23480,18 +15185,18 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -41740,7 +41817,7 @@
;
return 0;
}
-@@ -23432,87 +15222,145 @@ $as_echo "$ac_try_echo") >&5
+@@ -23517,87 +15222,145 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -41933,7 +42010,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -23521,125 +15369,130 @@ $as_echo "$ac_try_echo") >&5
+@@ -23606,125 +15369,130 @@ $as_echo "$ac_try_echo") >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -42134,7 +42211,7 @@
;
return 0;
}
-@@ -23665,67 +15518,60 @@ $as_echo "$ac_try_echo") >&5
+@@ -23750,67 +15518,60 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -42231,7 +42308,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -23734,105 +15580,221 @@ $as_echo "$ac_try_echo") >&5
+@@ -23819,105 +15580,221 @@ $as_echo "$ac_try_echo") >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -42513,7 +42590,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -23841,13 +15803,41 @@ _ACEOF
+@@ -23926,13 +15803,41 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -42557,7 +42634,7 @@
;
return 0;
}
-@@ -23873,41 +15863,150 @@ $as_echo "$ac_try_echo") >&5
+@@ -23958,41 +15863,150 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -42725,7 +42802,7 @@
;
return 0;
}
-@@ -23933,31 +16032,17 @@ $as_echo "$ac_try_echo") >&5
+@@ -24018,31 +16032,17 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -42764,7 +42841,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -23966,12 +16051,12 @@ _ACEOF
+@@ -24051,12 +16051,12 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -42780,7 +42857,7 @@
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
-@@ -23981,7 +16066,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -24066,7 +16066,7 @@ cat >>conftest.$ac_ext <<_ACEOF
# include <assert.h>
#endif
@@ -42789,7 +42866,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -23989,18 +16074,18 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -24074,18 +16074,18 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -42811,7 +42888,7 @@
;
return 0;
}
-@@ -24026,145 +16111,245 @@ $as_echo "$ac_try_echo") >&5
+@@ -24111,145 +16111,245 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -43164,7 +43241,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24173,118 +16358,146 @@ $as_echo "$ac_try_echo") >&5
+@@ -24258,118 +16358,146 @@ $as_echo "$ac_try_echo") >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -43378,7 +43455,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -24292,11 +16505,18 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -24377,11 +16505,18 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -43399,7 +43476,7 @@
;
return 0;
}
-@@ -24322,35 +16542,62 @@ $as_echo "$ac_try_echo") >&5
+@@ -24407,35 +16542,62 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -43474,7 +43551,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -24358,11 +16605,18 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -24443,11 +16605,18 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -43495,7 +43572,7 @@
;
return 0;
}
-@@ -24388,74 +16642,36 @@ $as_echo "$ac_try_echo") >&5
+@@ -24473,74 +16642,36 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -43582,7 +43659,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -24463,18 +16679,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -24548,18 +16679,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -43603,7 +43680,7 @@
;
return 0;
}
-@@ -24500,129 +16709,47 @@ $as_echo "$ac_try_echo") >&5
+@@ -24585,129 +16709,47 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -43756,7 +43833,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -24630,23 +16757,23 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -24715,23 +16757,23 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -43790,7 +43867,7 @@
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -24667,809 +16794,767 @@ $as_echo "$ac_try_echo") >&5
+@@ -24752,809 +16794,767 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -45231,7 +45308,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25483,11 +17568,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -25568,11 +17568,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -45245,7 +45322,7 @@
;
return 0;
}
-@@ -25513,12 +17598,12 @@ $as_echo "$ac_try_echo") >&5
+@@ -25598,12 +17598,12 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -45260,7 +45337,7 @@
fi
rm -rf conftest.dSYM
-@@ -25526,170 +17611,95 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -25611,170 +17611,95 @@ rm -f core conftest.err conftest.$ac_obj
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -45480,7 +45557,7 @@
fi
-@@ -25702,33 +17712,33 @@ else
+@@ -25787,33 +17712,33 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -45525,7 +45602,7 @@
See the pkg-config man page for more details.
" >&2;}
{ (exit 1); exit 1; }; }
-@@ -25739,8 +17749,8 @@ $as_echo "$as_me: error: in \`$ac_pwd':"
+@@ -25824,8 +17749,8 @@ $as_echo "$as_me: error: in \`$ac_pwd':"
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -45536,7 +45613,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-@@ -25749,23 +17759,23 @@ $as_echo "$as_me: error: The pkg-config
+@@ -25834,23 +17759,23 @@ $as_echo "$as_me: error: The pkg-config
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -45565,7 +45642,7 @@
_ACEOF
fi
-@@ -25773,334 +17783,295 @@ fi
+@@ -25858,334 +17783,295 @@ fi
@@ -46128,7 +46205,7 @@
fi
-@@ -26113,33 +18084,33 @@ else
+@@ -26198,33 +18084,33 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -46173,7 +46250,7 @@
See the pkg-config man page for more details.
" >&2;}
{ (exit 1); exit 1; }; }
-@@ -26150,8 +18121,8 @@ $as_echo "$as_me: error: in \`$ac_pwd':"
+@@ -26235,8 +18121,8 @@ $as_echo "$as_me: error: in \`$ac_pwd':"
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -46184,7 +46261,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-@@ -26160,98 +18131,119 @@ $as_echo "$as_me: error: The pkg-config
+@@ -26245,98 +18131,119 @@ $as_echo "$as_me: error: The pkg-config
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -46347,7 +46424,7 @@
fi
-@@ -26264,33 +18256,33 @@ else
+@@ -26349,33 +18256,33 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -46392,7 +46469,7 @@
See the pkg-config man page for more details.
" >&2;}
{ (exit 1); exit 1; }; }
-@@ -26301,8 +18293,8 @@ $as_echo "$as_me: error: in \`$ac_pwd':"
+@@ -26386,8 +18293,8 @@ $as_echo "$as_me: error: in \`$ac_pwd':"
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -46403,7 +46480,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-@@ -26311,175 +18303,105 @@ $as_echo "$as_me: error: The pkg-config
+@@ -26396,175 +18303,105 @@ $as_echo "$as_me: error: The pkg-config
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -46628,7 +46705,7 @@
fi
-@@ -26492,33 +18414,33 @@ else
+@@ -26577,33 +18414,33 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -46650,9 +46727,10 @@
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-
+-
-Alternatively, you may set the environment variables CDDA_CFLAGS
-and CDDA_LIBS to avoid the need to call pkg-config.
++
+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.
@@ -46673,7 +46751,7 @@
See the pkg-config man page for more details.
" >&2;}
{ (exit 1); exit 1; }; }
-@@ -26529,8 +18451,8 @@ $as_echo "$as_me: error: in \`$ac_pwd':"
+@@ -26614,8 +18451,8 @@ $as_echo "$as_me: error: in \`$ac_pwd':"
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -46684,7 +46762,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-@@ -26539,23 +18461,23 @@ $as_echo "$as_me: error: The pkg-config
+@@ -26624,23 +18461,23 @@ $as_echo "$as_me: error: The pkg-config
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -46713,7 +46791,7 @@
_ACEOF
fi
-@@ -26564,72 +18486,252 @@ fi
+@@ -26649,72 +18486,252 @@ fi
@@ -46919,11 +46997,11 @@
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
+#include <libsmbclient.h>
+
+int
@@ -46960,11 +47038,11 @@
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+#include <libsmbclient.h>
-/* Override any GCC internal prototype to avoid an error.
@@ -47000,7 +47078,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -26638,52 +18740,52 @@ $as_echo "$ac_try_echo") >&5
+@@ -26723,52 +18740,52 @@ $as_echo "$ac_try_echo") >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -47084,7 +47162,7 @@
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
-@@ -26703,607 +18805,756 @@ $as_echo "$ac_try_echo") >&5
+@@ -26788,607 +18805,756 @@ $as_echo "$ac_try_echo") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
@@ -47357,7 +47435,7 @@
- echo "$OBEXFTP_PKG_ERRORS" >&5
-
- { { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 bluez >= 4.0) were not met:
-
+-
-$OBEXFTP_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
@@ -47368,7 +47446,7 @@
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (dbus-glib-1 bluez >= 4.0) were not met:
--
+
-$OBEXFTP_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
@@ -48294,7 +48372,7 @@
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
-@@ -27323,2614 +19574,2488 @@ $as_echo "$ac_try_echo") >&5
+@@ -27408,2628 +19574,2488 @@ $as_echo "$ac_try_echo") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
@@ -48431,78 +48509,15 @@
+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ fi
-+fi
+ fi
+rm -f confcache
-+
+
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+
-+DEFS=-DHAVE_CONFIG_H
-+
-+ac_libobjs=
-+ac_ltlibobjs=
-+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-+ # 1. Remove the extension, and $U if already installed.
-+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
-+ # will be set to the directory where LIBOBJS objects are built.
-+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-+done
-+LIBOBJS=$ac_libobjs
-+
-+LTLIBOBJS=$ac_ltlibobjs
-+
-+
-+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-+ { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-+ { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
-+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
-+ { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
- fi
-
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+ ac_config_commands="$ac_config_commands po/stamp-it"
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -48526,6 +48541,7 @@
-$as_echo "$as_me: WARNING: libsmbclient.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: libsmbclient.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: libsmbclient.h: in the future, the compiler will take precedence" >&2;}
++DEFS=-DHAVE_CONFIG_H
- ;;
-esac
@@ -48535,25 +48551,95 @@
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_libsmbclient_h=$ac_header_preproc
++ac_libobjs=
++ac_ltlibobjs=
++for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
++ # 1. Remove the extension, and $U if already installed.
++ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
++ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
++ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
++ # will be set to the directory where LIBOBJS objects are built.
++ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
++ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
++done
++LIBOBJS=$ac_libobjs
++
++LTLIBOBJS=$ac_ltlibobjs
++
++
++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
++ { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
++ { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libsmbclient_h" >&5
+-$as_echo "$ac_cv_header_libsmbclient_h" >&6; }
+-
++if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
++ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
+ fi
+-if test "x$ac_cv_header_libsmbclient_h" = x""yes; then
+- samba_includes="yes"
++if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
++ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
++ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
++ { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
+ fi
+
++ ac_config_commands="$ac_config_commands po/stamp-it"
+
+- CPPFLAGS="$CPPFLAGS_save"
+
+- if test "x{samba_includes}" != "xno" -a "x${samba_includes}" != "x"; then
+- have_samba_includes="yes"
+- if test "${with_samba_includes}" != "/usr/include" ; then
+- SAMBA_CFLAGS="-I$with_samba_includes"
+- else
+- SAMBA_CFLAGS=""
+- fi
+if test -z "${HAVE_HTTP_TRUE}" && test -z "${HAVE_HTTP_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_HTTP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"HAVE_HTTP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libsmbclient_h" >&5
--$as_echo "$ac_cv_header_libsmbclient_h" >&6; }
--
++fi
+if test -z "${HAVE_AVAHI_TRUE}" && test -z "${HAVE_AVAHI_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_AVAHI\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"HAVE_AVAHI\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
- fi
--if test "x$ac_cv_header_libsmbclient_h" = x""yes; then
-- samba_includes="yes"
++fi
+if test -z "${HAVE_AVAHI_TRUE}" && test -z "${HAVE_AVAHI_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_AVAHI\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
@@ -48644,31 +48730,8 @@
+$as_echo "$as_me: error: conditional \"ENABLE_BASHCOMP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
- fi
-
-+: ${CONFIG_STATUS=./config.status}
-+ac_write_fail=0
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+#! $SHELL
-+# Generated by $as_me.
-+# Run this file to recreate the current configuration.
-+# Compiler output produced by configure, useful for debugging
-+# configure, is in config.log if it exists.
-
-- CPPFLAGS="$CPPFLAGS_save"
--
-- if test "x{samba_includes}" != "xno" -a "x${samba_includes}" != "x"; then
-- have_samba_includes="yes"
-- if test "${with_samba_includes}" != "/usr/include" ; then
-- SAMBA_CFLAGS="-I$with_samba_includes"
-- else
-- SAMBA_CFLAGS=""
-- fi
--
++fi
+
- CPPFLAGS="$CPPFLAGS -I$with_samba_includes"
- { $as_echo "$as_me:$LINENO: checking for SMBCCTX.flags" >&5
-$as_echo_n "checking for SMBCCTX.flags... " >&6; }
@@ -48682,7 +48745,19 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <libsmbclient.h>
--
++: ${CONFIG_STATUS=./config.status}
++ac_write_fail=0
++ac_clean_files_save=$ac_clean_files
++ac_clean_files="$ac_clean_files $CONFIG_STATUS"
++{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
++$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
++cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++#! $SHELL
++# Generated by $as_me.
++# Run this file to recreate the current configuration.
++# Compiler output produced by configure, useful for debugging
++# configure, is in config.log if it exists.
+
-int
-main ()
-{
@@ -49313,11 +49388,13 @@
+ CONFIG_LINKS = $CONFIG_LINKS
+ CONFIG_COMMANDS = $CONFIG_COMMANDS
+ $ $0 $@
++
++on `(hostname || uname -n) 2>/dev/null | sed 1q`
++"
- ac_cv_lib_smbclient_smbc_new_context=no
-fi
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
++_ACEOF
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -49331,7 +49408,9 @@
-else
- samba_old_libs="no"
-fi
-+_ACEOF
++case $ac_config_files in *"
++"*) set x $ac_config_files; shift; ac_config_files=$*;;
++esac
- if test "x${samba_old_libs}" != "xno"; then
- msg_samba="Too old, need at least samba 3.0.22"
@@ -49352,10 +49431,6 @@
- HAVE_SAMBA_TRUE='#'
- HAVE_SAMBA_FALSE=
-fi
-+case $ac_config_files in *"
-+"*) set x $ac_config_files; shift; ac_config_files=$*;;
-+esac
-
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
@@ -49374,14 +49449,12 @@
+\`$as_me' instantiates files from templates according to the
+current configuration.
++Usage: $0 [OPTION]... [FILE]...
+
-# Check whether --enable-archive was given.
-if test "${enable_archive+set}" = set; then
- enableval=$enable_archive;
-fi
-+Usage: $0 [OPTION]... [FILE]...
-
--msg_archive="no"
--if test "x$enable_archive" != "xno"; then
+ -h, --help print this help, then exit
+ -V, --version print version number and configuration settings, then exit
+ -q, --quiet, --silent
@@ -49393,21 +49466,23 @@
+ --header=FILE[:TEMPLATE]
+ instantiate the configuration header FILE
+-msg_archive="no"
+-if test "x$enable_archive" != "xno"; then
++Configuration files:
++$config_files
+
-# Check whether --with-archive-includes was given.
-if test "${with_archive_includes+set}" = set; then
- withval=$with_archive_includes; with_archive_includes="$withval"
-else
- with_archive_includes="/usr/include"
-fi
-+Configuration files:
-+$config_files
++Configuration headers:
++$config_headers
- have_archive_includes="no"
- if test "x${with_archive_includes}" != "xno"; then
- CPPFLAGS_save="$CPPFLAGS"
-+Configuration headers:
-+$config_headers
-+
+Configuration commands:
+$config_commands
+
@@ -50077,7 +50152,10 @@
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
-+{
+ {
+-return archive_entry_filetype ();
+- ;
+- return 0;
+ tmp=
+ trap 'exit_status=$?
+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
@@ -50090,10 +50168,7 @@
+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+ test -n "$tmp" && test -d "$tmp"
+} ||
- {
--return archive_entry_filetype ();
-- ;
-- return 0;
++{
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+} ||
@@ -50482,18 +50557,6 @@
-done
-done
-IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
--if test -n "$GLIB_GENMARSHAL"; then
-- { $as_echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5
--$as_echo "$GLIB_GENMARSHAL" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
+ case $ac_tag in
+ :[FHLC]) ac_mode=$ac_tag; continue;;
+ esac
@@ -50513,6 +50576,17 @@
+ ac_file=$1
+ shift
+- ;;
+-esac
+-fi
+-GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
+-if test -n "$GLIB_GENMARSHAL"; then
+- { $as_echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5
+-$as_echo "$GLIB_GENMARSHAL" >&6; }
+-else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+ case $ac_mode in
+ :L) ac_source=$1;;
+ :[FH])
@@ -50565,10 +50639,6 @@
+ ;;
+ esac
--# Check whether --enable-more-warnings was given.
--if test "${enable_more_warnings+set}" = set; then
-- enableval=$enable_more_warnings; set_more_warnings="$enableval"
--else
+ ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$ac_file" : 'X\(//\)[^/]' \| \
@@ -50635,12 +50705,10 @@
+ { (exit 1); exit 1; }; }; }
+ ac_builddir=.
--if test -f $srcdir/CVSVERSION; then
-- is_cvs_version=true
-- set_more_warnings=yes
+-# Check whether --enable-more-warnings was given.
+-if test "${enable_more_warnings+set}" = set; then
+- enableval=$enable_more_warnings; set_more_warnings="$enableval"
-else
-- set_more_warnings=no
--fi
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
@@ -50657,6 +50725,11 @@
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+-if test -f $srcdir/CVSVERSION; then
+- is_cvs_version=true
+- set_more_warnings=yes
+-else
+- set_more_warnings=no
-fi
+case $srcdir in
+ .) # We are building in place.
@@ -50674,6 +50747,8 @@
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+-fi
+
-{ $as_echo "$as_me:$LINENO: checking for more warnings" >&5
-$as_echo_n "checking for more warnings... " >&6; }
-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
@@ -50685,6 +50760,11 @@
- -Wnested-externs -Wpointer-arith \
- -Wcast-align -Wsign-compare \
- $CFLAGS"
++ case $ac_mode in
++ :F)
++ #
++ # CONFIG_FILE
++ #
- for option in -Wno-strict-aliasing -Wno-sign-compare; do
- SAVE_CFLAGS="$CFLAGS"
@@ -50693,12 +50773,6 @@
-$as_echo_n "checking whether gcc understands $option... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+ case $ac_mode in
-+ :F)
-+ #
-+ # CONFIG_FILE
-+ #
-+
+ case $INSTALL in
+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
@@ -51175,6 +51249,20 @@
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
+-if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
-if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
@@ -53107,9 +53195,10 @@
{ { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
{ (exit 1); exit 1; }; }
-diff -pruN gvfs-1.2.2/daemon/Makefile.in gvfs-1.2.2.new/daemon/Makefile.in
---- gvfs-1.2.2/daemon/Makefile.in 2009-04-13 19:30:56.000000000 +0200
-+++ gvfs-1.2.2.new/daemon/Makefile.in 2009-04-27 22:38:10.840176308 +0200
+Index: gvfs-1.2.3/daemon/Makefile.in
+===================================================================
+--- gvfs-1.2.3.orig/daemon/Makefile.in 2009-05-18 14:10:03.000000000 +0200
++++ gvfs-1.2.3/daemon/Makefile.in 2009-05-29 09:12:32.997609324 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -53144,15 +53233,16 @@
FUSE_CFLAGS = @FUSE_CFLAGS@
FUSE_LIBS = @FUSE_LIBS@
GCONF_CFLAGS = @GCONF_CFLAGS@
-@@ -330,7 +325,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
+@@ -330,8 +325,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
-@@ -343,48 +337,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -344,48 +337,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
@@ -53208,7 +53298,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -415,8 +397,7 @@ abs_srcdir = @abs_srcdir@
+@@ -416,8 +397,7 @@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
@@ -53218,7 +53308,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -448,6 +429,7 @@ libdir = @libdir@
+@@ -449,6 +429,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -53226,7 +53316,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -478,7 +460,7 @@ INCLUDES = \
+@@ -479,7 +460,7 @@ INCLUDES = \
-DLIBEXEC_DIR=\"$(libexecdir)/\" \
-DMOUNTABLE_DIR=\"$(mountdir)/\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -53235,7 +53325,7 @@
noinst_LTLIBRARIES = libdaemon.la
libraries = \
-@@ -780,12 +762,12 @@ all: $(BUILT_SOURCES)
+@@ -781,12 +762,12 @@ all: $(BUILT_SOURCES)
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -53251,7 +53341,7 @@
exit 1;; \
esac; \
done; \
-@@ -805,9 +787,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -806,9 +787,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53263,7 +53353,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -2012,7 +1994,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -2013,7 +1994,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -53272,9 +53362,10 @@
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-diff -pruN gvfs-1.2.2/daemon/trashlib/Makefile.in gvfs-1.2.2.new/daemon/trashlib/Makefile.in
---- gvfs-1.2.2/daemon/trashlib/Makefile.in 2009-04-13 19:30:56.000000000 +0200
-+++ gvfs-1.2.2.new/daemon/trashlib/Makefile.in 2009-04-27 22:38:10.976173975 +0200
+Index: gvfs-1.2.3/daemon/trashlib/Makefile.in
+===================================================================
+--- gvfs-1.2.3.orig/daemon/trashlib/Makefile.in 2009-05-18 14:10:03.000000000 +0200
++++ gvfs-1.2.3/daemon/trashlib/Makefile.in 2009-05-29 09:12:33.133605023 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -53309,15 +53400,16 @@
FUSE_CFLAGS = @FUSE_CFLAGS@
FUSE_LIBS = @FUSE_LIBS@
GCONF_CFLAGS = @GCONF_CFLAGS@
-@@ -124,7 +119,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
+@@ -124,8 +119,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
-@@ -137,48 +131,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -138,48 +131,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
@@ -53373,7 +53465,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -209,8 +191,7 @@ abs_srcdir = @abs_srcdir@
+@@ -210,8 +191,7 @@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
@@ -53383,7 +53475,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -242,6 +223,7 @@ libdir = @libdir@
+@@ -243,6 +223,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -53391,7 +53483,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -275,12 +257,12 @@ all: all-am
+@@ -276,12 +257,12 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -53407,7 +53499,7 @@
exit 1;; \
esac; \
done; \
-@@ -300,9 +282,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -301,9 +282,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53419,7 +53511,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
-@@ -426,7 +408,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -427,7 +408,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -53428,9 +53520,10 @@
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-diff -pruN gvfs-1.2.2/gconf/Makefile.in gvfs-1.2.2.new/gconf/Makefile.in
---- gvfs-1.2.2/gconf/Makefile.in 2009-04-13 19:30:56.000000000 +0200
-+++ gvfs-1.2.2.new/gconf/Makefile.in 2009-04-27 22:38:11.092173154 +0200
+Index: gvfs-1.2.3/gconf/Makefile.in
+===================================================================
+--- gvfs-1.2.3.orig/gconf/Makefile.in 2009-05-18 14:10:03.000000000 +0200
++++ gvfs-1.2.3/gconf/Makefile.in 2009-05-29 09:12:33.253602810 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -53465,15 +53558,16 @@
FUSE_CFLAGS = @FUSE_CFLAGS@
FUSE_LIBS = @FUSE_LIBS@
GCONF_CFLAGS = @GCONF_CFLAGS@
-@@ -135,7 +130,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
+@@ -135,8 +130,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
-@@ -148,48 +142,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -149,48 +142,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
@@ -53529,7 +53623,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -220,8 +202,7 @@ abs_srcdir = @abs_srcdir@
+@@ -221,8 +202,7 @@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
@@ -53539,7 +53633,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -253,6 +234,7 @@ libdir = @libdir@
+@@ -254,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -53547,7 +53641,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -283,7 +265,6 @@ libgiogconf_la_CFLAGS = \
+@@ -284,7 +265,6 @@ libgiogconf_la_CFLAGS = \
$(GCONF_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -53555,7 +53649,7 @@
$(NULL)
libgiogconf_la_LDFLAGS = \
-@@ -299,12 +280,12 @@ all: all-am
+@@ -300,12 +280,12 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -53571,7 +53665,7 @@
exit 1;; \
esac; \
done; \
-@@ -324,9 +305,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -325,9 +305,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53583,7 +53677,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-giomodulesLTLIBRARIES: $(giomodules_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -413,7 +394,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -414,7 +394,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -53592,9 +53686,10 @@
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-diff -pruN gvfs-1.2.2/INSTALL gvfs-1.2.2.new/INSTALL
---- gvfs-1.2.2/INSTALL 2009-04-13 19:30:49.000000000 +0200
-+++ gvfs-1.2.2.new/INSTALL 2009-04-27 22:38:11.948176145 +0200
+Index: gvfs-1.2.3/INSTALL
+===================================================================
+--- gvfs-1.2.3.orig/INSTALL 2009-05-18 14:09:57.000000000 +0200
++++ gvfs-1.2.3/INSTALL 2009-05-29 09:12:34.401538518 +0200
@@ -1,3 +1,291 @@
-The ObexFTP backend requires the obex-data-server D-Bus service in
-addition to the dependencies listed in the configure. See:
@@ -53890,9 +53985,10 @@
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
-diff -pruN gvfs-1.2.2/ltmain.sh gvfs-1.2.2.new/ltmain.sh
---- gvfs-1.2.2/ltmain.sh 2008-08-30 00:27:10.000000000 +0200
-+++ gvfs-1.2.2.new/ltmain.sh 2009-04-27 22:37:39.943878873 +0200
+Index: gvfs-1.2.3/ltmain.sh
+===================================================================
+--- gvfs-1.2.3.orig/ltmain.sh 2008-08-30 00:27:10.000000000 +0200
++++ gvfs-1.2.3/ltmain.sh 2009-05-29 09:12:19.029606614 +0200
@@ -1,52 +1,83 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -68097,9 +68193,10 @@
# End:
+# vi:sw=2
+
-diff -pruN gvfs-1.2.2/Makefile.in gvfs-1.2.2.new/Makefile.in
---- gvfs-1.2.2/Makefile.in 2009-04-13 19:30:57.000000000 +0200
-+++ gvfs-1.2.2.new/Makefile.in 2009-04-27 22:38:12.012174158 +0200
+Index: gvfs-1.2.3/Makefile.in
+===================================================================
+--- gvfs-1.2.3.orig/Makefile.in 2009-05-18 14:10:04.000000000 +0200
++++ gvfs-1.2.3/Makefile.in 2009-05-29 09:12:34.665604058 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -68134,15 +68231,16 @@
FUSE_CFLAGS = @FUSE_CFLAGS@
FUSE_LIBS = @FUSE_LIBS@
GCONF_CFLAGS = @GCONF_CFLAGS@
-@@ -128,7 +123,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
+@@ -128,8 +123,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
-@@ -141,48 +135,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -142,48 +135,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
@@ -68198,7 +68296,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -213,8 +195,7 @@ abs_srcdir = @abs_srcdir@
+@@ -214,8 +195,7 @@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
@@ -68208,7 +68306,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -246,6 +227,7 @@ libdir = @libdir@
+@@ -247,6 +227,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -68216,7 +68314,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -289,7 +271,7 @@ all: config.h
+@@ -293,7 +274,7 @@ all: config.h
.SUFFIXES:
am--refresh:
@:
@@ -68225,7 +68323,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -316,9 +298,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -320,9 +301,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -68237,7 +68335,7 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -330,7 +312,7 @@ config.h: stamp-h1
+@@ -334,7 +315,7 @@ config.h: stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -68246,7 +68344,7 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-@@ -345,7 +327,7 @@ clean-libtool:
+@@ -349,7 +330,7 @@ clean-libtool:
-rm -rf .libs _libs
distclean-libtool:
@@ -68255,7 +68353,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
-@@ -422,7 +404,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -426,7 +407,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -68264,9 +68362,10 @@
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-diff -pruN gvfs-1.2.2/monitor/gphoto2/Makefile.in gvfs-1.2.2.new/monitor/gphoto2/Makefile.in
---- gvfs-1.2.2/monitor/gphoto2/Makefile.in 2009-04-13 19:30:56.000000000 +0200
-+++ gvfs-1.2.2.new/monitor/gphoto2/Makefile.in 2009-04-27 22:38:11.324177839 +0200
+Index: gvfs-1.2.3/monitor/gphoto2/Makefile.in
+===================================================================
+--- gvfs-1.2.3.orig/monitor/gphoto2/Makefile.in 2009-05-18 14:10:04.000000000 +0200
++++ gvfs-1.2.3/monitor/gphoto2/Makefile.in 2009-05-29 09:12:33.505604055 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -68301,15 +68400,16 @@
FUSE_CFLAGS = @FUSE_CFLAGS@
FUSE_LIBS = @FUSE_LIBS@
GCONF_CFLAGS = @GCONF_CFLAGS@
-@@ -153,7 +148,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
+@@ -153,8 +148,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
-@@ -166,48 +160,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -167,48 +160,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
@@ -68365,7 +68465,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -238,8 +220,7 @@ abs_srcdir = @abs_srcdir@
+@@ -239,8 +220,7 @@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
@@ -68375,7 +68475,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -271,6 +252,7 @@ libdir = @libdir@
+@@ -272,6 +252,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -68383,7 +68483,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -309,7 +291,6 @@ gvfs_gphoto2_volume_monitor_CFLAGS = \
+@@ -310,7 +291,6 @@ gvfs_gphoto2_volume_monitor_CFLAGS = \
$(GPHOTO2_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -68391,7 +68491,7 @@
$(NULL)
gvfs_gphoto2_volume_monitor_LDFLAGS = \
-@@ -334,12 +315,12 @@ all: $(BUILT_SOURCES)
+@@ -335,12 +315,12 @@ all: $(BUILT_SOURCES)
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -68407,7 +68507,7 @@
exit 1;; \
esac; \
done; \
-@@ -359,9 +340,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -360,9 +340,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -68419,7 +68519,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libexecPROGRAMS: $(libexec_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -573,7 +554,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -574,7 +554,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -68428,9 +68528,10 @@
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-diff -pruN gvfs-1.2.2/monitor/hal/Makefile.in gvfs-1.2.2.new/monitor/hal/Makefile.in
---- gvfs-1.2.2/monitor/hal/Makefile.in 2009-04-13 19:30:56.000000000 +0200
-+++ gvfs-1.2.2.new/monitor/hal/Makefile.in 2009-04-27 22:38:11.484174577 +0200
+Index: gvfs-1.2.3/monitor/hal/Makefile.in
+===================================================================
+--- gvfs-1.2.3.orig/monitor/hal/Makefile.in 2009-05-18 14:10:04.000000000 +0200
++++ gvfs-1.2.3/monitor/hal/Makefile.in 2009-05-29 09:12:33.673602909 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -68465,15 +68566,16 @@
FUSE_CFLAGS = @FUSE_CFLAGS@
FUSE_LIBS = @FUSE_LIBS@
GCONF_CFLAGS = @GCONF_CFLAGS@
-@@ -154,7 +149,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
+@@ -154,8 +149,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
-@@ -167,48 +161,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -168,48 +161,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
@@ -68529,7 +68631,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -239,8 +221,7 @@ abs_srcdir = @abs_srcdir@
+@@ -240,8 +221,7 @@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
@@ -68539,7 +68641,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -272,6 +253,7 @@ libdir = @libdir@
+@@ -273,6 +253,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -68547,7 +68649,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -311,7 +293,6 @@ gvfs_hal_volume_monitor_CFLAGS = \
+@@ -312,7 +293,6 @@ gvfs_hal_volume_monitor_CFLAGS = \
$(HAL_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -68555,7 +68657,7 @@
$(NULL)
gvfs_hal_volume_monitor_LDFLAGS = \
-@@ -335,12 +316,12 @@ all: $(BUILT_SOURCES)
+@@ -336,12 +316,12 @@ all: $(BUILT_SOURCES)
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -68571,7 +68673,7 @@
exit 1;; \
esac; \
done; \
-@@ -360,9 +341,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -361,9 +341,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -68583,7 +68685,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libexecPROGRAMS: $(libexec_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -604,7 +585,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -605,7 +585,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -68592,9 +68694,10 @@
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-diff -pruN gvfs-1.2.2/monitor/Makefile.in gvfs-1.2.2.new/monitor/Makefile.in
---- gvfs-1.2.2/monitor/Makefile.in 2009-04-13 19:30:56.000000000 +0200
-+++ gvfs-1.2.2.new/monitor/Makefile.in 2009-04-27 22:38:11.176173562 +0200
+Index: gvfs-1.2.3/monitor/Makefile.in
+===================================================================
+--- gvfs-1.2.3.orig/monitor/Makefile.in 2009-05-18 14:10:03.000000000 +0200
++++ gvfs-1.2.3/monitor/Makefile.in 2009-05-29 09:12:33.345602425 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -68629,15 +68732,16 @@
FUSE_CFLAGS = @FUSE_CFLAGS@
FUSE_LIBS = @FUSE_LIBS@
GCONF_CFLAGS = @GCONF_CFLAGS@
-@@ -114,7 +109,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
+@@ -114,8 +109,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
-@@ -127,48 +121,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -128,48 +121,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
@@ -68693,7 +68797,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -199,8 +181,7 @@ abs_srcdir = @abs_srcdir@
+@@ -200,8 +181,7 @@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
@@ -68703,7 +68807,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -232,6 +213,7 @@ libdir = @libdir@
+@@ -233,6 +213,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -68711,7 +68815,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -251,12 +233,12 @@ SUBDIRS = proxy $(am__append_1) $(am__ap
+@@ -252,12 +233,12 @@ SUBDIRS = proxy $(am__append_1) $(am__ap
all: all-recursive
.SUFFIXES:
@@ -68727,7 +68831,7 @@
exit 1;; \
esac; \
done; \
-@@ -276,9 +258,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -277,9 +258,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -68739,7 +68843,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -362,7 +344,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -363,7 +344,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -68748,9 +68852,10 @@
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-diff -pruN gvfs-1.2.2/monitor/proxy/Makefile.in gvfs-1.2.2.new/monitor/proxy/Makefile.in
---- gvfs-1.2.2/monitor/proxy/Makefile.in 2009-04-13 19:30:56.000000000 +0200
-+++ gvfs-1.2.2.new/monitor/proxy/Makefile.in 2009-04-27 22:38:11.632173980 +0200
+Index: gvfs-1.2.3/monitor/proxy/Makefile.in
+===================================================================
+--- gvfs-1.2.3.orig/monitor/proxy/Makefile.in 2009-05-18 14:10:04.000000000 +0200
++++ gvfs-1.2.3/monitor/proxy/Makefile.in 2009-05-29 09:12:33.829602975 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -68785,15 +68890,16 @@
FUSE_CFLAGS = @FUSE_CFLAGS@
FUSE_LIBS = @FUSE_LIBS@
GCONF_CFLAGS = @GCONF_CFLAGS@
-@@ -154,7 +149,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
+@@ -154,8 +149,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
-@@ -167,48 +161,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -168,48 +161,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
@@ -68849,7 +68955,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -239,8 +221,7 @@ abs_srcdir = @abs_srcdir@
+@@ -240,8 +221,7 @@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
@@ -68859,7 +68965,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -272,6 +253,7 @@ libdir = @libdir@
+@@ -273,6 +253,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -68867,7 +68973,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -308,7 +290,6 @@ libgioremote_volume_monitor_la_CFLAGS =
+@@ -309,7 +290,6 @@ libgioremote_volume_monitor_la_CFLAGS =
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DREMOTE_VOLUME_MONITORS_DIR=\"$(remote_volume_monitorsdir)\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -68875,7 +68981,7 @@
$(NULL)
libgioremote_volume_monitor_la_LDFLAGS = \
-@@ -335,7 +316,6 @@ libgvfsproxyvolumemonitordaemon_noin_la_
+@@ -336,7 +316,6 @@ libgvfsproxyvolumemonitordaemon_noin_la_
$(GDU_CFLAGS) \
-DG_LOG_DOMAIN=\"GVFS-RemoteVolumeMonitorDaemon\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -68883,7 +68989,7 @@
$(NULL)
libgvfsproxyvolumemonitordaemon_noin_la_LIBADD = \
-@@ -348,12 +328,12 @@ all: all-am
+@@ -349,12 +328,12 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -68899,7 +69005,7 @@
exit 1;; \
esac; \
done; \
-@@ -373,9 +353,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -374,9 +353,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -68911,7 +69017,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-giomodulesLTLIBRARIES: $(giomodules_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -513,7 +493,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -514,7 +493,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -68920,16 +69026,17 @@
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-diff -pruN gvfs-1.2.2/programs/Makefile.in gvfs-1.2.2.new/programs/Makefile.in
---- gvfs-1.2.2/programs/Makefile.in 2009-04-13 19:30:56.000000000 +0200
-+++ gvfs-1.2.2.new/programs/Makefile.in 2009-04-27 22:38:11.800175766 +0200
+Index: gvfs-1.2.3/programs/Makefile.in
+===================================================================
+--- gvfs-1.2.3.orig/programs/Makefile.in 2009-05-18 14:10:04.000000000 +0200
++++ gvfs-1.2.3/programs/Makefile.in 2009-05-29 09:12:34.165603149 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -154,10 +154,6 @@ CDDA_LIBS = @CDDA_LIBS@
+@@ -162,10 +162,6 @@ CDDA_LIBS = @CDDA_LIBS@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
@@ -68940,7 +69047,7 @@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
-@@ -167,14 +163,13 @@ DEFS = @DEFS@
+@@ -175,14 +171,13 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DSYMUTIL = @DSYMUTIL@
@@ -68957,15 +69064,16 @@
FUSE_CFLAGS = @FUSE_CFLAGS@
FUSE_LIBS = @FUSE_LIBS@
GCONF_CFLAGS = @GCONF_CFLAGS@
-@@ -189,7 +184,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
+@@ -197,8 +192,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
-@@ -202,48 +196,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -211,48 +204,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
@@ -69021,7 +69129,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -274,8 +256,7 @@ abs_srcdir = @abs_srcdir@
+@@ -283,8 +264,7 @@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
@@ -69031,7 +69139,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -307,6 +288,7 @@ libdir = @libdir@
+@@ -316,6 +296,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -69039,7 +69147,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -328,7 +310,7 @@ INCLUDES = \
+@@ -337,7 +318,7 @@ INCLUDES = \
-I$(top_builddir) \
$(GLIB_CFLAGS) \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -69048,7 +69156,7 @@
libraries = \
$(GLIB_LIBS)
-@@ -374,12 +356,12 @@ all: all-am
+@@ -383,12 +364,12 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -69064,7 +69172,7 @@
exit 1;; \
esac; \
done; \
-@@ -399,9 +381,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -408,9 +389,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69076,7 +69184,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -569,7 +551,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -576,7 +557,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -69085,9 +69193,10 @@
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-diff -pruN gvfs-1.2.2/test/Makefile.in gvfs-1.2.2.new/test/Makefile.in
---- gvfs-1.2.2/test/Makefile.in 2009-04-13 19:30:56.000000000 +0200
-+++ gvfs-1.2.2.new/test/Makefile.in 2009-04-27 22:38:11.908174762 +0200
+Index: gvfs-1.2.3/test/Makefile.in
+===================================================================
+--- gvfs-1.2.3.orig/test/Makefile.in 2009-05-18 14:10:04.000000000 +0200
++++ gvfs-1.2.3/test/Makefile.in 2009-05-29 09:12:34.289604456 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -69122,15 +69231,16 @@
FUSE_CFLAGS = @FUSE_CFLAGS@
FUSE_LIBS = @FUSE_LIBS@
GCONF_CFLAGS = @GCONF_CFLAGS@
-@@ -144,7 +139,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
+@@ -144,8 +139,6 @@ GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
-@@ -157,48 +151,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -158,48 +151,36 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
@@ -69186,7 +69296,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -229,8 +211,7 @@ abs_srcdir = @abs_srcdir@
+@@ -230,8 +211,7 @@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
@@ -69196,7 +69306,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -262,6 +243,7 @@ libdir = @libdir@
+@@ -263,6 +243,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -69204,7 +69314,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -282,7 +264,7 @@ AM_CFLAGS = \
+@@ -283,7 +264,7 @@ AM_CFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(GLIB_CFLAGS) \
@@ -69213,7 +69323,7 @@
AM_LDFLAGS = \
$(GLIB_LIBS)
-@@ -292,12 +274,12 @@ all: all-am
+@@ -293,12 +274,12 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -69229,7 +69339,7 @@
exit 1;; \
esac; \
done; \
-@@ -317,9 +299,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -318,9 +299,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69241,7 +69351,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-@@ -388,7 +370,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -389,7 +370,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
More information about the pkg-gnome-commits
mailing list