r24390 - in /desktop/experimental/epiphany-browser/debian: changelog control patches/99_autoreconf.patch rules
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Tue May 25 19:55:21 UTC 2010
Author: slomo
Date: Tue May 25 19:55:18 2010
New Revision: 24390
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24390
Log:
* New upstream development release:
+ debian/patches/99_autoreconf.patch:
- Regenerated for the new version.
Modified:
desktop/experimental/epiphany-browser/debian/changelog
desktop/experimental/epiphany-browser/debian/control
desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch
desktop/experimental/epiphany-browser/debian/rules
Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=24390&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/changelog [utf-8] Tue May 25 19:55:18 2010
@@ -1,3 +1,11 @@
+epiphany-browser (2.31.2-1) experimental; urgency=low
+
+ * New upstream development release:
+ + debian/patches/99_autoreconf.patch:
+ - Regenerated for the new version.
+
+ -- Sebastian Dröge <slomo at debian.org> Tue, 25 May 2010 21:49:45 +0200
+
epiphany-browser (2.30.2-2) unstable; urgency=low
* Restore Josselin Mouette's improved package description that
Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=24390&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control [utf-8] Tue May 25 19:55:18 2010
@@ -75,16 +75,23 @@
Recommends: yelp,
evince,
ca-certificates
+Suggests: epiphany-extensions
Breaks: epiphany-extensions (<< 2.30.0-4)
Provides: www-browser, gnome-www-browser
Description: Intuitive GNOME web browser
Epiphany is a simple yet powerful GNOME web browser targeted at
non-technical users. Its principles are simplicity and standards
- compliance. Simplicity is achieved by a well designed user interface
- and reliance on external applications for performing external tasks
- (such as reading email). Simplicity should not mean less powerful.
+ compliance.
+ .
+ Simplicity is achieved by a well designed user interface and reliance
+ on external applications for performing external tasks (such as reading
+ email). Simplicity does not mean less features; Epiphany has everything
+ a modern web browser is expected to have, and can have more through
+ its extensions.
+ .
Standards compliance is achieved on the HTML side by using the
- WebKitGTK+ rendering engine; and on the user interface side by
+ WebKitGTK+ rendering engine (which is based on the engine used by
+ Apple Safari and Google Chrome); and on the user interface side by
closely following the GNOME Human Interface Guidelines (HIG) and by
close integration with the GNOME desktop.
Modified: desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch?rev=24390&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch [utf-8] Tue May 25 19:55:18 2010
@@ -1,6 +1,6 @@
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/aclocal.m4 epiphany-browser-2.30.2/aclocal.m4
---- epiphany-browser-2.30.2.old/aclocal.m4 2010-04-08 16:57:10.000000000 +0200
-+++ epiphany-browser-2.30.2/aclocal.m4 2010-04-09 07:22:21.292340027 +0200
+diff -Naur epiphany-browser-2.31.2.old/aclocal.m4 epiphany-browser-2.31.2/aclocal.m4
+--- epiphany-browser-2.31.2.old/aclocal.m4 2010-05-24 14:03:19.000000000 +0200
++++ epiphany-browser-2.31.2/aclocal.m4 2010-05-25 21:53:14.036375501 +0200
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -12,46 +12,172 @@
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -790,14 +790,16 @@
+@@ -690,8 +690,9 @@
+ AC_SUBST(WARN_CXXFLAGS)
+ ])
+
+-# nls.m4 serial 3 (gettext-0.15)
+-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
++# nls.m4 serial 5 (gettext-0.18)
++dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
++dnl Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -709,20 +710,21 @@
+ dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
+ dnl Bruno Haible <haible at clisp.cons.org>, 2000-2003.
+
+-AC_PREREQ(2.50)
++AC_PREREQ([2.50])
+
+ AC_DEFUN([AM_NLS],
+ [
+ AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+- AC_ARG_ENABLE(nls,
++ AC_ARG_ENABLE([nls],
+ [ --disable-nls do not use Native Language Support],
+ USE_NLS=$enableval, USE_NLS=yes)
+- AC_MSG_RESULT($USE_NLS)
+- AC_SUBST(USE_NLS)
++ AC_MSG_RESULT([$USE_NLS])
++ AC_SUBST([USE_NLS])
+ ])
+
+ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
++# serial 1 (pkg-config-0.24)
+ #
+ # Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
+ #
+@@ -750,7 +752,10 @@
+ AC_DEFUN([PKG_PROG_PKG_CONFIG],
+ [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+ m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
++AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
++AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+ fi
+@@ -763,7 +768,6 @@
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+-
+ fi[]dnl
+ ])# PKG_PROG_PKG_CONFIG
+
+@@ -772,21 +776,20 @@
+ # Check to see whether a particular set of modules exists. Similar
+ # to PKG_CHECK_MODULES(), but does not set variables or print errors.
+ #
+-#
+-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+-# this or PKG_CHECK_MODULES is called, or make sure to call
+-# PKG_CHECK_EXISTS manually
++# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++# only at the first occurence in configure.ac, so if the first place
++# it's called might be skipped (such as if it is within an "if", you
++# have to call PKG_CHECK_EXISTS manually
+ # --------------------------------------------------------------
+ AC_DEFUN([PKG_CHECK_EXISTS],
+ [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+ if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+- m4_ifval([$2], [$2], [:])
++ m4_default([$2], [:])
+ m4_ifvaln([$3], [else
+ $3])dnl
+ fi])
+
+-
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
--[if test -n "$$1"; then
-- pkg_cv_[]$1="$$1"
-- elif test -n "$PKG_CONFIG"; then
-- PKG_CHECK_EXISTS([$3],
-- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-- [pkg_failed=yes])
-- else
-- pkg_failed=untried
-+[if test -n "$PKG_CONFIG"; then
-+ if test -n "$$1"; then
-+ pkg_cv_[]$1="$$1"
-+ else
-+ PKG_CHECK_EXISTS([$3],
-+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-+ [pkg_failed=yes])
-+ fi
-+else
-+ pkg_failed=untried
- fi[]dnl
- ])# _PKG_CONFIG
-
-@@ -841,9 +843,9 @@
+@@ -839,6 +842,7 @@
+ See the pkg-config man page for more details.])
+
if test $pkg_failed = yes; then
++ AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
- else
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- fi
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+@@ -848,7 +852,7 @@
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/config.h.in epiphany-browser-2.30.2/config.h.in
---- epiphany-browser-2.30.2.old/config.h.in 2010-04-08 16:57:24.000000000 +0200
-+++ epiphany-browser-2.30.2/config.h.in 2010-04-09 07:22:22.600320244 +0200
+
+- ifelse([$4], , [AC_MSG_ERROR(dnl
++ m4_default([$4], [AC_MSG_ERROR(
+ [Package requirements ($2) were not met:
+
+ $$1_PKG_ERRORS
+@@ -856,25 +860,24 @@
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-_PKG_TEXT
+-])],
+- [AC_MSG_RESULT([no])
+- $4])
++_PKG_TEXT])dnl
++ ])
+ elif test $pkg_failed = untried; then
+- ifelse([$4], , [AC_MSG_FAILURE(dnl
++ AC_MSG_RESULT([no])
++ m4_default([$4], [AC_MSG_FAILURE(
+ [The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+ _PKG_TEXT
+
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+- [$4])
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
++ ])
+ else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+- ifelse([$3], , :, [$3])
++ $3
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+
+diff -Naur epiphany-browser-2.31.2.old/config.guess epiphany-browser-2.31.2/config.guess
+--- epiphany-browser-2.31.2.old/config.guess 2010-04-27 13:58:12.000000000 +0200
++++ epiphany-browser-2.31.2/config.guess 2010-05-25 21:53:16.036476908 +0200
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ # Free Software Foundation, Inc.
+
+-timestamp='2009-11-20'
++timestamp='2009-12-30'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -56,8 +56,9 @@
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+diff -Naur epiphany-browser-2.31.2.old/config.h.in epiphany-browser-2.31.2/config.h.in
+--- epiphany-browser-2.31.2.old/config.h.in 2010-05-24 14:03:37.000000000 +0200
++++ epiphany-browser-2.31.2/config.h.in 2010-05-25 21:53:15.300373989 +0200
@@ -172,6 +172,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -62,14 +188,73 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/configure epiphany-browser-2.30.2/configure
---- epiphany-browser-2.30.2.old/configure 2010-04-08 16:57:15.000000000 +0200
-+++ epiphany-browser-2.30.2/configure 2010-04-09 07:22:22.329312257 +0200
+diff -Naur epiphany-browser-2.31.2.old/config.sub epiphany-browser-2.31.2/config.sub
+--- epiphany-browser-2.31.2.old/config.sub 2010-04-27 13:58:12.000000000 +0200
++++ epiphany-browser-2.31.2/config.sub 2010-05-25 21:53:16.049442731 +0200
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ # Free Software Foundation, Inc.
+
+-timestamp='2009-11-20'
++timestamp='2010-01-22'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -75,8 +75,9 @@
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -380,7 +381,8 @@
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++ | tile-* | tilegx-* \
+ | tron-* \
+ | ubicom32-* \
+ | v850-* | v850e-* | vax-* \
+@@ -1085,6 +1087,11 @@
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
++ # This must be matched before tile*.
++ tilegx*)
++ basic_machine=tilegx-unknown
++ os=-linux-gnu
++ ;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+@@ -1435,6 +1442,8 @@
+ -dicos*)
+ os=-dicos
+ ;;
++ -nacl*)
++ ;;
+ -none)
+ ;;
+ *)
+diff -Naur epiphany-browser-2.31.2.old/configure epiphany-browser-2.31.2/configure
+--- epiphany-browser-2.31.2.old/configure 2010-05-24 14:03:25.000000000 +0200
++++ epiphany-browser-2.31.2/configure 2010-05-25 21:53:15.036371730 +0200
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for GNOME Web Browser 2.30.2.
-+# Generated by GNU Autoconf 2.65 for GNOME Web Browser 2.30.2.
+-# Generated by GNU Autoconf 2.63 for GNOME Web Browser 2.31.2.
++# Generated by GNU Autoconf 2.65 for GNOME Web Browser 2.31.2.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany>.
#
@@ -876,8 +1061,8 @@
PACKAGE_NAME='GNOME Web Browser'
-PACKAGE_TARNAME='epiphany'
+PACKAGE_TARNAME='epiphany-browser'
- PACKAGE_VERSION='2.30.2'
- PACKAGE_STRING='GNOME Web Browser 2.30.2'
+ PACKAGE_VERSION='2.31.2'
+ PACKAGE_STRING='GNOME Web Browser 2.31.2'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
+PACKAGE_URL=''
@@ -905,7 +1090,16 @@
HAVE_GNOME_DOC_UTILS_FALSE
HAVE_GNOME_DOC_UTILS_TRUE
DISTCHECK_CONFIGURE_FLAGS
-@@ -1009,6 +975,7 @@
+@@ -866,6 +832,8 @@
+ ENABLE_TESTS_TRUE
+ DISABLE_DEPRECATED
+ WARN_CFLAGS
++PKG_CONFIG_LIBDIR
++PKG_CONFIG_PATH
+ PKG_CONFIG
+ DATADIRNAME
+ ALL_LINGUAS
+@@ -1009,6 +977,7 @@
program_transform_name
prefix
exec_prefix
@@ -913,7 +1107,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1049,6 +1016,8 @@
+@@ -1049,6 +1018,8 @@
enable_scrollkeeper
with_html_dir
enable_gtk_doc
@@ -922,7 +1116,16 @@
'
ac_precious_vars='build_alias
host_alias
-@@ -1180,8 +1149,7 @@
+@@ -1060,6 +1031,8 @@
+ CPPFLAGS
+ CPP
+ PKG_CONFIG
++PKG_CONFIG_PATH
++PKG_CONFIG_LIBDIR
+ DEPENDENCIES_CFLAGS
+ DEPENDENCIES_LIBS
+ DBUS_CFLAGS
+@@ -1180,8 +1153,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -932,7 +1135,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1207,8 +1175,7 @@
+@@ -1207,8 +1179,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -942,7 +1145,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1412,8 +1379,7 @@
+@@ -1412,8 +1383,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -952,7 +1155,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1429,8 +1395,7 @@
+@@ -1429,8 +1399,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -962,7 +1165,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1460,17 +1425,17 @@
+@@ -1460,17 +1429,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -986,7 +1189,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1487,15 +1452,13 @@
+@@ -1487,15 +1456,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -1004,7 +1207,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1518,8 +1481,7 @@
+@@ -1518,8 +1485,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -1014,7 +1217,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1549,11 +1511,9 @@
+@@ -1549,11 +1515,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -1028,7 +1231,7 @@
# Find the source files, if location was not specified.
-@@ -1592,13 +1552,11 @@
+@@ -1592,13 +1556,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -1044,7 +1247,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1672,7 +1630,8 @@
+@@ -1672,7 +1634,8 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
@@ -1054,7 +1257,7 @@
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
-@@ -1731,7 +1690,9 @@
+@@ -1731,7 +1694,9 @@
Whether to enable automatic network status with
NetworkManager (default: disabled)
--disable-scrollkeeper do not make updates to the scrollkeeper database
@@ -1065,7 +1268,7 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-@@ -1758,7 +1719,7 @@
+@@ -1758,10 +1723,14 @@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
@@ -1074,10 +1277,17 @@
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
-@@ -1847,21 +1808,432 @@
++ PKG_CONFIG_PATH
++ directories to add to pkg-config's search path
++ PKG_CONFIG_LIBDIR
++ path overriding pkg-config's built-in search path
+ DEPENDENCIES_CFLAGS
+ C compiler flags for DEPENDENCIES, overriding pkg-config
+ DEPENDENCIES_LIBS
+@@ -1847,21 +1816,432 @@
if $ac_init_version; then
cat <<\_ACEOF
- GNOME Web Browser configure 2.30.2
+ GNOME Web Browser configure 2.31.2
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.65
@@ -1505,13 +1715,13 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by GNOME Web Browser $as_me 2.30.2, which was
+ It was created by GNOME Web Browser $as_me 2.31.2, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
-@@ -1897,8 +2269,8 @@
+@@ -1897,8 +2277,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1522,7 +1732,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1935,9 +2307,9 @@
+@@ -1935,9 +2315,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1534,7 +1744,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1953,13 +2325,13 @@
+@@ -1953,13 +2333,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -1551,7 +1761,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -1984,13 +2356,13 @@
+@@ -1984,13 +2364,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -1567,7 +1777,7 @@
esac ;;
esac
done
-@@ -2062,39 +2434,41 @@
+@@ -2062,39 +2442,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -1614,7 +1824,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2112,8 +2486,8 @@
+@@ -2112,8 +2494,8 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -1625,7 +1835,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2121,10 +2495,10 @@
+@@ -2121,10 +2503,10 @@
done
if test -r "$cache_file"; then
@@ -1640,7 +1850,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2132,14 +2506,14 @@
+@@ -2132,14 +2514,14 @@
esac
fi
else
@@ -1659,7 +1869,7 @@
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
-@@ -2150,11 +2524,11 @@
+@@ -2150,11 +2532,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -1673,7 +1883,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2164,17 +2538,17 @@
+@@ -2164,17 +2546,17 @@
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -1695,7 +1905,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2186,43 +2560,20 @@
+@@ -2186,43 +2568,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -1746,7 +1956,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2276,24 +2627,16 @@
+@@ -2276,24 +2635,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -1779,7 +1989,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2319,10 +2662,10 @@
+@@ -2319,10 +2670,10 @@
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
@@ -1792,7 +2002,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2330,11 +2673,11 @@
+@@ -2330,11 +2681,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1808,7 +2018,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2371,7 +2714,7 @@
+@@ -2371,7 +2722,7 @@
;;
esac
@@ -1817,7 +2027,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2387,7 +2730,7 @@
+@@ -2387,7 +2738,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -1826,7 +2036,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2398,7 +2741,7 @@
+@@ -2398,7 +2749,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -1835,7 +2045,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2409,15 +2752,11 @@
+@@ -2409,15 +2760,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -1853,7 +2063,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2439,11 +2778,8 @@
+@@ -2439,11 +2786,8 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -1867,7 +2077,7 @@
fi
test "$2" = conftest.file
-@@ -2452,13 +2788,10 @@
+@@ -2452,13 +2796,10 @@
# Ok.
:
else
@@ -1884,7 +2094,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2486,7 +2819,7 @@
+@@ -2486,7 +2827,7 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -1893,7 +2103,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2507,9 +2840,9 @@
+@@ -2507,9 +2848,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -1905,7 +2115,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2520,24 +2853,24 @@
+@@ -2520,24 +2861,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1935,7 +2145,7 @@
$as_echo "no" >&6; }
fi
-@@ -2547,9 +2880,9 @@
+@@ -2547,9 +2888,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -1947,7 +2157,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2560,24 +2893,24 @@
+@@ -2560,24 +2901,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1977,7 +2187,7 @@
$as_echo "no" >&6; }
fi
-@@ -2586,7 +2919,7 @@
+@@ -2586,7 +2927,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -1986,7 +2196,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2599,10 +2932,10 @@
+@@ -2599,10 +2940,10 @@
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -1999,7 +2209,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2610,7 +2943,7 @@
+@@ -2610,7 +2951,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2008,7 +2218,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2622,11 +2955,12 @@
+@@ -2622,11 +2963,12 @@
esac
done
done
@@ -2022,7 +2232,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2634,11 +2968,10 @@
+@@ -2634,11 +2976,10 @@
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
@@ -2035,7 +2245,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2651,9 +2984,9 @@
+@@ -2651,9 +2992,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2047,7 +2257,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2664,24 +2997,24 @@
+@@ -2664,24 +3005,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2077,7 +2287,7 @@
$as_echo "no" >&6; }
fi
-@@ -2689,11 +3022,11 @@
+@@ -2689,11 +3030,11 @@
test -n "$AWK" && break
done
@@ -2091,7 +2301,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2711,11 +3044,11 @@
+@@ -2711,11 +3052,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -2105,7 +2315,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2735,9 +3068,7 @@
+@@ -2735,9 +3076,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -2116,16 +2326,16 @@
fi
fi
-@@ -2752,7 +3083,7 @@
+@@ -2752,7 +3091,7 @@
# Define the identity of the package.
- PACKAGE='epiphany'
+ PACKAGE='epiphany-browser'
- VERSION='2.30.2'
-
-
-@@ -2788,7 +3119,7 @@
+ VERSION='2.31.2'
+
+
+@@ -2788,7 +3127,7 @@
AMTAR=${AMTAR-"${am_missing_run}tar"}
@@ -2134,7 +2344,7 @@
$as_echo_n "checking how to create a ustar tar archive... " >&6; }
# Loop over all known methods to create a tar archive until one works.
_am_tools='gnutar plaintar pax cpio none'
-@@ -2861,13 +3192,13 @@
+@@ -2861,13 +3200,13 @@
done
rm -rf conftest.dir
@@ -2150,7 +2360,7 @@
$as_echo "$am_cv_prog_tar_ustar" >&6; }
-@@ -2877,7 +3208,7 @@
+@@ -2877,7 +3216,7 @@
# Use AM_SILENT_RULES if present
# Check whether --enable-silent-rules was given.
@@ -2159,7 +2369,7 @@
enableval=$enable_silent_rules;
fi
-@@ -2893,16 +3224,16 @@
+@@ -2893,16 +3232,16 @@
enable_maintainer_mode=yes
fi
@@ -2179,7 +2389,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2917,7 +3248,7 @@
+@@ -2917,7 +3256,7 @@
# Check whether --enable-shared was given.
@@ -2188,7 +2398,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -2948,7 +3279,7 @@
+@@ -2948,7 +3287,7 @@
# Check whether --enable-static was given.
@@ -2197,7 +2407,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -2986,7 +3317,7 @@
+@@ -2986,7 +3325,7 @@
case `pwd` in
*\ * | *\ *)
@@ -2206,7 +2416,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -3011,35 +3342,27 @@
+@@ -3011,35 +3350,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -2249,7 +2459,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -3055,28 +3378,24 @@
+@@ -3055,28 +3386,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -2283,7 +2493,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -3104,7 +3423,7 @@
+@@ -3104,7 +3431,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -2292,7 +2502,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -3132,12 +3451,12 @@
+@@ -3132,12 +3459,12 @@
fi
@@ -2307,7 +2517,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -3162,9 +3481,9 @@
+@@ -3162,9 +3489,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -2319,7 +2529,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3175,24 +3494,24 @@
+@@ -3175,24 +3502,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2349,7 +2559,7 @@
$as_echo "no" >&6; }
fi
-@@ -3202,9 +3521,9 @@
+@@ -3202,9 +3529,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -2361,7 +2571,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3215,24 +3534,24 @@
+@@ -3215,24 +3542,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2391,7 +2601,7 @@
$as_echo "no" >&6; }
fi
-@@ -3241,7 +3560,7 @@
+@@ -3241,7 +3568,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2400,7 +2610,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3255,9 +3574,9 @@
+@@ -3255,9 +3582,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -2412,7 +2622,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3268,24 +3587,24 @@
+@@ -3268,24 +3595,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2442,7 +2652,7 @@
$as_echo "no" >&6; }
fi
-@@ -3295,9 +3614,9 @@
+@@ -3295,9 +3622,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -2454,7 +2664,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3309,18 +3628,18 @@
+@@ -3309,18 +3636,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2476,7 +2686,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3339,10 +3658,10 @@
+@@ -3339,10 +3666,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2489,7 +2699,7 @@
$as_echo "no" >&6; }
fi
-@@ -3354,9 +3673,9 @@
+@@ -3354,9 +3681,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
@@ -2501,7 +2711,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3367,24 +3686,24 @@
+@@ -3367,24 +3694,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2531,7 +2741,7 @@
$as_echo "no" >&6; }
fi
-@@ -3398,9 +3717,9 @@
+@@ -3398,9 +3725,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2543,7 +2753,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3411,24 +3730,24 @@
+@@ -3411,24 +3738,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2573,7 +2783,7 @@
$as_echo "no" >&6; }
fi
-@@ -3441,7 +3760,7 @@
+@@ -3441,7 +3768,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2582,7 +2792,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3452,57 +3771,37 @@
+@@ -3452,57 +3779,37 @@
fi
@@ -2660,7 +2870,7 @@
/* end confdefs.h. */
int
-@@ -3518,8 +3817,8 @@
+@@ -3518,8 +3825,8 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -2671,7 +2881,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3535,17 +3834,17 @@
+@@ -3535,17 +3842,17 @@
done
rm -f $ac_rmfiles
@@ -2694,7 +2904,7 @@
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3562,7 +3861,7 @@
+@@ -3562,7 +3869,7 @@
# certainly right.
break;;
*.* )
@@ -2703,7 +2913,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3581,84 +3880,42 @@
+@@ -3581,84 +3888,42 @@
else
ac_file=''
fi
@@ -2809,7 +3019,7 @@
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3673,32 +3930,83 @@
+@@ -3673,32 +3938,83 @@
esac
done
else
@@ -2909,7 +3119,7 @@
/* end confdefs.h. */
int
-@@ -3710,17 +4018,17 @@
+@@ -3710,17 +4026,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -2932,7 +3142,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3733,31 +4041,23 @@
+@@ -3733,31 +4049,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2971,7 +3181,7 @@
/* end confdefs.h. */
int
-@@ -3771,37 +4071,16 @@
+@@ -3771,37 +4079,16 @@
return 0;
}
_ACEOF
@@ -3012,7 +3222,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3810,20 +4089,16 @@
+@@ -3810,20 +4097,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -3036,7 +3246,7 @@
/* end confdefs.h. */
int
-@@ -3834,35 +4109,11 @@
+@@ -3834,35 +4117,11 @@
return 0;
}
_ACEOF
@@ -3075,7 +3285,7 @@
/* end confdefs.h. */
int
-@@ -3873,36 +4124,12 @@
+@@ -3873,36 +4132,12 @@
return 0;
}
_ACEOF
@@ -3116,7 +3326,7 @@
/* end confdefs.h. */
int
-@@ -3913,42 +4140,17 @@
+@@ -3913,42 +4148,17 @@
return 0;
}
_ACEOF
@@ -3161,7 +3371,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3965,18 +4167,14 @@
+@@ -3965,18 +4175,14 @@
CFLAGS=
fi
fi
@@ -3183,7 +3393,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -4033,32 +4231,9 @@
+@@ -4033,32 +4239,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -3217,7 +3427,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -4069,17 +4244,19 @@
+@@ -4069,17 +4252,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -3240,7 +3450,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -4089,9 +4266,9 @@
+@@ -4089,9 +4274,9 @@
depcc="$CC" am_compiler_list=
@@ -3252,7 +3462,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4199,7 +4376,7 @@
+@@ -4199,7 +4384,7 @@
fi
fi
@@ -3261,7 +3471,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4214,9 +4391,9 @@
+@@ -4214,9 +4399,9 @@
fi
@@ -3273,7 +3483,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -4224,7 +4401,7 @@
+@@ -4224,7 +4409,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -3282,7 +3492,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -4233,7 +4410,7 @@
+@@ -4233,7 +4418,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3291,7 +3501,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -4253,7 +4430,7 @@
+@@ -4253,7 +4438,7 @@
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3300,7 +3510,7 @@
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
-@@ -4268,19 +4445,17 @@
+@@ -4268,19 +4453,17 @@
$ac_path_SED_found && break 3
done
done
@@ -3323,7 +3533,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -4298,9 +4473,9 @@
+@@ -4298,9 +4481,9 @@
@@ -3335,7 +3545,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4311,7 +4486,7 @@
+@@ -4311,7 +4494,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3344,7 +3554,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -4331,7 +4506,7 @@
+@@ -4331,7 +4514,7 @@
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3353,7 +3563,7 @@
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -4346,26 +4521,24 @@
+@@ -4346,26 +4529,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -3385,7 +3595,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4379,7 +4552,7 @@
+@@ -4379,7 +4560,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3394,7 +3604,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -4399,7 +4572,7 @@
+@@ -4399,7 +4580,7 @@
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3403,7 +3613,7 @@
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4414,12 +4587,10 @@
+@@ -4414,12 +4595,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -3418,7 +3628,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4427,14 +4598,14 @@
+@@ -4427,14 +4606,14 @@
fi
fi
@@ -3436,7 +3646,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -4448,7 +4619,7 @@
+@@ -4448,7 +4627,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3445,7 +3655,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -4468,7 +4639,7 @@
+@@ -4468,7 +4647,7 @@
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3454,7 +3664,7 @@
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -4483,12 +4654,10 @@
+@@ -4483,12 +4662,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -3469,7 +3679,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -4496,7 +4665,7 @@
+@@ -4496,7 +4673,7 @@
fi
fi
@@ -3478,7 +3688,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -4522,7 +4691,7 @@
+@@ -4522,7 +4699,7 @@
# Check whether --with-gnu-ld was given.
@@ -3487,7 +3697,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -4531,7 +4700,7 @@
+@@ -4531,7 +4708,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -3496,7 +3706,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -4561,13 +4730,13 @@
+@@ -4561,13 +4738,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -3513,7 +3723,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -4598,18 +4767,16 @@
+@@ -4598,18 +4775,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -3537,7 +3747,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -4622,7 +4789,7 @@
+@@ -4622,7 +4797,7 @@
;;
esac
fi
@@ -3546,7 +3756,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -4634,9 +4801,9 @@
+@@ -4634,9 +4809,9 @@
@@ -3558,7 +3768,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -4683,7 +4850,7 @@
+@@ -4683,7 +4858,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -3567,7 +3777,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -4694,9 +4861,9 @@
+@@ -4694,9 +4869,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
@@ -3579,7 +3789,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -4707,24 +4874,24 @@
+@@ -4707,24 +4882,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3609,7 +3819,7 @@
$as_echo "no" >&6; }
fi
-@@ -4738,9 +4905,9 @@
+@@ -4738,9 +4913,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -3621,7 +3831,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -4751,24 +4918,24 @@
+@@ -4751,24 +4926,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3651,7 +3861,7 @@
$as_echo "no" >&6; }
fi
-@@ -4781,7 +4948,7 @@
+@@ -4781,7 +4956,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3660,7 +3870,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4801,44 +4968,44 @@
+@@ -4801,44 +4976,44 @@
@@ -3674,15 +3884,15 @@
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4811: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:4978: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:4986: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4814: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:4981: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:4989: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4817: output\"" >&5)
-+ (eval echo "\"\$as_me:4984: output\"" >&5)
++ (eval echo "\"\$as_me:4992: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -3716,7 +3926,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -4956,10 +5123,10 @@
+@@ -4956,10 +5131,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -3729,7 +3939,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -4973,7 +5140,7 @@
+@@ -4973,7 +5148,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -3738,7 +3948,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -4983,17 +5150,17 @@
+@@ -4983,17 +5158,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -3759,7 +3969,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -5028,14 +5195,14 @@
+@@ -5028,14 +5203,14 @@
@@ -3777,7 +3987,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -5064,9 +5231,9 @@
+@@ -5064,9 +5239,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -3789,7 +3999,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -5077,24 +5244,24 @@
+@@ -5077,24 +5252,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3819,7 +4029,7 @@
$as_echo "no" >&6; }
fi
-@@ -5104,9 +5271,9 @@
+@@ -5104,9 +5279,9 @@
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -3831,7 +4041,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -5117,24 +5284,24 @@
+@@ -5117,24 +5292,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3861,7 +4071,7 @@
$as_echo "no" >&6; }
fi
-@@ -5143,7 +5310,7 @@
+@@ -5143,7 +5318,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3870,7 +4080,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5163,9 +5330,9 @@
+@@ -5163,9 +5338,9 @@
@@ -3882,7 +4092,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -5280,11 +5447,11 @@
+@@ -5280,11 +5455,11 @@
;;
# This must be Linux ELF.
@@ -3896,7 +4106,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -5359,7 +5526,7 @@
+@@ -5359,7 +5534,7 @@
esac
fi
@@ -3905,7 +4115,7 @@
$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -5379,9 +5546,9 @@
+@@ -5379,9 +5554,9 @@
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
@@ -3917,7 +4127,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -5392,24 +5559,24 @@
+@@ -5392,24 +5567,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3947,7 +4157,7 @@
$as_echo "no" >&6; }
fi
-@@ -5419,9 +5586,9 @@
+@@ -5419,9 +5594,9 @@
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -3959,7 +4169,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -5432,24 +5599,24 @@
+@@ -5432,24 +5607,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3989,7 +4199,7 @@
$as_echo "no" >&6; }
fi
-@@ -5458,7 +5625,7 @@
+@@ -5458,7 +5633,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3998,7 +4208,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5484,9 +5651,9 @@
+@@ -5484,9 +5659,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -4010,7 +4220,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -5497,24 +5664,24 @@
+@@ -5497,24 +5672,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4040,7 +4250,7 @@
$as_echo "no" >&6; }
fi
-@@ -5524,9 +5691,9 @@
+@@ -5524,9 +5699,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -4052,7 +4262,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -5537,24 +5704,24 @@
+@@ -5537,24 +5712,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4082,7 +4292,7 @@
$as_echo "no" >&6; }
fi
-@@ -5563,7 +5730,7 @@
+@@ -5563,7 +5738,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4091,7 +4301,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5583,9 +5750,9 @@
+@@ -5583,9 +5758,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -4103,7 +4313,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -5596,24 +5763,24 @@
+@@ -5596,24 +5771,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4133,7 +4343,7 @@
$as_echo "no" >&6; }
fi
-@@ -5623,9 +5790,9 @@
+@@ -5623,9 +5798,9 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -4145,7 +4355,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -5636,24 +5803,24 @@
+@@ -5636,24 +5811,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4175,7 +4385,7 @@
$as_echo "no" >&6; }
fi
-@@ -5662,7 +5829,7 @@
+@@ -5662,7 +5837,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4184,7 +4394,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5740,9 +5907,9 @@
+@@ -5740,9 +5915,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -4196,7 +4406,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -5858,18 +6025,18 @@
+@@ -5858,18 +6033,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -4221,7 +4431,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -5922,11 +6089,11 @@
+@@ -5922,11 +6097,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -4236,7 +4446,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -5960,10 +6127,10 @@
+@@ -5960,10 +6135,10 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -4249,7 +4459,7 @@
$as_echo "ok" >&6; }
fi
-@@ -5990,7 +6157,7 @@
+@@ -5990,7 +6165,7 @@
# Check whether --enable-libtool-lock was given.
@@ -4258,7 +4468,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -6002,11 +6169,11 @@
+@@ -6002,11 +6177,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4273,13 +4483,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -6020,12 +6187,12 @@
+@@ -6020,12 +6195,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6023 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 6190 "configure"' > conftest.$ac_ext
++ echo '#line 6198 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4290,7 +4500,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -6059,11 +6226,11 @@
+@@ -6059,11 +6234,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4305,7 +4515,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -6112,9 +6279,9 @@
+@@ -6112,9 +6287,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -4317,7 +4527,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -6123,11 +6290,7 @@
+@@ -6123,11 +6298,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4330,7 +4540,7 @@
/* end confdefs.h. */
int
-@@ -6138,38 +6301,13 @@
+@@ -6138,38 +6309,13 @@
return 0;
}
_ACEOF
@@ -4373,7 +4583,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -6177,7 +6315,7 @@
+@@ -6177,7 +6323,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -4382,7 +4592,7 @@
$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -6187,11 +6325,11 @@
+@@ -6187,11 +6333,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4397,7 +4607,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -6217,9 +6355,9 @@
+@@ -6217,9 +6363,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -4409,7 +4619,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -6230,24 +6368,24 @@
+@@ -6230,24 +6376,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4439,7 +4649,7 @@
$as_echo "no" >&6; }
fi
-@@ -6257,9 +6395,9 @@
+@@ -6257,9 +6403,9 @@
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
@@ -4451,7 +4661,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -6270,24 +6408,24 @@
+@@ -6270,24 +6416,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4481,7 +4691,7 @@
$as_echo "no" >&6; }
fi
-@@ -6296,7 +6434,7 @@
+@@ -6296,7 +6442,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4490,7 +4700,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6309,9 +6447,9 @@
+@@ -6309,9 +6455,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -4502,7 +4712,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -6322,24 +6460,24 @@
+@@ -6322,24 +6468,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4532,7 +4742,7 @@
$as_echo "no" >&6; }
fi
-@@ -6349,9 +6487,9 @@
+@@ -6349,9 +6495,9 @@
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
@@ -4544,7 +4754,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -6362,24 +6500,24 @@
+@@ -6362,24 +6508,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4574,7 +4784,7 @@
$as_echo "no" >&6; }
fi
-@@ -6388,7 +6526,7 @@
+@@ -6388,7 +6534,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4583,7 +4793,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6401,9 +6539,9 @@
+@@ -6401,9 +6547,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -4595,7 +4805,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -6414,24 +6552,24 @@
+@@ -6414,24 +6560,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4625,7 +4835,7 @@
$as_echo "no" >&6; }
fi
-@@ -6441,9 +6579,9 @@
+@@ -6441,9 +6587,9 @@
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
@@ -4637,7 +4847,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -6454,24 +6592,24 @@
+@@ -6454,24 +6600,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4667,7 +4877,7 @@
$as_echo "no" >&6; }
fi
-@@ -6480,7 +6618,7 @@
+@@ -6480,7 +6626,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4676,7 +4886,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6493,9 +6631,9 @@
+@@ -6493,9 +6639,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -4688,7 +4898,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -6506,24 +6644,24 @@
+@@ -6506,24 +6652,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4718,7 +4928,7 @@
$as_echo "no" >&6; }
fi
-@@ -6533,9 +6671,9 @@
+@@ -6533,9 +6679,9 @@
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
@@ -4730,7 +4940,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -6546,24 +6684,24 @@
+@@ -6546,24 +6692,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4760,7 +4970,7 @@
$as_echo "no" >&6; }
fi
-@@ -6572,7 +6710,7 @@
+@@ -6572,7 +6718,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4769,7 +4979,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6585,9 +6723,9 @@
+@@ -6585,9 +6731,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -4781,7 +4991,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -6598,24 +6736,24 @@
+@@ -6598,24 +6744,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4811,7 +5021,7 @@
$as_echo "no" >&6; }
fi
-@@ -6625,9 +6763,9 @@
+@@ -6625,9 +6771,9 @@
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
@@ -4823,7 +5033,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -6638,24 +6776,24 @@
+@@ -6638,24 +6784,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4853,7 +5063,7 @@
$as_echo "no" >&6; }
fi
-@@ -6664,7 +6802,7 @@
+@@ -6664,7 +6810,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4862,7 +5072,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6700,9 +6838,9 @@
+@@ -6700,9 +6846,9 @@
@@ -4874,7 +5084,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -6727,22 +6865,18 @@
+@@ -6727,22 +6873,18 @@
rm -f conftest.*
fi
fi
@@ -4901,7 +5111,7 @@
/* end confdefs.h. */
int
-@@ -6753,42 +6887,17 @@
+@@ -6753,42 +6895,17 @@
return 0;
}
_ACEOF
@@ -4949,7 +5159,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -6830,14 +6939,14 @@
+@@ -6830,14 +6947,14 @@
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
@@ -4966,7 +5176,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -6852,11 +6961,7 @@
+@@ -6852,11 +6969,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -4979,7 +5189,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -6865,78 +6970,34 @@
+@@ -6865,78 +6978,34 @@
#endif
Syntax error
_ACEOF
@@ -5063,7 +5273,7 @@
break
fi
-@@ -6948,7 +7009,7 @@
+@@ -6948,7 +7017,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -5072,7 +5282,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -6959,11 +7020,7 @@
+@@ -6959,11 +7028,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -5085,7 +5295,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -6972,87 +7029,40 @@
+@@ -6972,87 +7037,40 @@
#endif
Syntax error
_ACEOF
@@ -5182,7 +5392,7 @@
fi
ac_ext=c
-@@ -7062,16 +7072,12 @@
+@@ -7062,16 +7080,12 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -5202,7 +5412,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -7086,48 +7092,23 @@
+@@ -7086,48 +7100,23 @@
return 0;
}
_ACEOF
@@ -5256,7 +5466,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -7137,18 +7118,14 @@
+@@ -7137,18 +7126,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -5278,7 +5488,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -7158,14 +7135,10 @@
+@@ -7158,14 +7143,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -5295,7 +5505,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -7192,118 +7165,34 @@
+@@ -7192,118 +7173,34 @@
return 0;
}
_ACEOF
@@ -5427,7 +5637,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -7313,62 +7202,13 @@
+@@ -7313,62 +7210,13 @@
done
@@ -5495,7 +5705,7 @@
_ACEOF
fi
-@@ -7389,7 +7229,7 @@
+@@ -7389,7 +7237,7 @@
# Check whether --with-pic was given.
@@ -5504,7 +5714,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -7405,7 +7245,7 @@
+@@ -7405,7 +7253,7 @@
# Check whether --enable-fast-install was given.
@@ -5513,7 +5723,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -7486,9 +7326,9 @@
+@@ -7486,9 +7334,9 @@
setopt NO_GLOB_SUBST
fi
@@ -5525,7 +5735,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -7501,7 +7341,7 @@
+@@ -7501,7 +7349,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -5534,7 +5744,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -7594,9 +7434,9 @@
+@@ -7594,9 +7442,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -5546,7 +5756,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -7647,10 +7487,10 @@
+@@ -7647,10 +7495,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -5559,7 +5769,7 @@
$as_echo "no" >&6; }
fi
-@@ -7660,9 +7500,9 @@
+@@ -7660,9 +7508,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -5571,7 +5781,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -7713,10 +7553,10 @@
+@@ -7713,10 +7561,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -5584,7 +5794,7 @@
$as_echo "no" >&6; }
fi
-@@ -7797,9 +7637,9 @@
+@@ -7797,9 +7645,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -5596,21 +5806,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -7815,11 +7655,11 @@
+@@ -7815,11 +7663,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:7818: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7658: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7666: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7822: \$? = $ac_status" >&5
-+ echo "$as_me:7662: \$? = $ac_status" >&5
++ echo "$as_me:7670: \$? = $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.
-@@ -7832,7 +7672,7 @@
+@@ -7832,7 +7680,7 @@
$RM conftest*
fi
@@ -5619,7 +5829,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -7852,7 +7692,7 @@
+@@ -7852,7 +7700,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -5628,7 +5838,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -7984,7 +7824,7 @@
+@@ -7984,7 +7832,7 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -5637,7 +5847,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -8124,7 +7964,7 @@
+@@ -8124,7 +7972,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -5646,7 +5856,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -8136,9 +7976,9 @@
+@@ -8136,9 +7984,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -5658,21 +5868,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -8154,11 +7994,11 @@
+@@ -8154,11 +8002,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:8157: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7997: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8005: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8161: \$? = $ac_status" >&5
-+ echo "$as_me:8001: \$? = $ac_status" >&5
++ echo "$as_me:8009: \$? = $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.
-@@ -8171,7 +8011,7 @@
+@@ -8171,7 +8019,7 @@
$RM conftest*
fi
@@ -5681,7 +5891,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -8195,9 +8035,9 @@
+@@ -8195,9 +8043,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -5693,7 +5903,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -8223,7 +8063,7 @@
+@@ -8223,7 +8071,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -5702,7 +5912,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -8238,9 +8078,9 @@
+@@ -8238,9 +8086,9 @@
@@ -5714,21 +5924,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8259,11 +8099,11 @@
+@@ -8259,11 +8107,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:8262: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8102: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8110: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8266: \$? = $ac_status" >&5
-+ echo "$as_me:8106: \$? = $ac_status" >&5
++ echo "$as_me:8114: \$? = $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
-@@ -8285,7 +8125,7 @@
+@@ -8285,7 +8133,7 @@
$RM conftest*
fi
@@ -5737,7 +5947,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -8293,9 +8133,9 @@
+@@ -8293,9 +8141,9 @@
@@ -5749,21 +5959,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8314,11 +8154,11 @@
+@@ -8314,11 +8162,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:8317: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8157: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8165: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8321: \$? = $ac_status" >&5
-+ echo "$as_me:8161: \$? = $ac_status" >&5
++ echo "$as_me:8169: \$? = $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
-@@ -8340,7 +8180,7 @@
+@@ -8340,7 +8188,7 @@
$RM conftest*
fi
@@ -5772,7 +5982,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -8349,7 +8189,7 @@
+@@ -8349,7 +8197,7 @@
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -5781,7 +5991,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -8357,10 +8197,10 @@
+@@ -8357,10 +8205,10 @@
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -5794,7 +6004,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -8373,7 +8213,7 @@
+@@ -8373,7 +8221,7 @@
@@ -5803,7 +6013,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -8433,6 +8273,9 @@
+@@ -8433,6 +8281,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -5813,7 +6023,7 @@
esac
ld_shlibs=yes
-@@ -8454,6 +8297,7 @@
+@@ -8454,6 +8305,7 @@
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -5821,7 +6031,7 @@
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -8545,7 +8389,7 @@
+@@ -8545,7 +8397,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -5830,7 +6040,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -8615,7 +8459,7 @@
+@@ -8615,7 +8467,7 @@
fi
;;
@@ -5839,7 +6049,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -8790,6 +8634,7 @@
+@@ -8790,6 +8642,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -5847,7 +6057,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -8815,11 +8660,7 @@
+@@ -8815,11 +8668,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -5860,7 +6070,7 @@
/* end confdefs.h. */
int
-@@ -8830,27 +8671,7 @@
+@@ -8830,27 +8679,7 @@
return 0;
}
_ACEOF
@@ -5889,7 +6099,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -8864,16 +8685,9 @@
+@@ -8864,16 +8693,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -5908,7 +6118,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -8886,11 +8700,7 @@
+@@ -8886,11 +8708,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -5921,7 +6131,7 @@
/* end confdefs.h. */
int
-@@ -8901,27 +8711,7 @@
+@@ -8901,27 +8719,7 @@
return 0;
}
_ACEOF
@@ -5950,7 +6160,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -8935,16 +8725,9 @@
+@@ -8935,16 +8733,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -5969,7 +6179,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -9156,42 +8939,16 @@
+@@ -9156,42 +8947,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -6017,7 +6227,7 @@
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -9204,7 +8961,7 @@
+@@ -9204,7 +8969,7 @@
link_all_deplibs=yes
;;
@@ -6026,7 +6236,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9447,7 +9204,7 @@
+@@ -9447,7 +9212,7 @@
fi
fi
@@ -6035,7 +6245,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -9484,16 +9241,16 @@
+@@ -9484,16 +9249,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -6056,7 +6266,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -9507,11 +9264,11 @@
+@@ -9507,11 +9272,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -6071,7 +6281,7 @@
then
archive_cmds_need_lc=no
else
-@@ -9522,7 +9279,7 @@
+@@ -9522,7 +9287,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -6080,7 +6290,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -9686,7 +9443,7 @@
+@@ -9686,7 +9451,7 @@
@@ -6089,7 +6299,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -10094,7 +9851,7 @@
+@@ -10094,7 +9859,7 @@
;;
# This must be Linux ELF.
@@ -6098,7 +6308,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10108,11 +9865,7 @@
+@@ -10108,11 +9873,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -6111,7 +6321,7 @@
/* end confdefs.h. */
int
-@@ -10123,41 +9876,13 @@
+@@ -10123,41 +9884,13 @@
return 0;
}
_ACEOF
@@ -6157,7 +6367,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -10166,13 +9891,10 @@
+@@ -10166,13 +9899,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -6172,7 +6382,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10184,6 +9906,18 @@
+@@ -10184,6 +9914,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6191,7 +6401,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10372,7 +10106,7 @@
+@@ -10372,7 +10114,7 @@
dynamic_linker=no
;;
esac
@@ -6200,7 +6410,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -10474,7 +10208,7 @@
+@@ -10474,7 +10216,7 @@
@@ -6209,7 +6419,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -10499,7 +10233,7 @@
+@@ -10499,7 +10241,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -6218,7 +6428,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -10544,18 +10278,14 @@
+@@ -10544,18 +10286,14 @@
darwin*)
# if libdl is installed we need to link against it
@@ -6240,7 +6450,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10573,43 +10303,18 @@
+@@ -10573,43 +10311,18 @@
return 0;
}
_ACEOF
@@ -6290,7 +6500,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -10622,106 +10327,18 @@
+@@ -10622,106 +10335,18 @@
;;
*)
@@ -6402,7 +6612,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10739,145 +10356,32 @@
+@@ -10739,145 +10364,32 @@
return 0;
}
_ACEOF
@@ -6559,7 +6769,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10895,57 +10399,28 @@
+@@ -10895,57 +10407,28 @@
return 0;
}
_ACEOF
@@ -6626,7 +6836,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10963,57 +10438,28 @@
+@@ -10963,57 +10446,28 @@
return 0;
}
_ACEOF
@@ -6693,7 +6903,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11031,43 +10477,18 @@
+@@ -11031,43 +10485,18 @@
return 0;
}
_ACEOF
@@ -6743,7 +6953,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -11106,9 +10527,9 @@
+@@ -11106,9 +10535,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -6755,16 +6965,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11117,7 +10538,7 @@
+@@ -11117,7 +10546,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11120 "configure"
-+#line 10541 "configure"
++#line 10549 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11176,11 +10597,11 @@
+@@ -11176,11 +10605,11 @@
return status;
}
_LT_EOF
@@ -6779,7 +6989,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -11197,14 +10618,14 @@
+@@ -11197,14 +10626,14 @@
fi
@@ -6797,16 +7007,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11213,7 +10634,7 @@
+@@ -11213,7 +10642,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11216 "configure"
-+#line 10637 "configure"
++#line 10645 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11272,11 +10693,11 @@
+@@ -11272,11 +10701,11 @@
return status;
}
_LT_EOF
@@ -6821,7 +7031,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -11293,7 +10714,7 @@
+@@ -11293,7 +10722,7 @@
fi
@@ -6830,7 +7040,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -11332,12 +10753,12 @@
+@@ -11332,12 +10761,12 @@
striplib=
old_striplib=
@@ -6845,7 +7055,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -11346,15 +10767,15 @@
+@@ -11346,15 +10775,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -6864,7 +7074,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -11372,12 +10793,12 @@
+@@ -11372,12 +10801,12 @@
# Report which library types will actually be built
@@ -6880,7 +7090,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -11398,14 +10819,14 @@
+@@ -11398,14 +10827,14 @@
fi
;;
esac
@@ -6898,7 +7108,7 @@
$as_echo "$enable_static" >&6; }
-@@ -11441,17 +10862,13 @@
+@@ -11441,17 +10870,13 @@
@@ -6919,7 +7129,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11476,54 +10893,27 @@
+@@ -11476,54 +10901,27 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -6982,7 +7192,7 @@
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-@@ -11536,9 +10926,9 @@
+@@ -11536,9 +10934,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -6994,7 +7204,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11549,24 +10939,24 @@
+@@ -11549,24 +10947,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7024,7 +7234,7 @@
$as_echo "no" >&6; }
fi
-@@ -11576,9 +10966,9 @@
+@@ -11576,9 +10974,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -7036,7 +7246,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -11589,24 +10979,24 @@
+@@ -11589,24 +10987,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7066,7 +7276,7 @@
$as_echo "no" >&6; }
fi
-@@ -11615,7 +11005,7 @@
+@@ -11615,7 +11013,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7075,7 +7285,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -11629,9 +11019,9 @@
+@@ -11629,9 +11027,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -7087,7 +7297,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11642,24 +11032,24 @@
+@@ -11642,24 +11040,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7117,7 +7327,7 @@
$as_echo "no" >&6; }
fi
-@@ -11669,9 +11059,9 @@
+@@ -11669,9 +11067,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -7129,7 +7339,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11683,18 +11073,18 @@
+@@ -11683,18 +11081,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7151,7 +7361,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -11713,10 +11103,10 @@
+@@ -11713,10 +11111,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7164,7 +7374,7 @@
$as_echo "no" >&6; }
fi
-@@ -11728,9 +11118,9 @@
+@@ -11728,9 +11126,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
@@ -7176,7 +7386,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11741,24 +11131,24 @@
+@@ -11741,24 +11139,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7206,7 +7416,7 @@
$as_echo "no" >&6; }
fi
-@@ -11772,9 +11162,9 @@
+@@ -11772,9 +11170,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -7218,7 +7428,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -11785,24 +11175,24 @@
+@@ -11785,24 +11183,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7248,7 +7458,7 @@
$as_echo "no" >&6; }
fi
-@@ -11815,7 +11205,7 @@
+@@ -11815,7 +11213,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7257,7 +7467,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -11826,62 +11216,42 @@
+@@ -11826,62 +11224,42 @@
fi
@@ -7342,7 +7552,7 @@
/* end confdefs.h. */
int
-@@ -11895,37 +11265,16 @@
+@@ -11895,37 +11273,16 @@
return 0;
}
_ACEOF
@@ -7383,7 +7593,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -11934,20 +11283,16 @@
+@@ -11934,20 +11291,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -7407,7 +7617,7 @@
/* end confdefs.h. */
int
-@@ -11958,35 +11303,11 @@
+@@ -11958,35 +11311,11 @@
return 0;
}
_ACEOF
@@ -7446,7 +7656,7 @@
/* end confdefs.h. */
int
-@@ -11997,36 +11318,12 @@
+@@ -11997,36 +11326,12 @@
return 0;
}
_ACEOF
@@ -7487,7 +7697,7 @@
/* end confdefs.h. */
int
-@@ -12037,42 +11334,17 @@
+@@ -12037,42 +11342,17 @@
return 0;
}
_ACEOF
@@ -7532,7 +7742,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -12089,18 +11361,14 @@
+@@ -12089,18 +11369,14 @@
CFLAGS=
fi
fi
@@ -7554,7 +7764,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -12157,32 +11425,9 @@
+@@ -12157,32 +11433,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -7588,7 +7798,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -12193,17 +11438,19 @@
+@@ -12193,17 +11446,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -7611,7 +7821,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -12213,9 +11460,9 @@
+@@ -12213,9 +11468,9 @@
depcc="$CC" am_compiler_list=
@@ -7623,7 +7833,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -12323,7 +11570,7 @@
+@@ -12323,7 +11578,7 @@
fi
fi
@@ -7632,7 +7842,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -12346,9 +11593,9 @@
+@@ -12346,9 +11601,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -7644,7 +7854,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12359,24 +11606,24 @@
+@@ -12359,24 +11614,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7674,7 +7884,7 @@
$as_echo "no" >&6; }
fi
-@@ -12386,9 +11633,9 @@
+@@ -12386,9 +11641,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -7686,7 +7896,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -12399,24 +11646,24 @@
+@@ -12399,24 +11654,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7716,7 +7926,7 @@
$as_echo "no" >&6; }
fi
-@@ -12425,7 +11672,7 @@
+@@ -12425,7 +11680,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7725,7 +7935,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -12439,9 +11686,9 @@
+@@ -12439,9 +11694,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -7737,7 +7947,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12452,24 +11699,24 @@
+@@ -12452,24 +11707,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7767,7 +7977,7 @@
$as_echo "no" >&6; }
fi
-@@ -12479,9 +11726,9 @@
+@@ -12479,9 +11734,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -7779,7 +7989,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12493,18 +11740,18 @@
+@@ -12493,18 +11748,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7801,7 +8011,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -12523,10 +11770,10 @@
+@@ -12523,10 +11778,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7814,7 +8024,7 @@
$as_echo "no" >&6; }
fi
-@@ -12538,9 +11785,9 @@
+@@ -12538,9 +11793,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
@@ -7826,7 +8036,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12551,24 +11798,24 @@
+@@ -12551,24 +11806,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7856,7 +8066,7 @@
$as_echo "no" >&6; }
fi
-@@ -12582,9 +11829,9 @@
+@@ -12582,9 +11837,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -7868,7 +8078,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -12595,24 +11842,24 @@
+@@ -12595,24 +11850,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7898,7 +8108,7 @@
$as_echo "no" >&6; }
fi
-@@ -12625,7 +11872,7 @@
+@@ -12625,7 +11880,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7907,7 +8117,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -12636,62 +11883,42 @@
+@@ -12636,62 +11891,42 @@
fi
@@ -7928,14 +8138,19 @@
set X $ac_compile
ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
++for ac_option in --version -v -V -qversion; do
++ { { ac_try="$ac_compiler $ac_option >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler --version >&5") 2>&5
-- ac_status=$?
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
@@ -7950,19 +8165,14 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-+for ac_option in --version -v -V -qversion; do
-+ { { ac_try="$ac_compiler $ac_option >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -V >&5") 2>&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
+- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ if test -s conftest.err; then
@@ -7992,7 +8202,7 @@
/* end confdefs.h. */
int
-@@ -12705,37 +11932,16 @@
+@@ -12705,37 +11940,16 @@
return 0;
}
_ACEOF
@@ -8033,7 +8243,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -12744,20 +11950,16 @@
+@@ -12744,20 +11958,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -8057,7 +8267,7 @@
/* end confdefs.h. */
int
-@@ -12768,35 +11970,11 @@
+@@ -12768,35 +11978,11 @@
return 0;
}
_ACEOF
@@ -8096,7 +8306,7 @@
/* end confdefs.h. */
int
-@@ -12807,36 +11985,12 @@
+@@ -12807,36 +11993,12 @@
return 0;
}
_ACEOF
@@ -8137,7 +8347,7 @@
/* end confdefs.h. */
int
-@@ -12847,42 +12001,17 @@
+@@ -12847,42 +12009,17 @@
return 0;
}
_ACEOF
@@ -8182,7 +8392,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -12899,18 +12028,14 @@
+@@ -12899,18 +12036,14 @@
CFLAGS=
fi
fi
@@ -8204,7 +8414,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -12967,32 +12092,9 @@
+@@ -12967,32 +12100,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -8238,7 +8448,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -13003,17 +12105,19 @@
+@@ -13003,17 +12113,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -8261,7 +8471,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -13023,9 +12127,9 @@
+@@ -13023,9 +12135,9 @@
depcc="$CC" am_compiler_list=
@@ -8273,7 +8483,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -13133,7 +12237,7 @@
+@@ -13133,7 +12245,7 @@
fi
fi
@@ -8282,7 +8492,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -13151,16 +12255,12 @@
+@@ -13151,16 +12263,12 @@
am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
@@ -8302,7 +8512,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -13175,48 +12275,23 @@
+@@ -13175,48 +12283,23 @@
return 0;
}
_ACEOF
@@ -8356,7 +8566,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -13226,18 +12301,14 @@
+@@ -13226,18 +12309,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -8378,7 +8588,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -13247,14 +12318,10 @@
+@@ -13247,14 +12326,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -8395,7 +8605,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -13281,60 +12348,31 @@
+@@ -13281,60 +12356,31 @@
return 0;
}
_ACEOF
@@ -8465,7 +8675,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -13347,14 +12385,14 @@
+@@ -13347,14 +12393,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8483,7 +8693,7 @@
IFS=$as_save_IFS
;;
-@@ -13362,19 +12400,19 @@
+@@ -13362,19 +12408,19 @@
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -8507,7 +8717,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_MKENUMS in
-@@ -13387,14 +12425,14 @@
+@@ -13387,14 +12433,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8525,7 +8735,7 @@
IFS=$as_save_IFS
;;
-@@ -13402,26 +12440,26 @@
+@@ -13402,26 +12448,26 @@
fi
GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
if test -n "$GLIB_MKENUMS"; then
@@ -8557,7 +8767,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -13429,35 +12467,31 @@
+@@ -13429,35 +12475,31 @@
case "$am__api_version" in
1.01234)
@@ -8599,7 +8809,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -13470,14 +12504,14 @@
+@@ -13470,14 +12512,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8617,7 +8827,7 @@
IFS=$as_save_IFS
;;
-@@ -13485,19 +12519,19 @@
+@@ -13485,19 +12527,19 @@
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -8641,7 +8851,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -13510,14 +12544,14 @@
+@@ -13510,14 +12552,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8659,7 +8869,7 @@
IFS=$as_save_IFS
;;
-@@ -13525,19 +12559,19 @@
+@@ -13525,19 +12567,19 @@
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -8683,7 +8893,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -13550,14 +12584,14 @@
+@@ -13550,14 +12592,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8701,7 +8911,7 @@
IFS=$as_save_IFS
;;
-@@ -13565,18 +12599,16 @@
+@@ -13565,18 +12607,16 @@
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -8723,7 +8933,7 @@
fi
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -13698,9 +12730,9 @@
+@@ -13698,9 +12738,9 @@
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -8735,7 +8945,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -13713,14 +12745,14 @@
+@@ -13713,14 +12753,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8753,7 +8963,7 @@
IFS=$as_save_IFS
;;
-@@ -13728,19 +12760,19 @@
+@@ -13728,19 +12768,19 @@
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -8777,7 +8987,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -13753,14 +12785,14 @@
+@@ -13753,14 +12793,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8795,7 +9005,7 @@
IFS=$as_save_IFS
;;
-@@ -13768,19 +12800,19 @@
+@@ -13768,19 +12808,19 @@
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -8819,7 +9029,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -13793,14 +12825,14 @@
+@@ -13793,14 +12833,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8837,7 +9047,7 @@
IFS=$as_save_IFS
;;
-@@ -13808,19 +12840,19 @@
+@@ -13808,19 +12848,19 @@
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -8861,7 +9071,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -13833,14 +12865,14 @@
+@@ -13833,14 +12873,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8879,7 +9089,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -13849,33 +12881,29 @@
+@@ -13849,33 +12889,29 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -8919,7 +9129,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -13888,14 +12916,14 @@
+@@ -13888,14 +12924,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8937,7 +9147,7 @@
IFS=$as_save_IFS
;;
-@@ -13903,41 +12931,35 @@
+@@ -13903,41 +12939,35 @@
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -8988,7 +9198,7 @@
fi
fi
-@@ -13947,11 +12969,7 @@
+@@ -13947,11 +12977,7 @@
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -9001,7 +9211,7 @@
/* end confdefs.h. */
int
-@@ -13963,120 +12981,13 @@
+@@ -13963,120 +12989,13 @@
return 0;
}
_ACEOF
@@ -9126,7 +9336,7 @@
DATADIRNAME=share
else
DATADIRNAME=lib
-@@ -14088,10 +12999,8 @@
+@@ -14088,10 +13007,8 @@
;;
esac
fi
@@ -9139,7 +9349,15 @@
fi
-@@ -14105,9 +13014,9 @@
+@@ -14101,13 +13018,17 @@
+
+
+
++
++
++
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -9151,7 +9369,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -14120,14 +13029,14 @@
+@@ -14120,14 +13041,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9169,7 +9387,7 @@
IFS=$as_save_IFS
;;
-@@ -14135,10 +13044,10 @@
+@@ -14135,10 +13056,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -9182,7 +9400,7 @@
$as_echo "no" >&6; }
fi
-@@ -14148,9 +13057,9 @@
+@@ -14148,9 +13069,9 @@
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -9194,7 +9412,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -14163,14 +13072,14 @@
+@@ -14163,14 +13084,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9212,7 +9430,7 @@
IFS=$as_save_IFS
;;
-@@ -14178,10 +13087,10 @@
+@@ -14178,10 +13099,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -9225,7 +9443,7 @@
$as_echo "no" >&6; }
fi
-@@ -14190,7 +13099,7 @@
+@@ -14190,7 +13111,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9234,7 +9452,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -14203,13 +13112,13 @@
+@@ -14203,22 +13124,21 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -9251,7 +9469,8 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -14218,7 +13127,7 @@
+-
+ fi
# Check whether --enable-debug was given.
@@ -9260,7 +9479,7 @@
enableval=$enable_debug;
else
enable_debug=no
-@@ -14227,16 +13136,14 @@
+@@ -14227,16 +13147,14 @@
if test x$enable_debug = xyes ; then
@@ -9279,7 +9498,7 @@
enableval=$enable_compile_warnings;
else
enable_compile_warnings="maximum"
-@@ -14267,13 +13174,9 @@
+@@ -14267,13 +13185,9 @@
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -9295,7 +9514,7 @@
/* end confdefs.h. */
int
-@@ -14284,35 +13187,14 @@
+@@ -14284,35 +13198,14 @@
return 0;
}
_ACEOF
@@ -9334,7 +9553,7 @@
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
-@@ -14326,26 +13208,24 @@
+@@ -14326,26 +13219,24 @@
fi
;;
*)
@@ -9366,7 +9585,7 @@
$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
complCFLAGS=
if test "x$enable_iso_c" != "xno"; then
-@@ -14360,7 +13240,7 @@
+@@ -14360,7 +13251,7 @@
esac
fi
fi
@@ -9375,7 +9594,7 @@
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -14385,9 +13265,7 @@
+@@ -14385,9 +13276,7 @@
if test "$enable_maintainer_mode" = "yes"; then
@@ -9386,7 +9605,7 @@
enable_debug=yes
DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
-@@ -14405,11 +13283,11 @@
+@@ -14405,11 +13294,11 @@
GNOME_KEYRING_REQUIRED=2.26.0
if test -n "$PKG_CONFIG" && \
@@ -9401,7 +9620,7 @@
have_libnotify=yes
else
have_libnotify=no
-@@ -14419,24 +13297,22 @@
+@@ -14419,24 +13308,22 @@
if test "$have_libnotify" = "yes"; then
LIBNOTIFY_PACKAGE="libnotify >= $LIBNOTIFY_REQUIRED"
@@ -9430,7 +9649,7 @@
$as_echo "$enable_tests" >&6; }
if test "$enable_tests" = "yes"; then
-@@ -14450,14 +13326,15 @@
+@@ -14450,14 +13337,14 @@
pkg_failed=no
@@ -9438,21 +9657,16 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPENDENCIES" >&5
$as_echo_n "checking for DEPENDENCIES... " >&6; }
--if test -n "$DEPENDENCIES_CFLAGS"; then
-- pkg_cv_DEPENDENCIES_CFLAGS="$DEPENDENCIES_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
+ if test -n "$DEPENDENCIES_CFLAGS"; then
+ pkg_cv_DEPENDENCIES_CFLAGS="$DEPENDENCIES_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$DEPENDENCIES_CFLAGS"; then
-+ pkg_cv_DEPENDENCIES_CFLAGS="$DEPENDENCIES_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
glib-2.0 >= \$GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14475,7 +13352,7 @@
+@@ -14475,7 +13362,7 @@
webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
@@ -9461,7 +9675,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14496,8 +13373,8 @@
+@@ -14496,8 +13383,8 @@
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
") 2>&5
ac_status=$?
@@ -9472,31 +9686,16 @@
pkg_cv_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14520,14 +13397,16 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$DEPENDENCIES_LIBS"; then
-- pkg_cv_DEPENDENCIES_LIBS="$DEPENDENCIES_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
+@@ -14527,7 +13414,7 @@
+ pkg_cv_DEPENDENCIES_LIBS="$DEPENDENCIES_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$DEPENDENCIES_LIBS"; then
-+ pkg_cv_DEPENDENCIES_LIBS="$DEPENDENCIES_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
glib-2.0 >= \$GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14545,7 +13424,7 @@
+@@ -14545,7 +13432,7 @@
webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
@@ -9505,7 +9704,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14566,8 +13445,8 @@
+@@ -14566,8 +13453,8 @@
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
") 2>&5
ac_status=$?
@@ -9516,60 +9715,20 @@
pkg_cv_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14590,8 +13469,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -14604,7 +13484,7 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
-+ DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
- glib-2.0 >= $GLIB_REQUIRED
- gmodule-2.0
- gthread-2.0
-@@ -14622,9 +13502,9 @@
- webkit-1.0 >= $WEBKIT_GTK_REQUIRED
- libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
- gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
-- " 2>&1`
-+ "`
- else
-- DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "
-+ DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
- glib-2.0 >= $GLIB_REQUIRED
- gmodule-2.0
- gthread-2.0
-@@ -14642,12 +13522,12 @@
- webkit-1.0 >= $WEBKIT_GTK_REQUIRED
- libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
- gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
-- " 2>&1`
-+ "`
- fi
+@@ -14597,6 +13484,8 @@
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -14647,36 +13536,7 @@
# Put the nasty error message in config.log where it belongs
echo "$DEPENDENCIES_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (
-+ as_fn_error "Package requirements (
- glib-2.0 >= $GLIB_REQUIRED
- gmodule-2.0
- gthread-2.0
-@@ -14675,51 +13555,11 @@
- Alternatively, you may set the environment variables DEPENDENCIES_CFLAGS
- and DEPENDENCIES_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 >= $GLIB_REQUIRED
- gmodule-2.0
- gthread-2.0
@@ -9597,11 +9756,24 @@
-Alternatively, you may set the environment variables DEPENDENCIES_CFLAGS
-and DEPENDENCIES_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 (
++ as_fn_error "Package requirements (
+ glib-2.0 >= $GLIB_REQUIRED
+ gmodule-2.0
+ gthread-2.0
+@@ -14703,23 +13563,13 @@
+
+ Alternatively, you may set the environment variables DEPENDENCIES_CFLAGS
+ and DEPENDENCIES_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
-+" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
@@ -9619,7 +9791,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14728,12 +13568,11 @@
+@@ -14728,14 +13578,13 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -9632,9 +9804,12 @@
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
- fi
-@@ -14744,40 +13583,44 @@
+- :
++
+ fi
+
+ # ****
+@@ -14744,18 +13593,18 @@
pkg_failed=no
@@ -9642,16 +9817,11 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
$as_echo_n "checking for DBUS... " >&6; }
--if test -n "$DBUS_CFLAGS"; then
-- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
+ if test -n "$DBUS_CFLAGS"; then
+ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$DBUS_CFLAGS"; then
-+ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
ac_status=$?
@@ -9662,23 +9832,11 @@
pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$DBUS_LIBS"; then
-- pkg_cv_DBUS_LIBS="$DBUS_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
+@@ -14767,11 +13616,11 @@
+ pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$DBUS_LIBS"; then
-+ pkg_cv_DBUS_LIBS="$DBUS_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
ac_status=$?
@@ -9689,39 +9847,20 @@
pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -14790,14 +13633,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
-+ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
- else
-- DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
-+ DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
- fi
+@@ -14783,6 +13632,8 @@
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -14797,18 +13648,7 @@
# Put the nasty error message in config.log where it belongs
echo "$DBUS_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
-+ as_fn_error "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
-
- $DBUS_PKG_ERRORS
-
-@@ -14807,23 +13650,11 @@
- 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.
--" >&5
--$as_echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
-
-$DBUS_PKG_ERRORS
-
@@ -9731,32 +9870,45 @@
-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.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
++ as_fn_error "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
+
+ $DBUS_PKG_ERRORS
+
+@@ -14817,23 +13657,13 @@
+
+ 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.
-" >&2;}
- { (exit 1); exit 1; }; }
-+" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_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
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14832,31 +13663,20 @@
+@@ -14842,21 +13672,20 @@
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; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
@@ -9766,7 +9918,8 @@
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+- :
++
fi
# Extract the first word of "dbus-binding-tool", so it can be a program name with args.
@@ -9779,7 +9932,7 @@
$as_echo_n "(cached) " >&6
else
case $DBUS_BINDING_TOOL in
-@@ -14869,14 +13689,14 @@
+@@ -14869,14 +13698,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9797,7 +9950,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_DBUS_BINDING_TOOL" && ac_cv_path_DBUS_BINDING_TOOL="no"
-@@ -14885,19 +13705,17 @@
+@@ -14885,19 +13714,17 @@
fi
DBUS_BINDING_TOOL=$ac_cv_path_DBUS_BINDING_TOOL
if test -n "$DBUS_BINDING_TOOL"; then
@@ -9820,7 +9973,7 @@
fi
# *****
-@@ -14913,13 +13731,13 @@
+@@ -14913,13 +13740,13 @@
# Check whether --with-gconf-source was given.
@@ -9836,7 +9989,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -14928,22 +13746,20 @@
+@@ -14928,22 +13755,20 @@
# Check whether --with-gconf-schema-file-dir was given.
@@ -9863,7 +10016,7 @@
esac
fi
-@@ -14959,9 +13775,9 @@
+@@ -14959,9 +13784,9 @@
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -9875,7 +10028,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -14974,14 +13790,14 @@
+@@ -14974,14 +13799,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9893,7 +10046,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-@@ -14990,134 +13806,29 @@
+@@ -14990,573 +13815,139 @@
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -9919,23 +10072,115 @@
# Portability checks
# ******************
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
- for ac_func in localtime_r memchr memmove memset mkdir mkdtemp realpath sqrt strchr strcspn strdup strerror strrchr strtol strtoul strstr
++for ac_func in localtime_r memchr memmove memset mkdir mkdtemp realpath sqrt strchr strcspn strdup strerror strrchr strtol strtoul strstr
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+
++fi
++done
+
+
++# for backtrace()
++for ac_header in execinfo.h fcntl.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+
++fi
+
++done
+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
++$as_echo_n "checking for inline... " >&6; }
++if test "${ac_cv_c_inline+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_cv_c_inline=no
++for ac_kw in inline __inline__ __inline; do
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#ifndef __cplusplus
++typedef int foo_t;
++static $ac_kw foo_t static_foo () {return 0; }
++$ac_kw foo_t foo () {return 0; }
++#endif
+
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_c_inline=$ac_kw
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ test "$ac_cv_c_inline" != no && break
++done
+
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
++$as_echo "$ac_cv_c_inline" >&6; }
+
++case $ac_cv_c_inline in
++ inline | yes) ;;
++ *)
++ case $ac_cv_c_inline in
++ no) ac_val=;;
++ *) ac_val=$ac_cv_c_inline;;
++ esac
++ cat >>confdefs.h <<_ACEOF
++#ifndef __cplusplus
++#define inline $ac_val
++#endif
++_ACEOF
++ ;;
++esac
+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
++$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
++if test "${ac_cv_header_time+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <sys/types.h>
++#include <sys/time.h>
++#include <time.h>
+
++int
++main ()
++{
++if ((struct tm *) 0)
++return 0;
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_header_time=yes
++else
++ ac_cv_header_time=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
++$as_echo "$ac_cv_header_time" >&6; }
++if test $ac_cv_header_time = yes; then
+
++$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+
++fi
+
+
+
+-for ac_func in localtime_r memchr memmove memset mkdir mkdtemp realpath sqrt strchr strcspn strdup strerror strrchr strtol strtoul strstr
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -9952,7 +10197,7 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
@@ -10028,21 +10273,18 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -15127,150 +13838,12 @@
-
-
- # for backtrace()
--
--
- for ac_header in execinfo.h fcntl.h
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-
+-# for backtrace()
+-
+-
+-for ac_header in execinfo.h fcntl.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -10184,40 +10426,34 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -15279,18 +13852,14 @@
-
- done
-
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
-{ $as_echo "$as_me:$LINENO: checking for inline" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
- $as_echo_n "checking for inline... " >&6; }
+-$as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then
-+if test "${ac_cv_c_inline+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
+- $as_echo_n "(cached) " >&6
+-else
+- ac_cv_c_inline=no
+-for ac_kw in inline __inline__ __inline; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #ifndef __cplusplus
- typedef int foo_t;
-@@ -15299,41 +13868,17 @@
- #endif
-
- _ACEOF
+-/* end confdefs.h. */
+-#ifndef __cplusplus
+-typedef int foo_t;
+-static $ac_kw foo_t static_foo () {return 0; }
+-$ac_kw foo_t foo () {return 0; }
+-#endif
+-
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -10236,52 +10472,62 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_inline=$ac_kw
+- ac_cv_c_inline=$ac_kw
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- test "$ac_cv_c_inline" != no && break
- done
-
- fi
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- test "$ac_cv_c_inline" != no && break
+-done
+-
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
- $as_echo "$ac_cv_c_inline" >&6; }
-
--
- case $ac_cv_c_inline in
- inline | yes) ;;
- *)
-@@ -15349,16 +13894,12 @@
- ;;
- esac
-
+-$as_echo "$ac_cv_c_inline" >&6; }
+-
+-
+-case $ac_cv_c_inline in
+- inline | yes) ;;
+- *)
+- case $ac_cv_c_inline in
+- no) ac_val=;;
+- *) ac_val=$ac_cv_c_inline;;
+- esac
+- cat >>confdefs.h <<_ACEOF
+-#ifndef __cplusplus
+-#define inline $ac_val
+-#endif
+-_ACEOF
+- ;;
+-esac
+-
-{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
- $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if test "${ac_cv_header_time+set}" = set; then
-+if test "${ac_cv_header_time+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $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
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -15373,308 +13914,38 @@
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+-#include <sys/types.h>
+-#include <sys/time.h>
+-#include <time.h>
+-
+-int
+-main ()
+-{
+-if ((struct tm *) 0)
+-return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -10300,33 +10546,29 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_time=yes
- else
+- ac_cv_header_time=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_time=no
-+ ac_cv_header_time=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
- $as_echo "$ac_cv_header_time" >&6; }
- if test $ac_cv_header_time = yes; then
-
+-$as_echo "$ac_cv_header_time" >&6; }
+-if test $ac_cv_header_time = yes; then
+-
-cat >>confdefs.h <<\_ACEOF
-#define TIME_WITH_SYS_TIME 1
-_ACEOF
-+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
-
- fi
-
-
-
-
+-
+-fi
+-
+-
+-
+-
-
-for ac_header in $ac_header_list
-do
@@ -10480,18 +10722,10 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-
- fi
-
--done
--
--
--
--
--
--
--
--
+@@ -15572,100 +13963,12 @@
+
+
+
-
-for ac_func in $ac_func_list
-do
@@ -10586,40 +10820,31 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--done
--
--
--
-+done
-
-
-
-@@ -15683,25 +13954,32 @@
-
-
-
+ for ac_func in $ac_func_list
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-
-+fi
-+done
-
-
-
-
-
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -15677,31 +13980,15 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
-{ $as_echo "$as_me:$LINENO: checking for working mktime" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5
$as_echo_n "checking for working mktime... " >&6; }
@@ -10640,10 +10865,11 @@
/* end confdefs.h. */
/* Test program from Paul Eggert and Tony Leneis. */
#ifdef TIME_WITH_SYS_TIME
-@@ -15898,44 +14176,17 @@
+@@ -15897,45 +14184,18 @@
+ }
return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
}
- _ACEOF
+-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -10666,6 +10892,7 @@
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
++_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_func_working_mktime=yes
else
@@ -10690,7 +10917,7 @@
$as_echo "$ac_cv_func_working_mktime" >&6; }
if test $ac_cv_func_working_mktime = no; then
case " $LIBOBJS " in
-@@ -15946,19 +14197,15 @@
+@@ -15946,19 +14206,15 @@
fi
@@ -10714,7 +10941,7 @@
/* end confdefs.h. */
$ac_includes_default
-@@ -15991,44 +14238,17 @@
+@@ -15991,44 +14247,17 @@
}
_ACEOF
@@ -10764,7 +10991,7 @@
$as_echo "$ac_cv_func_strtod" >&6; }
if test $ac_cv_func_strtod = no; then
case " $LIBOBJS " in
-@@ -16037,105 +14257,20 @@
+@@ -16037,105 +14266,20 @@
;;
esac
@@ -10875,7 +11102,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16153,46 +14288,21 @@
+@@ -16153,46 +14297,21 @@
return 0;
}
_ACEOF
@@ -10929,7 +11156,7 @@
$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
fi
-@@ -16200,102 +14310,9 @@
+@@ -16200,102 +14319,9 @@
fi
@@ -11019,12 +11246,12 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = x""yes; then :
--
--fi
--
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
@@ -11034,26 +11261,23 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -16319,48 +14336,23 @@
+@@ -16319,211 +14345,47 @@
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $_FLAGS"
- { $as_echo "$as_me:$LINENO: checking for compiler $FLAGS option" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler $FLAGS option" >&5
- $as_echo_n "checking for compiler $FLAGS option... " >&6; }
+-$as_echo_n "checking for compiler $FLAGS option... " >&6; }
-if test "${ac_cv_have_declaration_after_statement+set}" = set; then
-+if test "${ac_cv_have_declaration_after_statement+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $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
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main () { return 0; }
- _ACEOF
+-/* end confdefs.h. */
+-int main () { return 0; }
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -11072,29 +11296,37 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_have_declaration_after_statement="yes"
- else
+- ac_cv_have_declaration_after_statement="yes"
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_declaration_after_statement="no"
-+ ac_cv_have_declaration_after_statement="no"
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_declaration_after_statement" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_declaration_after_statement" >&5
- $as_echo "$ac_cv_have_declaration_after_statement" >&6; }
-
- if test "$ac_cv_have_declaration_after_statement" = "yes"; then
-@@ -16379,151 +14371,12 @@
- # Multimedia keys
- # ***************
-
--
- for ac_header in X11/XF86keysym.h
+-$as_echo "$ac_cv_have_declaration_after_statement" >&6; }
+-
+- if test "$ac_cv_have_declaration_after_statement" = "yes"; then
+- MORE_WARN_FLAGS="$MORE_WARN_FLAGS $_FLAGS"
+- fi
+- CFLAGS="$_SAVE_CFLAGS"
+- 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
+-
+-fi
+-
+-# ***************
+-# Multimedia keys
+-# ***************
+-
+-
+-for ac_header in X11/XF86keysym.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -11223,19 +11455,50 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler $FLAGS option" >&5
++$as_echo_n "checking for compiler $FLAGS option... " >&6; }
++if test "${ac_cv_have_declaration_after_statement+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- eval "$as_ac_Header=\$ac_header_preproc"
--fi
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++int main () { return 0; }
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_declaration_after_statement="yes"
++else
++ ac_cv_have_declaration_after_statement="no"
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--
--fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_declaration_after_statement" >&5
++$as_echo "$ac_cv_have_declaration_after_statement" >&6; }
++
++ if test "$ac_cv_have_declaration_after_statement" = "yes"; then
++ MORE_WARN_FLAGS="$MORE_WARN_FLAGS $_FLAGS"
++ fi
++ CFLAGS="$_SAVE_CFLAGS"
++ 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
+
+ fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++
++# ***************
++# Multimedia keys
++# ***************
++
++for ac_header in X11/XF86keysym.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "X11/XF86keysym.h" "ac_cv_header_X11_XF86keysym_h" "$ac_includes_default"
+if test "x$ac_cv_header_X11_XF86keysym_h" = x""yes; then :
@@ -11245,7 +11508,7 @@
_ACEOF
fi
-@@ -16541,62 +14394,59 @@
+@@ -16541,62 +14403,59 @@
# Check whether --enable-introspection was given.
@@ -11334,7 +11597,7 @@
$as_echo "$found_introspection" >&6; }
INTROSPECTION_SCANNER=
-@@ -16637,9 +14487,7 @@
+@@ -16637,9 +14496,7 @@
if test "$found_introspection" = "yes"; then
EPIPHANY_FEATURES="$EPIPHANY_FEATURES introspection"
@@ -11345,7 +11608,7 @@
fi
-@@ -16647,22 +14495,20 @@
+@@ -16647,22 +14504,20 @@
# Seed
# ****
@@ -11372,7 +11635,7 @@
fi
if test "$enable_seed" = "yes"; then
-@@ -16671,40 +14517,44 @@
+@@ -16671,18 +14526,18 @@
SEED_REQUIRED=2.27.91
pkg_failed=no
@@ -11380,16 +11643,11 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SEED" >&5
$as_echo_n "checking for SEED... " >&6; }
--if test -n "$SEED_CFLAGS"; then
-- pkg_cv_SEED_CFLAGS="$SEED_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
+ if test -n "$SEED_CFLAGS"; then
+ pkg_cv_SEED_CFLAGS="$SEED_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seed >= \$SEED_REQUIRED\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$SEED_CFLAGS"; then
-+ pkg_cv_SEED_CFLAGS="$SEED_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"seed >= \$SEED_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "seed >= $SEED_REQUIRED") 2>&5
ac_status=$?
@@ -11400,23 +11658,11 @@
pkg_cv_SEED_CFLAGS=`$PKG_CONFIG --cflags "seed >= $SEED_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$SEED_LIBS"; then
-- pkg_cv_SEED_LIBS="$SEED_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
+@@ -16694,11 +14549,11 @@
+ pkg_cv_SEED_LIBS="$SEED_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seed >= \$SEED_REQUIRED\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$SEED_LIBS"; then
-+ pkg_cv_SEED_LIBS="$SEED_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"seed >= \$SEED_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "seed >= $SEED_REQUIRED") 2>&5
ac_status=$?
@@ -11427,25 +11673,16 @@
pkg_cv_SEED_LIBS=`$PKG_CONFIG --libs "seed >= $SEED_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -16717,25 +14567,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- SEED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seed >= $SEED_REQUIRED" 2>&1`
-+ SEED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "seed >= $SEED_REQUIRED"`
- else
-- SEED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seed >= $SEED_REQUIRED" 2>&1`
-+ SEED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "seed >= $SEED_REQUIRED"`
- fi
+@@ -16710,6 +14565,8 @@
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -16724,18 +14581,7 @@
# Put the nasty error message in config.log where it belongs
echo "$SEED_PKG_ERRORS" >&5
@@ -11465,15 +11702,18 @@
$SEED_PKG_ERRORS
-@@ -16745,22 +14584,11 @@
+@@ -16744,23 +14590,13 @@
+
Alternatively, you may set the environment variables SEED_CFLAGS
and SEED_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
+-See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
-+" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
@@ -11491,7 +11731,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -16769,20 +14597,17 @@
+@@ -16769,20 +14605,17 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11504,7 +11744,8 @@
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+- :
++
fi
@@ -11515,7 +11756,7 @@
fi
-@@ -16800,16 +14625,16 @@
+@@ -16800,16 +14633,16 @@
# Stolen from GIO's TLS
# *********************
@@ -11535,7 +11776,7 @@
$as_echo "disabled" >&6; }
else
if test -z "$with_ca_file"; then
-@@ -16820,18 +14645,14 @@
+@@ -16820,18 +14653,14 @@
fi
done
if test -z "$with_ca_file"; then
@@ -11557,7 +11798,7 @@
fi
GTLS_SYSTEM_CA_FILE="$with_ca_file"
-@@ -16846,55 +14667,59 @@
+@@ -16846,33 +14675,33 @@
# NSS
# ***
@@ -11583,16 +11824,11 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS" >&5
$as_echo_n "checking for NSS... " >&6; }
--if test -n "$NSS_CFLAGS"; then
-- pkg_cv_NSS_CFLAGS="$NSS_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
+ if test -n "$NSS_CFLAGS"; then
+ pkg_cv_NSS_CFLAGS="$NSS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$NSS_CFLAGS"; then
-+ pkg_cv_NSS_CFLAGS="$NSS_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss\""; } >&5
($PKG_CONFIG --exists --print-errors "nss") 2>&5
ac_status=$?
@@ -11603,23 +11839,11 @@
pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss" 2>/dev/null`
else
pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$NSS_LIBS"; then
-- pkg_cv_NSS_LIBS="$NSS_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
+@@ -16884,11 +14713,11 @@
+ pkg_cv_NSS_LIBS="$NSS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$NSS_LIBS"; then
-+ pkg_cv_NSS_LIBS="$NSS_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss\""; } >&5
($PKG_CONFIG --exists --print-errors "nss") 2>&5
ac_status=$?
@@ -11630,25 +11854,16 @@
pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "nss" 2>/dev/null`
else
pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -16907,25 +14732,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "nss" 2>&1`
-+ NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nss"`
- else
-- NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors "nss" 2>&1`
-+ NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nss"`
- fi
+@@ -16900,6 +14729,8 @@
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -16914,18 +14745,7 @@
# Put the nasty error message in config.log where it belongs
echo "$NSS_PKG_ERRORS" >&5
@@ -11668,15 +11883,18 @@
$NSS_PKG_ERRORS
-@@ -16935,22 +14749,11 @@
+@@ -16934,23 +14754,13 @@
+
Alternatively, you may set the environment variables NSS_CFLAGS
and NSS_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
+-See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
-+" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
@@ -11694,7 +11912,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -16959,20 +14762,17 @@
+@@ -16959,20 +14769,17 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11707,7 +11925,8 @@
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+- :
++
fi
@@ -11718,7 +11937,7 @@
fi
-@@ -16993,16 +14793,16 @@
+@@ -16993,16 +14800,16 @@
# Zeroconf bookmarks sites
@@ -11738,7 +11957,7 @@
$as_echo "$enable_zeroconf" >&6; }
if test "$enable_zeroconf" != "no"; then
-@@ -17010,52 +14810,56 @@
+@@ -17010,22 +14817,22 @@
pkg_failed=no
@@ -11746,16 +11965,11 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVAHI" >&5
$as_echo_n "checking for AVAHI... " >&6; }
--if test -n "$AVAHI_CFLAGS"; then
-- pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
+ if test -n "$AVAHI_CFLAGS"; then
+ pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"avahi-gobject >= \$AVAHI_REQUIRED
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$AVAHI_CFLAGS"; then
-+ pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-gobject >= \$AVAHI_REQUIRED
avahi-client >= \$AVAHI_REQUIRED
- \"") >&5
@@ -11771,25 +11985,11 @@
pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags "avahi-gobject >= $AVAHI_REQUIRED
avahi-client >= $AVAHI_REQUIRED
" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$AVAHI_LIBS"; then
-- pkg_cv_AVAHI_LIBS="$AVAHI_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
+@@ -17039,15 +14846,15 @@
+ pkg_cv_AVAHI_LIBS="$AVAHI_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"avahi-gobject >= \$AVAHI_REQUIRED
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$AVAHI_LIBS"; then
-+ pkg_cv_AVAHI_LIBS="$AVAHI_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-gobject >= \$AVAHI_REQUIRED
avahi-client >= \$AVAHI_REQUIRED
- \"") >&5
@@ -11805,42 +12005,27 @@
pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs "avahi-gobject >= $AVAHI_REQUIRED
avahi-client >= $AVAHI_REQUIRED
" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -17068,18 +14872,18 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "avahi-gobject >= $AVAHI_REQUIRED
-+ AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "avahi-gobject >= $AVAHI_REQUIRED
- avahi-client >= $AVAHI_REQUIRED
-- " 2>&1`
-+ "`
- else
-- AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors "avahi-gobject >= $AVAHI_REQUIRED
-+ AVAHI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "avahi-gobject >= $AVAHI_REQUIRED
- avahi-client >= $AVAHI_REQUIRED
-- " 2>&1`
-+ "`
- fi
+@@ -17061,6 +14868,8 @@
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -17079,23 +14888,21 @@
# Put the nasty error message in config.log where it belongs
echo "$AVAHI_PKG_ERRORS" >&5
- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- have_avahi=no
+-$as_echo "no" >&6; }
+- have_avahi=no
++ have_avahi=no
elif test $pkg_failed = untried; then
-@@ -17087,15 +14891,13 @@
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ have_avahi=no
else
AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS
AVAHI_LIBS=$pkg_cv_AVAHI_LIBS
@@ -11858,7 +12043,7 @@
elif test "$have_avahi" = "yes"; then
enable_zeroconf=yes
else
-@@ -17105,9 +14907,7 @@
+@@ -17105,9 +14912,7 @@
if test "$enable_zeroconf" = "yes"; then
@@ -11869,7 +12054,7 @@
fi
-@@ -17122,55 +14922,59 @@
+@@ -17122,33 +14927,33 @@
# NetworkManager
@@ -11895,16 +12080,11 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NETWORK_MANAGER" >&5
$as_echo_n "checking for NETWORK_MANAGER... " >&6; }
--if test -n "$NETWORK_MANAGER_CFLAGS"; then
-- pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
+ if test -n "$NETWORK_MANAGER_CFLAGS"; then
+ pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$NETWORK_MANAGER_CFLAGS"; then
-+ pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager\""; } >&5
($PKG_CONFIG --exists --print-errors "NetworkManager") 2>&5
ac_status=$?
@@ -11915,23 +12095,11 @@
pkg_cv_NETWORK_MANAGER_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager" 2>/dev/null`
else
pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$NETWORK_MANAGER_LIBS"; then
-- pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
+@@ -17160,11 +14965,11 @@
+ pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$NETWORK_MANAGER_LIBS"; then
-+ pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager\""; } >&5
($PKG_CONFIG --exists --print-errors "NetworkManager") 2>&5
ac_status=$?
@@ -11942,34 +12110,27 @@
pkg_cv_NETWORK_MANAGER_LIBS=`$PKG_CONFIG --libs "NetworkManager" 2>/dev/null`
else
pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -17183,14 +14987,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager" 2>&1`
-+ NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "NetworkManager"`
- else
-- NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager" 2>&1`
-+ NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "NetworkManager"`
- fi
+@@ -17176,6 +14981,8 @@
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -17190,34 +14997,30 @@
# Put the nasty error message in config.log where it belongs
echo "$NETWORK_MANAGER_PKG_ERRORS" >&5
- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- have_network_manager=no
+-$as_echo "no" >&6; }
+- have_network_manager=no
++ have_network_manager=no
elif test $pkg_failed = untried; then
-@@ -17198,26 +15002,22 @@
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ have_network_manager=no
else
NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS
NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS
@@ -12000,7 +12161,7 @@
fi
-@@ -17258,18 +15058,18 @@
+@@ -17258,18 +15061,18 @@
ISO_CODES_REQUIRED=0.35
if test -n "$PKG_CONFIG" && \
@@ -12023,7 +12184,7 @@
$as_echo_n "checking whether iso-codes has iso-639 and iso-3166 domains... " >&6; }
if $PKG_CONFIG --variable=domains iso-codes | grep -q 639 && \
$PKG_CONFIG --variable=domains iso-codes | grep -q 3166 ; then
-@@ -17278,7 +15078,7 @@
+@@ -17278,7 +15081,7 @@
result=no
have_iso_codes=no
fi
@@ -12032,7 +12193,7 @@
$as_echo "$result" >&6; }
fi
-@@ -17289,14 +15089,10 @@
+@@ -17289,14 +15092,10 @@
_ACEOF
@@ -12049,7 +12210,7 @@
fi
GETTEXT_PACKAGE=epiphany
-@@ -17307,151 +15103,12 @@
+@@ -17307,151 +15106,12 @@
_ACEOF
@@ -12206,7 +12367,7 @@
_ACEOF
fi
-@@ -17459,16 +15116,12 @@
+@@ -17459,16 +15119,12 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -12226,7 +12387,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -17479,207 +15132,45 @@
+@@ -17479,207 +15135,45 @@
return 0;
}
_ACEOF
@@ -12459,7 +12620,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -17692,54 +15183,25 @@
+@@ -17692,54 +15186,25 @@
return 0;
}
_ACEOF
@@ -12522,7 +12683,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -17752,141 +15214,26 @@
+@@ -17752,141 +15217,26 @@
return 0;
}
_ACEOF
@@ -12674,7 +12835,7 @@
_ACEOF
fi
-@@ -17901,18 +15248,14 @@
+@@ -17901,18 +15251,14 @@
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -12696,7 +12857,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17930,55 +15273,26 @@
+@@ -17930,55 +15276,26 @@
return 0;
}
_ACEOF
@@ -12761,7 +12922,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17996,55 +15310,26 @@
+@@ -17996,55 +15313,26 @@
return 0;
}
_ACEOF
@@ -12826,7 +12987,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18062,43 +15347,18 @@
+@@ -18062,43 +15350,18 @@
return 0;
}
_ACEOF
@@ -12876,7 +13037,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -18108,22 +15368,18 @@
+@@ -18108,22 +15371,18 @@
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -12904,7 +13065,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18141,55 +15397,26 @@
+@@ -18141,55 +15400,26 @@
return 0;
}
_ACEOF
@@ -12969,7 +13130,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18207,160 +15434,45 @@
+@@ -18207,160 +15437,45 @@
return 0;
}
_ACEOF
@@ -13159,7 +13320,7 @@
_ACEOF
fi
-@@ -18390,15 +15502,13 @@
+@@ -18390,15 +15505,13 @@
if test "$gt_cv_have_gettext" = "yes"; then
@@ -13178,7 +13339,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -18423,118 +15533,28 @@
+@@ -18423,118 +15536,28 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -13305,7 +13466,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -18549,14 +15569,14 @@
+@@ -18549,14 +15572,14 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -13325,7 +13486,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -18564,9 +15584,9 @@
+@@ -18564,9 +15587,9 @@
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -13337,7 +13498,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -18579,14 +15599,14 @@
+@@ -18579,14 +15602,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13355,7 +13516,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -18595,19 +15615,19 @@
+@@ -18595,19 +15618,19 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -13379,7 +13540,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -18632,18 +15652,14 @@
+@@ -18632,18 +15655,14 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -13401,7 +13562,7 @@
/* end confdefs.h. */
int
-@@ -18655,121 +15671,14 @@
+@@ -18655,121 +15674,14 @@
return 0;
}
_ACEOF
@@ -13527,7 +13688,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -18784,10 +15693,8 @@
+@@ -18784,10 +15696,8 @@
;;
esac
fi
@@ -13540,7 +13701,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -18801,9 +15708,7 @@
+@@ -18801,9 +15711,7 @@
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -13551,7 +13712,7 @@
fi
-@@ -18811,7 +15716,7 @@
+@@ -18811,7 +15719,7 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -13560,7 +13721,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -18844,7 +15749,7 @@
+@@ -18844,7 +15752,7 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -13569,7 +13730,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -18869,7 +15774,7 @@
+@@ -18869,7 +15777,7 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -13578,7 +13739,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -18917,7 +15822,7 @@
+@@ -18917,7 +15825,7 @@
# Check whether --with-distributor-name was given.
@@ -13587,7 +13748,7 @@
withval=$with_distributor_name; LSB_DISTRIBUTOR="$withval"
fi
-@@ -18927,9 +15832,9 @@
+@@ -18927,9 +15835,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -13599,7 +13760,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LSB_RELEASE"; then
-@@ -18940,24 +15845,24 @@
+@@ -18940,24 +15848,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13629,7 +13790,7 @@
$as_echo "no" >&6; }
fi
-@@ -18987,35 +15892,33 @@
+@@ -18987,35 +15895,33 @@
gdu_cv_version_required=0.3.2
@@ -13673,7 +13834,7 @@
withval=$with_help_dir;
else
with_help_dir='${datadir}/gnome/help'
-@@ -19026,7 +15929,7 @@
+@@ -19026,7 +15932,7 @@
# Check whether --with-omf-dir was given.
@@ -13682,7 +13843,7 @@
withval=$with_omf_dir;
else
with_omf_dir='${datadir}/omf'
-@@ -19037,7 +15940,7 @@
+@@ -19037,7 +15943,7 @@
# Check whether --with-help-formats was given.
@@ -13691,7 +13852,7 @@
withval=$with_help_formats;
else
with_help_formats=''
-@@ -19047,7 +15950,7 @@
+@@ -19047,7 +15953,7 @@
# Check whether --enable-scrollkeeper was given.
@@ -13700,7 +13861,7 @@
enableval=$enable_scrollkeeper;
else
enable_scrollkeeper=yes
-@@ -19076,9 +15979,137 @@
+@@ -19076,9 +15982,137 @@
@@ -13840,7 +14001,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -19088,7 +16119,7 @@
+@@ -19088,7 +16122,7 @@
# Check whether --enable-gtk-doc was given.
@@ -13849,7 +14010,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -19097,68 +16128,40 @@
+@@ -19097,68 +16131,40 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -13936,7 +14097,7 @@
if test x$enable_gtk_doc = xyes; then
-@@ -19169,6 +16172,22 @@
+@@ -19169,6 +16175,22 @@
ENABLE_GTK_DOC_FALSE=
fi
@@ -13959,7 +14120,7 @@
if test -n "$LIBTOOL"; then
GTK_DOC_USE_LIBTOOL_TRUE=
GTK_DOC_USE_LIBTOOL_FALSE='#'
-@@ -19177,6 +16196,14 @@
+@@ -19177,6 +16199,14 @@
GTK_DOC_USE_LIBTOOL_FALSE=
fi
@@ -13974,7 +14135,7 @@
# ************
-@@ -19184,9 +16211,7 @@
+@@ -19184,9 +16214,7 @@
# ************
@@ -13985,7 +14146,7 @@
ac_config_files="$ac_config_files Makefile data/Makefile data/epiphany-${EPIPHANY_API_VERSION}.pc:data/epiphany.pc.in data/epiphany.desktop.in data/bme.desktop.in data/glade/Makefile data/icons/Makefile data/art/Makefile data/ui/Makefile doc/Makefile doc/reference/Makefile lib/Makefile lib/egg/Makefile lib/widgets/Makefile embed/Makefile src/Makefile src/bookmarks/Makefile src/epiphany.h help/Makefile po/Makefile.in tests/Makefile"
-@@ -19219,13 +16244,13 @@
+@@ -19219,13 +16247,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -14001,7 +14162,7 @@
esac ;;
esac
done
-@@ -19233,8 +16258,8 @@
+@@ -19233,8 +16261,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -14012,7 +14173,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -19257,11 +16282,11 @@
+@@ -19257,11 +16285,11 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -14026,7 +14187,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -19281,8 +16306,8 @@
+@@ -19281,8 +16309,8 @@
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.
@@ -14037,7 +14198,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -19298,136 +16323,98 @@
+@@ -19298,136 +16326,98 @@
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -14223,7 +14384,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -19437,17 +16424,18 @@
+@@ -19437,17 +16427,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -14249,7 +14410,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -19455,23 +16443,15 @@
+@@ -19455,23 +16446,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -14278,7 +14439,7 @@
as_nl='
'
export as_nl
-@@ -19479,7 +16459,13 @@
+@@ -19479,7 +16462,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -14293,7 +14454,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -19490,7 +16476,7 @@
+@@ -19490,7 +16479,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -14302,7 +14463,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -19513,13 +16499,6 @@
+@@ -19513,13 +16502,6 @@
}
fi
@@ -14316,7 +14477,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -19529,15 +16508,15 @@
+@@ -19529,15 +16511,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -14335,7 +14496,7 @@
IFS=$as_save_IFS
;;
-@@ -19549,12 +16528,16 @@
+@@ -19549,12 +16531,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -14356,7 +14517,7 @@
done
PS1='$ '
PS2='> '
-@@ -19566,7 +16549,89 @@
+@@ -19566,7 +16552,89 @@
LANGUAGE=C
export LANGUAGE
@@ -14447,7 +14608,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -19580,8 +16645,12 @@
+@@ -19580,8 +16648,12 @@
as_basename=false
fi
@@ -14461,7 +14622,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -19601,76 +16670,25 @@
+@@ -19601,76 +16673,25 @@
}
s/.*/./; q'`
@@ -14549,7 +14710,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -19699,8 +16717,56 @@
+@@ -19699,8 +16720,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -14607,7 +14768,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -19719,10 +16785,10 @@
+@@ -19719,10 +16788,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -14620,7 +14781,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -19737,13 +16803,19 @@
+@@ -19737,13 +16806,19 @@
exec 6>&1
@@ -14636,13 +14797,13 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by GNOME Web Browser $as_me 2.30.2, which was
+ This file was extended by GNOME Web Browser $as_me 2.31.2, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -19775,13 +16847,15 @@
+@@ -19775,13 +16850,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -14661,7 +14822,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -19800,16 +16874,17 @@
+@@ -19800,16 +16877,17 @@
Configuration commands:
$config_commands
@@ -14672,7 +14833,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- GNOME Web Browser config.status 2.30.2
+ GNOME Web Browser config.status 2.31.2
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
@@ -14683,7 +14844,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -19845,6 +16920,8 @@
+@@ -19845,6 +16923,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -14692,7 +14853,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -19852,20 +16929,19 @@
+@@ -19852,20 +16932,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -14717,7 +14878,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -19873,11 +16949,10 @@
+@@ -19873,11 +16952,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -14732,7 +14893,7 @@
ac_need_defaults=false ;;
esac
-@@ -20212,9 +17287,7 @@
+@@ -20212,9 +17290,7 @@
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -14743,7 +14904,7 @@
esac
done
-@@ -20241,7 +17314,7 @@
+@@ -20241,7 +17317,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -14752,7 +14913,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -20252,11 +17325,7 @@
+@@ -20252,11 +17328,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -14765,7 +14926,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -20264,10 +17333,16 @@
+@@ -20264,10 +17336,16 @@
if test -n "$CONFIG_FILES"; then
@@ -14784,7 +14945,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -20281,24 +17356,18 @@
+@@ -20281,24 +17359,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -14812,7 +14973,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -20320,7 +17389,7 @@
+@@ -20320,7 +17392,7 @@
t delim
:nl
h
@@ -14821,7 +14982,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -20334,7 +17403,7 @@
+@@ -20334,7 +17406,7 @@
t nl
:delim
h
@@ -14830,7 +14991,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -20387,9 +17456,7 @@
+@@ -20387,9 +17459,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -14841,7 +15002,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -20430,9 +17497,7 @@
+@@ -20430,9 +17500,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -14852,7 +15013,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -20517,9 +17582,7 @@
+@@ -20517,9 +17585,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -14863,7 +15024,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -20532,9 +17595,7 @@
+@@ -20532,9 +17598,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -14874,7 +15035,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -20562,12 +17623,10 @@
+@@ -20562,12 +17626,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -14889,7 +15050,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -20578,7 +17637,7 @@
+@@ -20578,7 +17640,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -14898,7 +15059,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -20591,9 +17650,7 @@
+@@ -20591,9 +17653,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -14909,7 +15070,7 @@
esac
;;
esac
-@@ -20621,47 +17678,7 @@
+@@ -20621,47 +17681,7 @@
q
}
s/.*/./; q'`
@@ -14958,7 +15119,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -20718,7 +17735,6 @@
+@@ -20718,7 +17738,6 @@
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -14966,7 +15127,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -20728,12 +17744,11 @@
+@@ -20728,12 +17747,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -14981,7 +15142,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -20743,7 +17758,7 @@
+@@ -20743,7 +17761,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -14990,7 +15151,7 @@
esac
_ACEOF
-@@ -20772,14 +17787,12 @@
+@@ -20772,14 +17790,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -15007,7 +15168,7 @@
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
-@@ -20789,9 +17802,7 @@
+@@ -20789,9 +17805,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -15018,7 +15179,7 @@
;;
:H)
#
-@@ -20802,25 +17813,19 @@
+@@ -20802,25 +17816,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -15048,7 +15209,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -20858,7 +17863,7 @@
+@@ -20858,7 +17866,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -15057,7 +15218,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -20953,47 +17958,7 @@
+@@ -20953,47 +17961,7 @@
q
}
s/.*/./; q'`
@@ -15106,7 +15267,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -21640,9 +18605,7 @@
+@@ -21640,9 +18608,7 @@
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -15117,7 +15278,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -21665,15 +18628,12 @@
+@@ -21665,15 +18631,12 @@
done # for ac_tag
@@ -15135,7 +15296,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -21694,10 +18654,10 @@
+@@ -21694,10 +18657,10 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -15148,9 +15309,9 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/data/art/Makefile.in epiphany-browser-2.30.2/data/art/Makefile.in
---- epiphany-browser-2.30.2.old/data/art/Makefile.in 2010-04-08 16:57:12.000000000 +0200
-+++ epiphany-browser-2.30.2/data/art/Makefile.in 2010-04-09 07:22:23.429311631 +0200
+diff -Naur epiphany-browser-2.31.2.old/data/art/Makefile.in epiphany-browser-2.31.2/data/art/Makefile.in
+--- epiphany-browser-2.31.2.old/data/art/Makefile.in 2010-05-24 14:03:21.000000000 +0200
++++ epiphany-browser-2.31.2/data/art/Makefile.in 2010-05-25 21:53:16.268371736 +0200
@@ -141,6 +141,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15160,7 +15321,7 @@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
-@@ -194,6 +196,7 @@
+@@ -194,9 +196,12 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15168,9 +15329,14 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/data/glade/Makefile.in epiphany-browser-2.30.2/data/glade/Makefile.in
---- epiphany-browser-2.30.2.old/data/glade/Makefile.in 2010-04-08 16:57:12.000000000 +0200
-+++ epiphany-browser-2.30.2/data/glade/Makefile.in 2010-04-09 07:22:23.485311072 +0200
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ POW_LIB = @POW_LIB@
+diff -Naur epiphany-browser-2.31.2.old/data/glade/Makefile.in epiphany-browser-2.31.2/data/glade/Makefile.in
+--- epiphany-browser-2.31.2.old/data/glade/Makefile.in 2010-05-24 14:03:21.000000000 +0200
++++ epiphany-browser-2.31.2/data/glade/Makefile.in 2010-05-25 21:53:16.324371872 +0200
@@ -141,6 +141,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15180,7 +15346,7 @@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
-@@ -194,6 +196,7 @@
+@@ -194,9 +196,12 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15188,9 +15354,14 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/data/icons/Makefile.in epiphany-browser-2.30.2/data/icons/Makefile.in
---- epiphany-browser-2.30.2.old/data/icons/Makefile.in 2010-04-08 16:57:12.000000000 +0200
-+++ epiphany-browser-2.30.2/data/icons/Makefile.in 2010-04-09 07:22:23.545311298 +0200
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ POW_LIB = @POW_LIB@
+diff -Naur epiphany-browser-2.31.2.old/data/icons/Makefile.in epiphany-browser-2.31.2/data/icons/Makefile.in
+--- epiphany-browser-2.31.2.old/data/icons/Makefile.in 2010-05-24 14:03:21.000000000 +0200
++++ epiphany-browser-2.31.2/data/icons/Makefile.in 2010-05-25 21:53:16.384372589 +0200
@@ -119,6 +119,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15200,7 +15371,7 @@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
-@@ -172,6 +174,7 @@
+@@ -172,9 +174,12 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15208,9 +15379,14 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/data/Makefile.in epiphany-browser-2.30.2/data/Makefile.in
---- epiphany-browser-2.30.2.old/data/Makefile.in 2010-04-08 16:57:12.000000000 +0200
-+++ epiphany-browser-2.30.2/data/Makefile.in 2010-04-09 07:22:23.369312314 +0200
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ POW_LIB = @POW_LIB@
+diff -Naur epiphany-browser-2.31.2.old/data/Makefile.in epiphany-browser-2.31.2/data/Makefile.in
+--- epiphany-browser-2.31.2.old/data/Makefile.in 2010-05-24 14:03:21.000000000 +0200
++++ epiphany-browser-2.31.2/data/Makefile.in 2010-05-25 21:53:16.212371949 +0200
@@ -191,6 +191,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15220,7 +15396,7 @@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
-@@ -244,6 +246,7 @@
+@@ -244,9 +246,12 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15228,9 +15404,14 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/data/ui/Makefile.in epiphany-browser-2.30.2/data/ui/Makefile.in
---- epiphany-browser-2.30.2.old/data/ui/Makefile.in 2010-04-08 16:57:12.000000000 +0200
-+++ epiphany-browser-2.30.2/data/ui/Makefile.in 2010-04-09 07:22:23.605311660 +0200
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ POW_LIB = @POW_LIB@
+diff -Naur epiphany-browser-2.31.2.old/data/ui/Makefile.in epiphany-browser-2.31.2/data/ui/Makefile.in
+--- epiphany-browser-2.31.2.old/data/ui/Makefile.in 2010-05-24 14:03:21.000000000 +0200
++++ epiphany-browser-2.31.2/data/ui/Makefile.in 2010-05-25 21:53:16.436371939 +0200
@@ -141,6 +141,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15240,7 +15421,7 @@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
-@@ -194,6 +196,7 @@
+@@ -194,9 +196,12 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15248,9 +15429,14 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/doc/Makefile.in epiphany-browser-2.30.2/doc/Makefile.in
---- epiphany-browser-2.30.2.old/doc/Makefile.in 2010-04-08 16:57:12.000000000 +0200
-+++ epiphany-browser-2.30.2/doc/Makefile.in 2010-04-09 07:22:23.717311498 +0200
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ POW_LIB = @POW_LIB@
+diff -Naur epiphany-browser-2.31.2.old/doc/Makefile.in epiphany-browser-2.31.2/doc/Makefile.in
+--- epiphany-browser-2.31.2.old/doc/Makefile.in 2010-05-24 14:03:22.000000000 +0200
++++ epiphany-browser-2.31.2/doc/Makefile.in 2010-05-25 21:53:16.496371744 +0200
@@ -182,6 +182,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15260,7 +15446,7 @@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
-@@ -235,6 +237,7 @@
+@@ -235,9 +237,12 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15268,9 +15454,14 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/doc/reference/Makefile.in epiphany-browser-2.30.2/doc/reference/Makefile.in
---- epiphany-browser-2.30.2.old/doc/reference/Makefile.in 2010-04-08 16:57:12.000000000 +0200
-+++ epiphany-browser-2.30.2/doc/reference/Makefile.in 2010-04-09 07:22:23.781311322 +0200
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ POW_LIB = @POW_LIB@
+diff -Naur epiphany-browser-2.31.2.old/doc/reference/Makefile.in epiphany-browser-2.31.2/doc/reference/Makefile.in
+--- epiphany-browser-2.31.2.old/doc/reference/Makefile.in 2010-05-24 14:03:22.000000000 +0200
++++ epiphany-browser-2.31.2/doc/reference/Makefile.in 2010-05-25 21:53:16.564372632 +0200
@@ -123,6 +123,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15280,7 +15471,7 @@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
-@@ -176,6 +178,7 @@
+@@ -176,9 +178,12 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15288,9 +15479,14 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/embed/Makefile.in epiphany-browser-2.30.2/embed/Makefile.in
---- epiphany-browser-2.30.2.old/embed/Makefile.in 2010-04-08 16:57:13.000000000 +0200
-+++ epiphany-browser-2.30.2/embed/Makefile.in 2010-04-09 07:22:23.936310496 +0200
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ POW_LIB = @POW_LIB@
+diff -Naur epiphany-browser-2.31.2.old/embed/Makefile.in epiphany-browser-2.31.2/embed/Makefile.in
+--- epiphany-browser-2.31.2.old/embed/Makefile.in 2010-05-24 14:03:22.000000000 +0200
++++ epiphany-browser-2.31.2/embed/Makefile.in 2010-05-25 21:53:16.752372149 +0200
@@ -196,6 +196,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15300,7 +15496,7 @@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
-@@ -249,6 +251,7 @@
+@@ -249,9 +251,12 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15308,9 +15504,14 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/gnome-doc-utils.make epiphany-browser-2.30.2/gnome-doc-utils.make
---- epiphany-browser-2.30.2.old/gnome-doc-utils.make 2010-04-08 16:11:38.000000000 +0200
-+++ epiphany-browser-2.30.2/gnome-doc-utils.make 2010-04-09 07:22:18.564720048 +0200
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ POW_LIB = @POW_LIB@
+diff -Naur epiphany-browser-2.31.2.old/gnome-doc-utils.make epiphany-browser-2.31.2/gnome-doc-utils.make
+--- epiphany-browser-2.31.2.old/gnome-doc-utils.make 2010-04-27 13:58:02.000000000 +0200
++++ epiphany-browser-2.31.2/gnome-doc-utils.make 2010-05-25 21:53:11.325483256 +0200
@@ -266,6 +266,13 @@
.PHONY: po
po: $(_DOC_POFILES)
@@ -15368,10 +15569,10 @@
@for lc in C $(_DOC_REAL_LINGUAS); do \
if test -f "$$lc/.xml2po.mo"; then \
echo "rm -f $$lc/.xml2po.mo"; \
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/gtk-doc.make epiphany-browser-2.30.2/gtk-doc.make
---- epiphany-browser-2.30.2.old/gtk-doc.make 1970-01-01 01:00:00.000000000 +0100
-+++ epiphany-browser-2.30.2/gtk-doc.make 2010-04-09 07:22:18.489312627 +0200
-@@ -0,0 +1,224 @@
+diff -Naur epiphany-browser-2.31.2.old/gtk-doc.make epiphany-browser-2.31.2/gtk-doc.make
+--- epiphany-browser-2.31.2.old/gtk-doc.make 1970-01-01 01:00:00.000000000 +0100
++++ epiphany-browser-2.31.2/gtk-doc.make 2010-05-25 21:53:11.256384179 +0200
+@@ -0,0 +1,230 @@
+# -*- mode: makefile -*-
+
+####################################
@@ -15449,8 +15650,11 @@
+scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+ @echo 'gtk-doc: Scanning header files'
+ @-chmod -R u+w $(srcdir)
-+ @cd $(srcdir) && \
-+ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
++ @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
++ _source_dir="$${_source_dir} --source-dir=$$i" ; \
++ done ; \
++ cd $(srcdir) && \
++ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+ @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+ else \
@@ -15483,8 +15687,11 @@
+sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+ @echo 'gtk-doc: Building XML'
+ @-chmod -R u+w $(srcdir)
-+ @cd $(srcdir) && \
-+ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
++ @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
++ _source_dir="$${_source_dir} --source-dir=$$i" ; \
++ done ; \
++ cd $(srcdir) && \
++ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+ @touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
@@ -15596,9 +15803,9 @@
+ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/help/Makefile.in epiphany-browser-2.30.2/help/Makefile.in
---- epiphany-browser-2.30.2.old/help/Makefile.in 2010-04-08 16:57:13.000000000 +0200
-+++ epiphany-browser-2.30.2/help/Makefile.in 2010-04-09 07:22:24.033313893 +0200
+diff -Naur epiphany-browser-2.31.2.old/help/Makefile.in epiphany-browser-2.31.2/help/Makefile.in
+--- epiphany-browser-2.31.2.old/help/Makefile.in 2010-05-24 14:03:22.000000000 +0200
++++ epiphany-browser-2.31.2/help/Makefile.in 2010-05-25 21:53:16.828371684 +0200
@@ -142,6 +142,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15608,7 +15815,7 @@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
-@@ -195,6 +197,7 @@
+@@ -195,9 +197,12 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15616,7 +15823,12 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -335,6 +338,7 @@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ POW_LIB = @POW_LIB@
+@@ -335,6 +340,7 @@
_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \
$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
@@ -15624,7 +15836,7 @@
_DOC_LC_MODULES = $(if $(DOC_MODULE), \
$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
-@@ -684,6 +688,9 @@
+@@ -684,6 +690,9 @@
.PHONY: po
po: $(_DOC_POFILES)
@@ -15634,7 +15846,7 @@
$(_DOC_POFILES):
@if ! test -d $(dir $@); then \
echo "mkdir $(dir $@)"; \
-@@ -711,16 +718,23 @@
+@@ -711,16 +720,23 @@
$(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
fi
@@ -15662,7 +15874,7 @@
"$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
.PHONY: pot
-@@ -746,12 +760,14 @@
+@@ -746,12 +762,14 @@
clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
clean-doc-lc:
rm -f $(_DOC_LC_DOCS)
@@ -15677,9 +15889,9 @@
@for lc in C $(_DOC_REAL_LINGUAS); do \
if test -f "$$lc/.xml2po.mo"; then \
echo "rm -f $$lc/.xml2po.mo"; \
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/lib/egg/Makefile.in epiphany-browser-2.30.2/lib/egg/Makefile.in
---- epiphany-browser-2.30.2.old/lib/egg/Makefile.in 2010-04-08 16:57:13.000000000 +0200
-+++ epiphany-browser-2.30.2/lib/egg/Makefile.in 2010-04-09 07:22:24.337311318 +0200
+diff -Naur epiphany-browser-2.31.2.old/lib/egg/Makefile.in epiphany-browser-2.31.2/lib/egg/Makefile.in
+--- epiphany-browser-2.31.2.old/lib/egg/Makefile.in 2010-05-24 14:03:23.000000000 +0200
++++ epiphany-browser-2.31.2/lib/egg/Makefile.in 2010-05-25 21:53:17.120371643 +0200
@@ -165,6 +165,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15689,7 +15901,7 @@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
-@@ -218,6 +220,7 @@
+@@ -218,9 +220,12 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15697,9 +15909,14 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/lib/Makefile.in epiphany-browser-2.30.2/lib/Makefile.in
---- epiphany-browser-2.30.2.old/lib/Makefile.in 2010-04-08 16:57:13.000000000 +0200
-+++ epiphany-browser-2.30.2/lib/Makefile.in 2010-04-09 07:22:24.229311207 +0200
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ POW_LIB = @POW_LIB@
+diff -Naur epiphany-browser-2.31.2.old/lib/Makefile.in epiphany-browser-2.31.2/lib/Makefile.in
+--- epiphany-browser-2.31.2.old/lib/Makefile.in 2010-05-24 14:03:23.000000000 +0200
++++ epiphany-browser-2.31.2/lib/Makefile.in 2010-05-25 21:53:17.008373899 +0200
@@ -275,6 +275,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15709,7 +15926,7 @@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
-@@ -328,6 +330,7 @@
+@@ -328,9 +330,12 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15717,7 +15934,12 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -444,7 +447,7 @@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ POW_LIB = @POW_LIB@
+@@ -444,7 +449,7 @@
-I$(top_srcdir)/lib/egg \
-DDATADIR="\"$(datadir)\"" \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -15726,9 +15948,9 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/lib/widgets/Makefile.in epiphany-browser-2.30.2/lib/widgets/Makefile.in
---- epiphany-browser-2.30.2.old/lib/widgets/Makefile.in 2010-04-08 16:57:13.000000000 +0200
-+++ epiphany-browser-2.30.2/lib/widgets/Makefile.in 2010-04-09 07:22:24.441311621 +0200
+diff -Naur epiphany-browser-2.31.2.old/lib/widgets/Makefile.in epiphany-browser-2.31.2/lib/widgets/Makefile.in
+--- epiphany-browser-2.31.2.old/lib/widgets/Makefile.in 2010-05-24 14:03:23.000000000 +0200
++++ epiphany-browser-2.31.2/lib/widgets/Makefile.in 2010-05-25 21:53:17.220371640 +0200
@@ -160,6 +160,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15738,7 +15960,7 @@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
-@@ -213,6 +215,7 @@
+@@ -213,9 +215,12 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15746,9 +15968,14 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/ltmain.sh epiphany-browser-2.30.2/ltmain.sh
---- epiphany-browser-2.30.2.old/ltmain.sh 2010-04-08 16:11:37.000000000 +0200
-+++ epiphany-browser-2.30.2/ltmain.sh 2010-04-09 07:22:17.965312926 +0200
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ POW_LIB = @POW_LIB@
+diff -Naur epiphany-browser-2.31.2.old/ltmain.sh epiphany-browser-2.31.2/ltmain.sh
+--- epiphany-browser-2.31.2.old/ltmain.sh 2010-04-27 13:58:02.000000000 +0200
++++ epiphany-browser-2.31.2/ltmain.sh 2010-05-25 21:53:10.568374536 +0200
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -15827,9 +16054,9 @@
esac
;;
no)
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/m4/gtk-doc.m4 epiphany-browser-2.30.2/m4/gtk-doc.m4
---- epiphany-browser-2.30.2.old/m4/gtk-doc.m4 2010-04-08 16:11:38.000000000 +0200
-+++ epiphany-browser-2.30.2/m4/gtk-doc.m4 2010-04-09 07:22:18.489312627 +0200
+diff -Naur epiphany-browser-2.31.2.old/m4/gtk-doc.m4 epiphany-browser-2.31.2/m4/gtk-doc.m4
+--- epiphany-browser-2.31.2.old/m4/gtk-doc.m4 2010-04-27 13:58:02.000000000 +0200
++++ epiphany-browser-2.31.2/m4/gtk-doc.m4 2010-05-25 21:53:11.244386634 +0200
@@ -8,6 +8,12 @@
[
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
@@ -15876,9 +16103,9 @@
AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
])
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/m4/intltool.m4 epiphany-browser-2.30.2/m4/intltool.m4
---- epiphany-browser-2.30.2.old/m4/intltool.m4 2010-04-08 16:11:38.000000000 +0200
-+++ epiphany-browser-2.30.2/m4/intltool.m4 2010-04-09 07:22:18.441313575 +0200
+diff -Naur epiphany-browser-2.31.2.old/m4/intltool.m4 epiphany-browser-2.31.2/m4/intltool.m4
+--- epiphany-browser-2.31.2.old/m4/intltool.m4 2010-04-27 13:58:02.000000000 +0200
++++ epiphany-browser-2.31.2/m4/intltool.m4 2010-05-25 21:53:11.196384861 +0200
@@ -172,7 +172,7 @@
AC_DEFUN([IT_PO_SUBDIR],
[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
@@ -15888,9 +16115,9 @@
dnl of config.status.
AC_CONFIG_COMMANDS_PRE([
AC_CONFIG_COMMANDS([$1/stamp-it], [
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/m4/libtool.m4 epiphany-browser-2.30.2/m4/libtool.m4
---- epiphany-browser-2.30.2.old/m4/libtool.m4 2010-04-08 16:11:37.000000000 +0200
-+++ epiphany-browser-2.30.2/m4/libtool.m4 2010-04-09 07:22:18.045313601 +0200
+diff -Naur epiphany-browser-2.31.2.old/m4/libtool.m4 epiphany-browser-2.31.2/m4/libtool.m4
+--- epiphany-browser-2.31.2.old/m4/libtool.m4 2010-04-27 13:58:02.000000000 +0200
++++ epiphany-browser-2.31.2/m4/libtool.m4 2010-05-25 21:53:10.624373756 +0200
@@ -2445,7 +2445,7 @@
;;
@@ -16047,9 +16274,9 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/Makefile.in epiphany-browser-2.30.2/Makefile.in
---- epiphany-browser-2.30.2.old/Makefile.in 2010-04-08 16:57:14.000000000 +0200
-+++ epiphany-browser-2.30.2/Makefile.in 2010-04-09 07:22:25.028311721 +0200
+diff -Naur epiphany-browser-2.31.2.old/Makefile.in epiphany-browser-2.31.2/Makefile.in
+--- epiphany-browser-2.31.2.old/Makefile.in 2010-05-24 14:03:24.000000000 +0200
++++ epiphany-browser-2.31.2/Makefile.in 2010-05-25 21:53:17.748372548 +0200
@@ -178,6 +178,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -16059,7 +16286,7 @@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
-@@ -231,6 +233,7 @@
+@@ -231,9 +233,12 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -16067,9 +16294,14 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/src/bookmarks/Makefile.in epiphany-browser-2.30.2/src/bookmarks/Makefile.in
---- epiphany-browser-2.30.2.old/src/bookmarks/Makefile.in 2010-04-08 16:57:14.000000000 +0200
-+++ epiphany-browser-2.30.2/src/bookmarks/Makefile.in 2010-04-09 07:22:24.852315810 +0200
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ POW_LIB = @POW_LIB@
+diff -Naur epiphany-browser-2.31.2.old/src/bookmarks/Makefile.in epiphany-browser-2.31.2/src/bookmarks/Makefile.in
+--- epiphany-browser-2.31.2.old/src/bookmarks/Makefile.in 2010-05-24 14:03:24.000000000 +0200
++++ epiphany-browser-2.31.2/src/bookmarks/Makefile.in 2010-05-25 21:53:17.600372106 +0200
@@ -208,6 +208,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -16079,7 +16311,7 @@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
-@@ -261,6 +263,7 @@
+@@ -261,9 +263,12 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -16087,10 +16319,15 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/src/Makefile.in epiphany-browser-2.30.2/src/Makefile.in
---- epiphany-browser-2.30.2.old/src/Makefile.in 2010-04-08 16:57:14.000000000 +0200
-+++ epiphany-browser-2.30.2/src/Makefile.in 2010-04-09 07:22:24.704310824 +0200
-@@ -329,6 +329,8 @@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ POW_LIB = @POW_LIB@
+diff -Naur epiphany-browser-2.31.2.old/src/Makefile.in epiphany-browser-2.31.2/src/Makefile.in
+--- epiphany-browser-2.31.2.old/src/Makefile.in 2010-05-24 14:03:23.000000000 +0200
++++ epiphany-browser-2.31.2/src/Makefile.in 2010-05-25 21:53:17.452372646 +0200
+@@ -333,6 +333,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -16099,7 +16336,7 @@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
-@@ -382,6 +384,7 @@
+@@ -386,9 +388,12 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -16107,7 +16344,12 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -509,8 +512,8 @@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ POW_LIB = @POW_LIB@
+@@ -516,8 +521,8 @@
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
@@ -16118,10 +16360,10 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
-diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/tests/Makefile.in epiphany-browser-2.30.2/tests/Makefile.in
---- epiphany-browser-2.30.2.old/tests/Makefile.in 2010-04-08 16:57:14.000000000 +0200
-+++ epiphany-browser-2.30.2/tests/Makefile.in 2010-04-09 07:22:24.936311194 +0200
-@@ -198,6 +198,8 @@
+diff -Naur epiphany-browser-2.31.2.old/tests/Makefile.in epiphany-browser-2.31.2/tests/Makefile.in
+--- epiphany-browser-2.31.2.old/tests/Makefile.in 2010-05-24 14:03:24.000000000 +0200
++++ epiphany-browser-2.31.2/tests/Makefile.in 2010-05-25 21:53:17.684371953 +0200
+@@ -210,6 +210,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -16130,7 +16372,7 @@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
-@@ -251,6 +253,7 @@
+@@ -263,9 +265,12 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -16138,3 +16380,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ POW_LIB = @POW_LIB@
Modified: desktop/experimental/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/rules?rev=24390&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/rules [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/rules [utf-8] Tue May 25 19:55:18 2010
@@ -3,6 +3,7 @@
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
DEB_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
GNOME_MODULE := epiphany
More information about the pkg-gnome-commits
mailing list