r22764 - in /desktop/unstable/epiphany-browser/debian: changelog control control.in patches/99_autoreconf.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Wed Jan 13 09:11:53 UTC 2010
Author: slomo
Date: Wed Jan 13 09:11:52 2010
New Revision: 22764
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22764
Log:
* New upstream release:
+ debian/patches/99_autoreconf.patch:
- Regenerated for the new version.
+ debian/control.in:
- Build depend on WebKit >= 1.1.18, GTK+ >= 2.18 and libsoup >= 2.29.5.
Modified:
desktop/unstable/epiphany-browser/debian/changelog
desktop/unstable/epiphany-browser/debian/control
desktop/unstable/epiphany-browser/debian/control.in
desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch
Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=22764&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Wed Jan 13 09:11:52 2010
@@ -1,4 +1,4 @@
-epiphany-browser (2.29.3-2) UNRELEASED; urgency=low
+epiphany-browser (2.29.5-1) unstable; urgency=low
[ Emilio Pozuelo Monfort ]
* debian/control.in:
@@ -8,7 +8,14 @@
* Remove obsolete /usr/bin/epiphany alternative in the preinst upon
upgrades. Closes: #562534.
- -- Emilio Pozuelo Monfort <pochu at debian.org> Sun, 06 Dec 2009 13:15:54 +0100
+ [ Sebastian Dröge ]
+ * New upstream release:
+ + debian/patches/99_autoreconf.patch:
+ - Regenerated for the new version.
+ + debian/control.in:
+ - Build depend on WebKit >= 1.1.18, GTK+ >= 2.18 and libsoup >= 2.29.5.
+
+ -- Sebastian Dröge <slomo at debian.org> Wed, 13 Jan 2010 10:05:34 +0100
epiphany-browser (2.29.3-1) unstable; urgency=low
Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=22764&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control [utf-8] Wed Jan 13 09:11:52 2010
@@ -11,7 +11,7 @@
Build-Depends: debhelper (>= 5),
pkg-config,
libglib2.0-dev (>= 2.18.0),
- libgtk2.0-dev (>= 2.16.0),
+ libgtk2.0-dev (>= 2.18.0),
libxml2-dev (>= 2.6.12),
libxslt1-dev (>= 1.1.7),
libglade2-dev (>= 2.3.1),
@@ -29,9 +29,10 @@
scrollkeeper,
gnome-pkg-tools (>= 0.10),
libxml-parser-perl,
- libwebkit-dev (>= 1.1.17),
- gobject-introspection (>= 0.6.3),
- libgirepository1.0-dev (>= 0.6.3),
+ libwebkit-dev (>= 1.1.18),
+ libsoup-gnome2.4-dev (>= 2.29.5),
+ gobject-introspection (>= 0.6.7),
+ libgirepository1.0-dev (>= 0.6.7),
gir-repository-dev,
gir1.0-glib-2.0,
gir1.0-gtk-2.0,
Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=22764&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control.in [utf-8] Wed Jan 13 09:11:52 2010
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 5),
pkg-config,
libglib2.0-dev (>= 2.18.0),
- libgtk2.0-dev (>= 2.16.0),
+ libgtk2.0-dev (>= 2.18.0),
libxml2-dev (>= 2.6.12),
libxslt1-dev (>= 1.1.7),
libglade2-dev (>= 2.3.1),
@@ -24,9 +24,10 @@
scrollkeeper,
gnome-pkg-tools (>= 0.10),
libxml-parser-perl,
- libwebkit-dev (>= 1.1.17),
- gobject-introspection (>= 0.6.3),
- libgirepository1.0-dev (>= 0.6.3),
+ libwebkit-dev (>= 1.1.18),
+ libsoup-gnome2.4-dev (>= 2.29.5),
+ gobject-introspection (>= 0.6.7),
+ libgirepository1.0-dev (>= 0.6.7),
gir-repository-dev,
gir1.0-glib-2.0,
gir1.0-gtk-2.0,
Modified: desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch?rev=22764&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch [utf-8] Wed Jan 13 09:11:52 2010
@@ -1,6 +1,12 @@
-diff -Naur epiphany-browser-2.29.3.old/aclocal.m4 epiphany-browser-2.29.3/aclocal.m4
---- epiphany-browser-2.29.3.old/aclocal.m4 2009-11-30 19:28:21.000000000 +0100
-+++ epiphany-browser-2.29.3/aclocal.m4 2009-12-03 15:54:33.639120045 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/aclocal.m4 epiphany-browser-2.29.5/aclocal.m4
+--- epiphany-browser-2.29.5.old/aclocal.m4 2010-01-11 21:37:17.000000000 +0100
++++ epiphany-browser-2.29.5/aclocal.m4 2010-01-13 10:10:34.366522295 +0100
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.11 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -12,39 +18,7 @@
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -55,10 +55,11 @@
- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-
- AC_ARG_ENABLE(schemas-install,
-- [ --disable-schemas-install Disable the schemas installation],
-+ AC_HELP_STRING([--disable-schemas-install],
-+ [Disable the schemas installation]),
- [case ${enableval} in
- yes|no) ;;
-- *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
-+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
- esac])
- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
- ])
-@@ -536,11 +537,14 @@
- [
- AC_REQUIRE([AM_MAINTAINER_MODE])
-
-+ DISABLE_DEPRECATED=""
- if test $USE_MAINTAINER_MODE = yes; then
-- DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED"
-- else
-- DISABLE_DEPRECATED=""
-+ DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
-+ for DOMAIN in $DOMAINS; do
-+ DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
-+ done
- fi
-+
- AC_SUBST(DISABLE_DEPRECATED)
- ])
-
-@@ -786,14 +790,16 @@
+@@ -790,14 +790,16 @@
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
@@ -69,7 +43,7 @@
fi[]dnl
])# _PKG_CONFIG
-@@ -837,9 +843,9 @@
+@@ -841,9 +843,9 @@
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
@@ -81,141 +55,27 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-diff -Naur epiphany-browser-2.29.3.old/config.guess epiphany-browser-2.29.3/config.guess
---- epiphany-browser-2.29.3.old/config.guess 2009-11-18 13:38:47.000000000 +0100
-+++ epiphany-browser-2.29.3/config.guess 2009-12-03 15:54:35.591096977 +0100
-@@ -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
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- # Free Software Foundation, Inc.
-
--timestamp='2009-04-27'
-+timestamp='2009-06-10'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -170,7 +170,7 @@
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-- | grep __ELF__ >/dev/null
-+ | grep -q __ELF__
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
-@@ -656,7 +656,7 @@
- # => hppa64-hp-hpux11.23
-
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-- grep __LP64__ >/dev/null
-+ grep -q __LP64__
- then
- HP_ARCH="hppa2.0w"
- else
-@@ -822,6 +822,9 @@
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
-+ 8664:Windows_NT:*)
-+ echo x86_64-pc-mks
-+ exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -882,40 +885,17 @@
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-- mips:Linux:*:*)
-+ mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
-- #undef mips
-- #undef mipsel
-+ #undef ${UNAME_MACHINE}
-+ #undef ${UNAME_MACHINE}el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mipsel
-+ CPU=${UNAME_MACHINE}el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips
-- #else
-- CPU=
-- #endif
-- #endif
--EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-- /^CPU/{
-- s: ::g
-- p
-- }'`"
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-- ;;
-- mips64:Linux:*:*)
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #undef CPU
-- #undef mips64
-- #undef mips64el
-- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mips64el
-- #else
-- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips64
-+ CPU=${UNAME_MACHINE}
- #else
- CPU=
- #endif
-@@ -947,7 +927,7 @@
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
-- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+ objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit ;;
-@@ -1001,14 +981,6 @@
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
-- a.out-i386-linux)
-- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-- exit ;;
-- "")
-- # Either a pre-BFD a.out linker (linux-gnuoldld) or
-- # one that does not give us useful --help.
-- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-- exit ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
-@@ -1074,7 +1046,7 @@
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit ;;
-- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- i*86:*DOS:*:*)
-@@ -1182,7 +1154,7 @@
- rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit ;;
-- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- SM[BE]S:UNIX_SV:*:*)
-diff -Naur epiphany-browser-2.29.3.old/config.h.in epiphany-browser-2.29.3/config.h.in
---- epiphany-browser-2.29.3.old/config.h.in 2009-11-30 19:28:58.000000000 +0100
-+++ epiphany-browser-2.29.3/config.h.in 2009-12-03 15:54:35.032120978 +0100
+@@ -893,7 +895,7 @@
+ [am__api_version='1.11'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.11.1], [],
++m4_if([$1], [1.11], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -909,7 +911,7 @@
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.11.1])dnl
++[AM_AUTOMAKE_VERSION([1.11])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/config.h.in epiphany-browser-2.29.5/config.h.in
+--- epiphany-browser-2.29.5.old/config.h.in 2010-01-11 21:37:38.000000000 +0100
++++ epiphany-browser-2.29.5/config.h.in 2010-01-13 10:10:36.094520767 +0100
@@ -169,6 +169,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -226,69 +86,14 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-diff -Naur epiphany-browser-2.29.3.old/config.sub epiphany-browser-2.29.3/config.sub
---- epiphany-browser-2.29.3.old/config.sub 2009-11-18 13:38:47.000000000 +0100
-+++ epiphany-browser-2.29.3/config.sub 2009-12-03 15:54:35.595096368 +0100
-@@ -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
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- # Free Software Foundation, Inc.
-
--timestamp='2009-04-17'
-+timestamp='2009-06-11'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -153,6 +153,9 @@
- os=
- basic_machine=$1
- ;;
-+ -bluegene*)
-+ os=-cnk
-+ ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
-@@ -467,6 +470,10 @@
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
-+ bluegene*)
-+ basic_machine=powerpc-ibm
-+ os=-cnk
-+ ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
-@@ -1260,7 +1267,7 @@
- # Each alternative MUST END IN A *, to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -kopensolaris* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-@@ -1613,7 +1620,7 @@
- -sunos*)
- vendor=sun
- ;;
-- -aix*)
-+ -cnk*|-aix*)
- vendor=ibm
- ;;
- -beos*)
-diff -Naur epiphany-browser-2.29.3.old/configure epiphany-browser-2.29.3/configure
---- epiphany-browser-2.29.3.old/configure 2009-11-30 19:28:32.000000000 +0100
-+++ epiphany-browser-2.29.3/configure 2009-12-03 15:54:34.663093550 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/configure epiphany-browser-2.29.5/configure
+--- epiphany-browser-2.29.5.old/configure 2010-01-11 21:37:23.000000000 +0100
++++ epiphany-browser-2.29.5/configure 2010-01-13 10:10:35.594519160 +0100
@@ -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.29.3.
-+# Generated by GNU Autoconf 2.65 for GNOME Web Browser 2.29.3.
+-# Generated by GNU Autoconf 2.63 for GNOME Web Browser 2.29.5.
++# Generated by GNU Autoconf 2.65 for GNOME Web Browser 2.29.5.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany>.
#
@@ -794,7 +599,7 @@
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
-+
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
@@ -834,7 +639,6 @@
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-(eval "as_func_return () {
- (exit \$1)
-}
@@ -850,6 +654,10 @@
-as_func_ret_failure () {
- return 1
-}
+
+-exitcode=0
+-if as_func_success; then
+- :
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
@@ -862,16 +670,20 @@
+ {
+ eval $1+=\$2
+ }'
-+else
+ else
+- exitcode=1
+- echo as_func_success failed.
+-fi
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
--exitcode=0
--if as_func_success; then
-- :
+-if as_func_failure; then
+- exitcode=1
+- echo as_func_failure succeeded.
+-fi
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
@@ -882,23 +694,16 @@
+ {
+ as_val=$(( $* ))
+ }'
- else
-- exitcode=1
-- echo as_func_success failed.
--fi
++else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
--if as_func_failure; then
-- exitcode=1
-- echo as_func_failure succeeded.
--fi
-
-if as_func_ret_success; then
- :
++
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
@@ -1095,36 +900,14 @@
PACKAGE_NAME='GNOME Web Browser'
-PACKAGE_TARNAME='epiphany'
+PACKAGE_TARNAME='epiphany-browser'
- PACKAGE_VERSION='2.29.3'
- PACKAGE_STRING='GNOME Web Browser 2.29.3'
+ PACKAGE_VERSION='2.29.5'
+ PACKAGE_STRING='GNOME Web Browser 2.29.5'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
+PACKAGE_URL=''
ac_unique_file="configure.ac"
# Factoring default headers for most tests.
-@@ -794,20 +752,12 @@
- SVN_BRANCH
- SVN_MODULE
- SVN_ROOT
--GTK_DOC_USE_REBASE_FALSE
--GTK_DOC_USE_REBASE_TRUE
- GTK_DOC_USE_LIBTOOL_FALSE
- GTK_DOC_USE_LIBTOOL_TRUE
--GTK_DOC_BUILD_PDF_FALSE
--GTK_DOC_BUILD_PDF_TRUE
--GTK_DOC_BUILD_HTML_FALSE
--GTK_DOC_BUILD_HTML_TRUE
- ENABLE_GTK_DOC_FALSE
- ENABLE_GTK_DOC_TRUE
--HTML_DIR
--GTKDOC_MKPDF
--GTKDOC_REBASE
- GTKDOC_CHECK
-+HTML_DIR
- HAVE_GNOME_DOC_UTILS_FALSE
- HAVE_GNOME_DOC_UTILS_TRUE
- DISTCHECK_CONFIGURE_FLAGS
-@@ -1019,6 +969,7 @@
+@@ -1009,6 +967,7 @@
program_transform_name
prefix
exec_prefix
@@ -1132,16 +915,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1058,8 +1009,6 @@
- enable_scrollkeeper
- with_html_dir
- enable_gtk_doc
--enable_gtk_doc_html
--enable_gtk_doc_pdf
- '
- ac_precious_vars='build_alias
- host_alias
-@@ -1193,8 +1142,7 @@
+@@ -1179,8 +1138,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 &&
@@ -1151,7 +925,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1220,8 +1168,7 @@
+@@ -1206,8 +1164,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 &&
@@ -1161,7 +935,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1425,8 +1372,7 @@
+@@ -1411,8 +1368,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 &&
@@ -1171,7 +945,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1442,8 +1388,7 @@
+@@ -1428,8 +1384,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 &&
@@ -1181,7 +955,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1473,17 +1418,17 @@
+@@ -1459,17 +1414,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -1205,7 +979,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1500,15 +1445,13 @@
+@@ -1486,15 +1441,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -1223,7 +997,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1531,8 +1474,7 @@
+@@ -1517,8 +1470,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -1233,7 +1007,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1562,11 +1504,9 @@
+@@ -1548,11 +1500,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -1247,7 +1021,7 @@
# Find the source files, if location was not specified.
-@@ -1605,13 +1545,11 @@
+@@ -1591,13 +1541,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -1263,7 +1037,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1685,7 +1623,8 @@
+@@ -1671,7 +1619,8 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
@@ -1273,28 +1047,16 @@
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
-@@ -1732,7 +1671,8 @@
- Turn on compiler warnings
- --enable-iso-c Try to warn if code is not ISO C
- --enable-tests Wheter to build tests (default: yes)
-- --disable-schemas-install Disable the schemas installation
-+ --disable-schemas-install
-+ Disable the schemas installation
- --enable-introspection Enable GObject introspection (default: disabled)
- --enable-seed Enable Seed support (default: disabled)
- --enable-nss Enable NSS support (default: enabled)
-@@ -1742,9 +1682,7 @@
+@@ -1730,7 +1679,7 @@
Whether to enable automatic network status with
NetworkManager (default: disabled)
--disable-scrollkeeper do not make updates to the scrollkeeper database
- --enable-gtk-doc use gtk-doc to build documentation [default=no]
-- --enable-gtk-doc-html build documentation in html format [default=yes]
-- --enable-gtk-doc-pdf build documentation in pdf format [default=no]
+ --enable-gtk-doc use gtk-doc to build documentation [[default=no]]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-@@ -1770,7 +1708,7 @@
+@@ -1756,7 +1705,7 @@
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>
@@ -1303,21 +1065,19 @@
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
-@@ -1863,21 +1801,432 @@
+@@ -1845,21 +1794,432 @@
if $ac_init_version; then
cat <<\_ACEOF
- GNOME Web Browser configure 2.29.3
+ GNOME Web Browser configure 2.29.5
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.65
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++
+Copyright (C) 2009 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
- exit
- fi
++This configure script is free software; the Free Software Foundation
++gives unlimited permission to copy, distribute and modify it.
++_ACEOF
++ exit
++fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
@@ -1676,7 +1436,11 @@
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
-+
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+-This configure script is free software; the Free Software Foundation
+-gives unlimited permission to copy, distribute and modify it.
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
@@ -1701,7 +1465,8 @@
+ ;
+ return 0;
+}
-+_ACEOF
+ _ACEOF
+- exit
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
@@ -1723,7 +1488,7 @@
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
@@ -1734,13 +1499,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.29.3, which was
+ It was created by GNOME Web Browser $as_me 2.29.5, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
-@@ -1913,8 +2262,8 @@
+@@ -1895,8 +2255,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1751,7 +1516,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1951,9 +2300,9 @@
+@@ -1933,9 +2293,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1763,7 +1528,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1969,13 +2318,13 @@
+@@ -1951,13 +2311,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -1780,7 +1545,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -2000,13 +2349,13 @@
+@@ -1982,13 +2342,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -1796,7 +1561,7 @@
esac ;;
esac
done
-@@ -2078,39 +2427,41 @@
+@@ -2060,39 +2420,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -1843,7 +1608,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2128,8 +2479,8 @@
+@@ -2110,8 +2472,8 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -1854,7 +1619,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2137,10 +2488,10 @@
+@@ -2119,10 +2481,10 @@
done
if test -r "$cache_file"; then
@@ -1869,7 +1634,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2148,14 +2499,14 @@
+@@ -2130,14 +2492,14 @@
esac
fi
else
@@ -1888,7 +1653,7 @@
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
-@@ -2166,11 +2517,11 @@
+@@ -2148,11 +2510,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -1902,7 +1667,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2180,17 +2531,17 @@
+@@ -2162,17 +2524,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
@@ -1924,7 +1689,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2202,43 +2553,20 @@
+@@ -2184,43 +2546,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -1975,7 +1740,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2292,24 +2620,16 @@
+@@ -2274,24 +2613,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2008,7 +1773,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2335,10 +2655,10 @@
+@@ -2317,10 +2648,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.
@@ -2021,7 +1786,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2346,11 +2666,11 @@
+@@ -2328,11 +2659,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2037,7 +1802,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2387,7 +2707,7 @@
+@@ -2369,7 +2700,7 @@
;;
esac
@@ -2046,7 +1811,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2403,7 +2723,7 @@
+@@ -2385,7 +2716,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -2055,7 +1820,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2414,7 +2734,7 @@
+@@ -2396,7 +2727,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -2064,7 +1829,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2425,15 +2745,11 @@
+@@ -2407,15 +2738,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -2082,7 +1847,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2455,11 +2771,8 @@
+@@ -2437,11 +2764,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".
@@ -2096,7 +1861,7 @@
fi
test "$2" = conftest.file
-@@ -2468,13 +2781,10 @@
+@@ -2450,13 +2774,10 @@
# Ok.
:
else
@@ -2113,7 +1878,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2502,7 +2812,7 @@
+@@ -2484,7 +2805,7 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -2122,7 +1887,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2523,9 +2833,9 @@
+@@ -2505,9 +2826,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
@@ -2134,7 +1899,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2536,24 +2846,24 @@
+@@ -2518,24 +2839,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2164,7 +1929,7 @@
$as_echo "no" >&6; }
fi
-@@ -2563,9 +2873,9 @@
+@@ -2545,9 +2866,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
@@ -2176,7 +1941,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2576,24 +2886,24 @@
+@@ -2558,24 +2879,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2206,7 +1971,7 @@
$as_echo "no" >&6; }
fi
-@@ -2602,7 +2912,7 @@
+@@ -2584,7 +2905,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2215,7 +1980,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2615,10 +2925,10 @@
+@@ -2597,10 +2918,10 @@
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -2228,7 +1993,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2626,7 +2936,7 @@
+@@ -2608,7 +2929,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2237,7 +2002,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 #(
-@@ -2638,11 +2948,12 @@
+@@ -2620,11 +2941,12 @@
esac
done
done
@@ -2251,7 +2016,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2650,11 +2961,10 @@
+@@ -2632,11 +2954,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.
@@ -2264,7 +2029,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2667,9 +2977,9 @@
+@@ -2649,9 +2970,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
@@ -2276,7 +2041,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2680,24 +2990,24 @@
+@@ -2662,24 +2983,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2306,7 +2071,7 @@
$as_echo "no" >&6; }
fi
-@@ -2705,11 +3015,11 @@
+@@ -2687,11 +3008,11 @@
test -n "$AWK" && break
done
@@ -2320,7 +2085,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2727,11 +3037,11 @@
+@@ -2709,11 +3030,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -2334,7 +2099,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2751,9 +3061,7 @@
+@@ -2733,9 +3054,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -2345,16 +2110,16 @@
fi
fi
-@@ -2768,7 +3076,7 @@
+@@ -2750,7 +3069,7 @@
# Define the identity of the package.
- PACKAGE='epiphany'
+ PACKAGE='epiphany-browser'
- VERSION='2.29.3'
-
-
-@@ -2804,7 +3112,7 @@
+ VERSION='2.29.5'
+
+
+@@ -2786,7 +3105,7 @@
AMTAR=${AMTAR-"${am_missing_run}tar"}
@@ -2363,7 +2128,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'
-@@ -2877,13 +3185,13 @@
+@@ -2859,13 +3178,13 @@
done
rm -rf conftest.dir
@@ -2379,7 +2144,7 @@
$as_echo "$am_cv_prog_tar_ustar" >&6; }
-@@ -2893,7 +3201,7 @@
+@@ -2875,7 +3194,7 @@
# Use AM_SILENT_RULES if present
# Check whether --enable-silent-rules was given.
@@ -2388,7 +2153,7 @@
enableval=$enable_silent_rules;
fi
-@@ -2909,16 +3217,16 @@
+@@ -2891,16 +3210,16 @@
enable_maintainer_mode=yes
fi
@@ -2408,7 +2173,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2933,7 +3241,7 @@
+@@ -2915,7 +3234,7 @@
# Check whether --enable-shared was given.
@@ -2417,7 +2182,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -2964,7 +3272,7 @@
+@@ -2946,7 +3265,7 @@
# Check whether --enable-static was given.
@@ -2426,7 +2191,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -3002,7 +3310,7 @@
+@@ -2984,7 +3303,7 @@
case `pwd` in
*\ * | *\ *)
@@ -2435,7 +2200,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -3027,35 +3335,27 @@
+@@ -3009,35 +3328,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -2478,7 +2243,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -3071,28 +3371,24 @@
+@@ -3053,28 +3364,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -2512,7 +2277,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -3120,7 +3416,7 @@
+@@ -3102,7 +3409,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -2521,7 +2286,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -3148,12 +3444,12 @@
+@@ -3130,12 +3437,12 @@
fi
@@ -2536,7 +2301,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -3178,9 +3474,9 @@
+@@ -3160,9 +3467,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
@@ -2548,7 +2313,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3191,24 +3487,24 @@
+@@ -3173,24 +3480,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2578,7 +2343,7 @@
$as_echo "no" >&6; }
fi
-@@ -3218,9 +3514,9 @@
+@@ -3200,9 +3507,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
@@ -2590,7 +2355,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3231,24 +3527,24 @@
+@@ -3213,24 +3520,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2620,7 +2385,7 @@
$as_echo "no" >&6; }
fi
-@@ -3257,7 +3553,7 @@
+@@ -3239,7 +3546,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2629,7 +2394,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3271,9 +3567,9 @@
+@@ -3253,9 +3560,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
@@ -2641,7 +2406,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3284,24 +3580,24 @@
+@@ -3266,24 +3573,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2671,7 +2436,7 @@
$as_echo "no" >&6; }
fi
-@@ -3311,9 +3607,9 @@
+@@ -3293,9 +3600,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
@@ -2683,7 +2448,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3325,18 +3621,18 @@
+@@ -3307,18 +3614,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2705,7 +2470,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3355,10 +3651,10 @@
+@@ -3337,10 +3644,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2718,7 +2483,7 @@
$as_echo "no" >&6; }
fi
-@@ -3370,9 +3666,9 @@
+@@ -3352,9 +3659,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
@@ -2730,7 +2495,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3383,24 +3679,24 @@
+@@ -3365,24 +3672,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2760,7 +2525,7 @@
$as_echo "no" >&6; }
fi
-@@ -3414,9 +3710,9 @@
+@@ -3396,9 +3703,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
@@ -2772,7 +2537,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3427,24 +3723,24 @@
+@@ -3409,24 +3716,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2802,7 +2567,7 @@
$as_echo "no" >&6; }
fi
-@@ -3457,7 +3753,7 @@
+@@ -3439,7 +3746,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2811,7 +2576,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3468,57 +3764,37 @@
+@@ -3450,57 +3757,37 @@
fi
@@ -2889,7 +2654,7 @@
/* end confdefs.h. */
int
-@@ -3534,8 +3810,8 @@
+@@ -3516,8 +3803,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.
@@ -2900,7 +2665,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3551,17 +3827,17 @@
+@@ -3533,17 +3820,17 @@
done
rm -f $ac_rmfiles
@@ -2923,7 +2688,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,
-@@ -3578,7 +3854,7 @@
+@@ -3560,7 +3847,7 @@
# certainly right.
break;;
*.* )
@@ -2932,7 +2697,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3597,84 +3873,42 @@
+@@ -3579,84 +3866,42 @@
else
ac_file=''
fi
@@ -3038,7 +2803,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
-@@ -3689,32 +3923,83 @@
+@@ -3671,32 +3916,83 @@
esac
done
else
@@ -3138,7 +2903,7 @@
/* end confdefs.h. */
int
-@@ -3726,17 +4011,17 @@
+@@ -3708,17 +4004,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -3161,7 +2926,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3749,31 +4034,23 @@
+@@ -3731,31 +4027,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3200,7 +2965,7 @@
/* end confdefs.h. */
int
-@@ -3787,37 +4064,16 @@
+@@ -3769,37 +4057,16 @@
return 0;
}
_ACEOF
@@ -3241,7 +3006,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3826,20 +4082,16 @@
+@@ -3808,20 +4075,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -3265,7 +3030,7 @@
/* end confdefs.h. */
int
-@@ -3850,35 +4102,11 @@
+@@ -3832,35 +4095,11 @@
return 0;
}
_ACEOF
@@ -3304,7 +3069,7 @@
/* end confdefs.h. */
int
-@@ -3889,36 +4117,12 @@
+@@ -3871,82 +4110,33 @@
return 0;
}
_ACEOF
@@ -3330,25 +3095,25 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_compile "$LINENO"; then :
-
+-
- ac_c_werror_flag=$ac_save_c_werror_flag
-+else
-+ ac_c_werror_flag=$ac_save_c_werror_flag
- CFLAGS="-g"
+- CFLAGS="-g"
- 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
-@@ -3929,42 +4133,17 @@
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
++if ac_fn_c_try_compile "$LINENO"; then :
+
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -3367,13 +3132,25 @@
- 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_prog_cc_g=yes
--else
+- ac_cv_prog_cc_g=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
--
++ ac_c_werror_flag=$ac_save_c_werror_flag
++ CFLAGS="-g"
++ 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_prog_cc_g=yes
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -3390,7 +3167,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3981,18 +4160,14 @@
+@@ -3963,18 +4153,14 @@
CFLAGS=
fi
fi
@@ -3412,7 +3189,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -4049,32 +4224,9 @@
+@@ -4031,32 +4217,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -3446,7 +3223,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -4085,17 +4237,19 @@
+@@ -4067,17 +4230,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -3469,7 +3246,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -4105,9 +4259,9 @@
+@@ -4087,9 +4252,9 @@
depcc="$CC" am_compiler_list=
@@ -3481,7 +3258,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4215,7 +4369,7 @@
+@@ -4197,7 +4362,7 @@
fi
fi
@@ -3490,7 +3267,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4230,9 +4384,9 @@
+@@ -4212,9 +4377,9 @@
fi
@@ -3502,7 +3279,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -4240,7 +4394,7 @@
+@@ -4222,7 +4387,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -3511,7 +3288,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -4249,7 +4403,7 @@
+@@ -4231,7 +4396,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3520,7 +3297,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
-@@ -4269,7 +4423,7 @@
+@@ -4251,7 +4416,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
@@ -3529,7 +3306,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"
-@@ -4284,19 +4438,17 @@
+@@ -4266,19 +4431,17 @@
$ac_path_SED_found && break 3
done
done
@@ -3552,7 +3329,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -4314,9 +4466,9 @@
+@@ -4296,9 +4459,9 @@
@@ -3564,7 +3341,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4327,7 +4479,7 @@
+@@ -4309,7 +4472,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3573,7 +3350,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
-@@ -4347,7 +4499,7 @@
+@@ -4329,7 +4492,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
@@ -3582,7 +3359,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"
-@@ -4362,26 +4514,24 @@
+@@ -4344,26 +4507,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -3614,7 +3391,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4395,7 +4545,7 @@
+@@ -4377,7 +4538,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3623,7 +3400,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
-@@ -4415,7 +4565,7 @@
+@@ -4397,7 +4558,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
@@ -3632,7 +3409,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"
-@@ -4430,12 +4580,10 @@
+@@ -4412,12 +4573,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -3647,7 +3424,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4443,14 +4591,14 @@
+@@ -4425,14 +4584,14 @@
fi
fi
@@ -3665,7 +3442,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -4464,7 +4612,7 @@
+@@ -4446,7 +4605,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3674,7 +3451,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
-@@ -4484,7 +4632,7 @@
+@@ -4466,7 +4625,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
@@ -3683,7 +3460,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"
-@@ -4499,12 +4647,10 @@
+@@ -4481,12 +4640,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -3698,7 +3475,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -4512,7 +4658,7 @@
+@@ -4494,7 +4651,7 @@
fi
fi
@@ -3707,7 +3484,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -4538,7 +4684,7 @@
+@@ -4520,7 +4677,7 @@
# Check whether --with-gnu-ld was given.
@@ -3716,7 +3493,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -4547,7 +4693,7 @@
+@@ -4529,7 +4686,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -3725,7 +3502,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -4577,13 +4723,13 @@
+@@ -4559,13 +4716,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -3742,7 +3519,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -4614,18 +4760,16 @@
+@@ -4596,18 +4753,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -3766,7 +3543,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -4638,7 +4782,7 @@
+@@ -4620,7 +4775,7 @@
;;
esac
fi
@@ -3775,7 +3552,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -4650,9 +4794,9 @@
+@@ -4632,9 +4787,9 @@
@@ -3787,7 +3564,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -4699,7 +4843,7 @@
+@@ -4681,7 +4836,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -3796,7 +3573,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -4710,9 +4854,9 @@
+@@ -4692,9 +4847,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
@@ -3808,7 +3585,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -4723,24 +4867,24 @@
+@@ -4705,24 +4860,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3838,7 +3615,7 @@
$as_echo "no" >&6; }
fi
-@@ -4754,9 +4898,9 @@
+@@ -4736,9 +4891,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
@@ -3850,7 +3627,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -4767,24 +4911,24 @@
+@@ -4749,24 +4904,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3880,7 +3657,7 @@
$as_echo "no" >&6; }
fi
-@@ -4797,7 +4941,7 @@
+@@ -4779,7 +4934,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3889,7 +3666,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4817,44 +4961,44 @@
+@@ -4799,44 +4954,44 @@
@@ -3902,16 +3679,16 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:4827: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:4971: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:4809: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:4964: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:4830: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:4974: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:4812: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:4967: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:4833: output\"" >&5)
-+ (eval echo "\"\$as_me:4977: output\"" >&5)
+- (eval echo "\"\$as_me:4815: output\"" >&5)
++ (eval echo "\"\$as_me:4970: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -3945,7 +3722,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -4972,10 +5116,10 @@
+@@ -4954,10 +5109,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -3958,7 +3735,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -4989,7 +5133,7 @@
+@@ -4971,7 +5126,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -3967,7 +3744,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -4999,17 +5143,17 @@
+@@ -4981,17 +5136,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -3988,7 +3765,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -5044,14 +5188,14 @@
+@@ -5026,14 +5181,14 @@
@@ -4006,7 +3783,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -5080,9 +5224,9 @@
+@@ -5062,9 +5217,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
@@ -4018,7 +3795,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -5093,24 +5237,24 @@
+@@ -5075,24 +5230,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4048,7 +3825,7 @@
$as_echo "no" >&6; }
fi
-@@ -5120,9 +5264,9 @@
+@@ -5102,9 +5257,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
@@ -4060,7 +3837,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -5133,24 +5277,24 @@
+@@ -5115,24 +5270,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4090,7 +3867,7 @@
$as_echo "no" >&6; }
fi
-@@ -5159,7 +5303,7 @@
+@@ -5141,7 +5296,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4099,7 +3876,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5179,9 +5323,9 @@
+@@ -5161,9 +5316,9 @@
@@ -4111,7 +3888,12 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -5300,7 +5444,7 @@
+@@ -5278,11 +5433,11 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4120,7 +3902,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
-@@ -5375,7 +5519,7 @@
+@@ -5357,7 +5512,7 @@
esac
fi
@@ -4129,7 +3911,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
-@@ -5395,9 +5539,9 @@
+@@ -5377,9 +5532,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
@@ -4141,7 +3923,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -5408,24 +5552,24 @@
+@@ -5390,24 +5545,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4171,7 +3953,7 @@
$as_echo "no" >&6; }
fi
-@@ -5435,9 +5579,9 @@
+@@ -5417,9 +5572,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
@@ -4183,7 +3965,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -5448,24 +5592,24 @@
+@@ -5430,24 +5585,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4213,7 +3995,7 @@
$as_echo "no" >&6; }
fi
-@@ -5474,7 +5618,7 @@
+@@ -5456,7 +5611,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4222,7 +4004,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5500,9 +5644,9 @@
+@@ -5482,9 +5637,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
@@ -4234,7 +4016,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -5513,24 +5657,24 @@
+@@ -5495,24 +5650,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4264,7 +4046,7 @@
$as_echo "no" >&6; }
fi
-@@ -5540,9 +5684,9 @@
+@@ -5522,9 +5677,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
@@ -4276,7 +4058,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -5553,24 +5697,24 @@
+@@ -5535,24 +5690,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4306,7 +4088,7 @@
$as_echo "no" >&6; }
fi
-@@ -5579,7 +5723,7 @@
+@@ -5561,7 +5716,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4315,7 +4097,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5599,9 +5743,9 @@
+@@ -5581,9 +5736,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
@@ -4327,7 +4109,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -5612,24 +5756,24 @@
+@@ -5594,24 +5749,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4357,7 +4139,7 @@
$as_echo "no" >&6; }
fi
-@@ -5639,9 +5783,9 @@
+@@ -5621,9 +5776,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
@@ -4369,7 +4151,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -5652,24 +5796,24 @@
+@@ -5634,24 +5789,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4399,7 +4181,7 @@
$as_echo "no" >&6; }
fi
-@@ -5678,7 +5822,7 @@
+@@ -5660,7 +5815,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4408,7 +4190,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5756,9 +5900,9 @@
+@@ -5738,9 +5893,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -4420,7 +4202,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -5874,18 +6018,18 @@
+@@ -5856,18 +6011,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -4445,7 +4227,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -5938,11 +6082,11 @@
+@@ -5920,11 +6075,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -4460,7 +4242,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -5976,10 +6120,10 @@
+@@ -5958,10 +6113,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
@@ -4473,7 +4255,7 @@
$as_echo "ok" >&6; }
fi
-@@ -6006,7 +6150,7 @@
+@@ -5988,7 +6143,7 @@
# Check whether --enable-libtool-lock was given.
@@ -4482,7 +4264,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -6018,11 +6162,11 @@
+@@ -6000,11 +6155,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4497,13 +4279,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -6036,12 +6180,12 @@
+@@ -6018,12 +6173,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6039 "configure"' > conftest.$ac_ext
+- echo '#line 6021 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 6183 "configure"' > conftest.$ac_ext
++ echo '#line 6176 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4514,7 +4296,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -6075,11 +6219,11 @@
+@@ -6057,11 +6212,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4529,7 +4311,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -6128,9 +6272,9 @@
+@@ -6110,9 +6265,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -4541,7 +4323,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -6139,11 +6283,7 @@
+@@ -6121,11 +6276,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4554,7 +4336,7 @@
/* end confdefs.h. */
int
-@@ -6154,38 +6294,13 @@
+@@ -6136,38 +6287,13 @@
return 0;
}
_ACEOF
@@ -4597,7 +4379,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -6193,7 +6308,7 @@
+@@ -6175,7 +6301,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -4606,7 +4388,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
-@@ -6203,11 +6318,11 @@
+@@ -6185,11 +6311,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4621,7 +4403,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -6233,9 +6348,9 @@
+@@ -6215,9 +6341,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
@@ -4633,7 +4415,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -6246,24 +6361,24 @@
+@@ -6228,24 +6354,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4663,7 +4445,7 @@
$as_echo "no" >&6; }
fi
-@@ -6273,9 +6388,9 @@
+@@ -6255,9 +6381,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
@@ -4675,7 +4457,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -6286,24 +6401,24 @@
+@@ -6268,24 +6394,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4705,7 +4487,7 @@
$as_echo "no" >&6; }
fi
-@@ -6312,7 +6427,7 @@
+@@ -6294,7 +6420,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4714,7 +4496,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6325,9 +6440,9 @@
+@@ -6307,9 +6433,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
@@ -4726,7 +4508,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -6338,24 +6453,24 @@
+@@ -6320,24 +6446,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4756,7 +4538,7 @@
$as_echo "no" >&6; }
fi
-@@ -6365,9 +6480,9 @@
+@@ -6347,9 +6473,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
@@ -4768,7 +4550,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -6378,24 +6493,24 @@
+@@ -6360,24 +6486,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4798,7 +4580,7 @@
$as_echo "no" >&6; }
fi
-@@ -6404,7 +6519,7 @@
+@@ -6386,7 +6512,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4807,7 +4589,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6417,9 +6532,9 @@
+@@ -6399,9 +6525,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
@@ -4819,7 +4601,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -6430,24 +6545,24 @@
+@@ -6412,24 +6538,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4849,7 +4631,7 @@
$as_echo "no" >&6; }
fi
-@@ -6457,9 +6572,9 @@
+@@ -6439,9 +6565,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
@@ -4861,7 +4643,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -6470,24 +6585,24 @@
+@@ -6452,24 +6578,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4891,7 +4673,7 @@
$as_echo "no" >&6; }
fi
-@@ -6496,7 +6611,7 @@
+@@ -6478,7 +6604,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4900,7 +4682,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6509,9 +6624,9 @@
+@@ -6491,9 +6617,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
@@ -4912,7 +4694,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -6522,24 +6637,24 @@
+@@ -6504,24 +6630,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4942,7 +4724,7 @@
$as_echo "no" >&6; }
fi
-@@ -6549,9 +6664,9 @@
+@@ -6531,9 +6657,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
@@ -4954,7 +4736,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -6562,24 +6677,24 @@
+@@ -6544,24 +6670,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4984,7 +4766,7 @@
$as_echo "no" >&6; }
fi
-@@ -6588,7 +6703,7 @@
+@@ -6570,7 +6696,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4993,7 +4775,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6601,9 +6716,9 @@
+@@ -6583,9 +6709,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
@@ -5005,7 +4787,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -6614,24 +6729,24 @@
+@@ -6596,24 +6722,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5035,7 +4817,7 @@
$as_echo "no" >&6; }
fi
-@@ -6641,9 +6756,9 @@
+@@ -6623,9 +6749,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
@@ -5047,7 +4829,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -6654,24 +6769,24 @@
+@@ -6636,24 +6762,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5077,7 +4859,7 @@
$as_echo "no" >&6; }
fi
-@@ -6680,7 +6795,7 @@
+@@ -6662,7 +6788,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5086,7 +4868,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6716,9 +6831,9 @@
+@@ -6698,9 +6824,9 @@
@@ -5098,7 +4880,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -6743,22 +6858,18 @@
+@@ -6725,22 +6851,18 @@
rm -f conftest.*
fi
fi
@@ -5125,7 +4907,7 @@
/* end confdefs.h. */
int
-@@ -6769,42 +6880,17 @@
+@@ -6751,42 +6873,17 @@
return 0;
}
_ACEOF
@@ -5173,7 +4955,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -6846,14 +6932,14 @@
+@@ -6828,14 +6925,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
@@ -5190,7 +4972,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -6868,11 +6954,7 @@
+@@ -6850,11 +6947,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.
@@ -5203,7 +4985,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -6881,78 +6963,34 @@
+@@ -6863,78 +6956,34 @@
#endif
Syntax error
_ACEOF
@@ -5287,7 +5069,7 @@
break
fi
-@@ -6964,7 +7002,7 @@
+@@ -6946,7 +6995,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -5296,7 +5078,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -6975,11 +7013,7 @@
+@@ -6957,11 +7006,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.
@@ -5309,7 +5091,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -6988,87 +7022,40 @@
+@@ -6970,87 +7015,40 @@
#endif
Syntax error
_ACEOF
@@ -5406,7 +5188,7 @@
fi
ac_ext=c
-@@ -7078,16 +7065,12 @@
+@@ -7060,16 +7058,12 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -5426,7 +5208,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -7102,48 +7085,23 @@
+@@ -7084,48 +7078,23 @@
return 0;
}
_ACEOF
@@ -5480,7 +5262,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -7153,18 +7111,14 @@
+@@ -7135,18 +7104,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -5502,7 +5284,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -7174,14 +7128,10 @@
+@@ -7156,14 +7121,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -5519,7 +5301,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -7208,181 +7158,34 @@
+@@ -7190,118 +7151,34 @@
return 0;
}
_ACEOF
@@ -5597,6 +5379,89 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
++if ac_fn_c_try_run "$LINENO"; then :
+
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-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_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- eval "$as_ac_Header=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ ac_cv_header_stdc=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+
+- eval "$as_ac_Header=no"
+ fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
++$as_echo "$ac_cv_header_stdc" >&6; }
++if test $ac_cv_header_stdc = yes; then
++
++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 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; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++
++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++ inttypes.h stdint.h unistd.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++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
+@@ -7311,62 +7188,13 @@
+ done
+
+
+-
+ for ac_header in dlfcn.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $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
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
@@ -5635,117 +5500,17 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- 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
--
--
--
--for ac_header in dlfcn.h
--do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--{ $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
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
-+if ac_fn_c_try_run "$LINENO"; then :
-
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--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_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- eval "$as_ac_Header=yes"
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+else
-+ ac_cv_header_stdc=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-
-- eval "$as_ac_Header=no"
- fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-+$as_echo "$ac_cv_header_stdc" >&6; }
-+if test $ac_cv_header_stdc = yes; then
-+
-+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 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; }
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+ inttypes.h stdint.h unistd.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+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
-@@ -7392,6 +7195,20 @@
- done
-
-
-+for ac_header in dlfcn.h
+do :
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_DLFCN_H 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-
- # Set options
-
-@@ -7405,7 +7222,7 @@
+ _ACEOF
+
+ fi
+@@ -7387,7 +7215,7 @@
# Check whether --with-pic was given.
@@ -5754,7 +5519,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -7421,7 +7238,7 @@
+@@ -7403,7 +7231,7 @@
# Check whether --enable-fast-install was given.
@@ -5763,7 +5528,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -7502,9 +7319,9 @@
+@@ -7484,9 +7312,9 @@
setopt NO_GLOB_SUBST
fi
@@ -5775,7 +5540,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -7517,7 +7334,7 @@
+@@ -7499,7 +7327,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -5784,7 +5549,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -7610,9 +7427,9 @@
+@@ -7592,9 +7420,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -5796,7 +5561,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -7663,10 +7480,10 @@
+@@ -7645,10 +7473,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -5809,7 +5574,7 @@
$as_echo "no" >&6; }
fi
-@@ -7676,9 +7493,9 @@
+@@ -7658,9 +7486,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -5821,7 +5586,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -7729,10 +7546,10 @@
+@@ -7711,10 +7539,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -5834,7 +5599,7 @@
$as_echo "no" >&6; }
fi
-@@ -7813,9 +7630,9 @@
+@@ -7795,9 +7623,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -5846,21 +5611,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -7831,11 +7648,11 @@
+@@ -7813,11 +7641,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:7834: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7651: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:7816: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7644: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:7838: \$? = $ac_status" >&5
-+ echo "$as_me:7655: \$? = $ac_status" >&5
+- echo "$as_me:7820: \$? = $ac_status" >&5
++ echo "$as_me:7648: \$? = $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.
-@@ -7848,7 +7665,7 @@
+@@ -7830,7 +7658,7 @@
$RM conftest*
fi
@@ -5869,7 +5634,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -7868,7 +7685,7 @@
+@@ -7850,7 +7678,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -5878,7 +5643,16 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -8140,7 +7957,7 @@
+@@ -7982,7 +7810,7 @@
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -8122,7 +7950,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -5887,7 +5661,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -8152,9 +7969,9 @@
+@@ -8134,9 +7962,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -5899,21 +5673,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -8170,11 +7987,11 @@
+@@ -8152,11 +7980,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:8173: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7990: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8155: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7983: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8177: \$? = $ac_status" >&5
-+ echo "$as_me:7994: \$? = $ac_status" >&5
+- echo "$as_me:8159: \$? = $ac_status" >&5
++ echo "$as_me:7987: \$? = $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.
-@@ -8187,7 +8004,7 @@
+@@ -8169,7 +7997,7 @@
$RM conftest*
fi
@@ -5922,7 +5696,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -8211,9 +8028,9 @@
+@@ -8193,9 +8021,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -5934,7 +5708,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -8239,7 +8056,7 @@
+@@ -8221,7 +8049,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -5943,7 +5717,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -8254,9 +8071,9 @@
+@@ -8236,9 +8064,9 @@
@@ -5955,21 +5729,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8275,11 +8092,11 @@
+@@ -8257,11 +8085,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:8278: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8095: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8260: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8088: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8282: \$? = $ac_status" >&5
-+ echo "$as_me:8099: \$? = $ac_status" >&5
+- echo "$as_me:8264: \$? = $ac_status" >&5
++ echo "$as_me:8092: \$? = $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
-@@ -8301,7 +8118,7 @@
+@@ -8283,7 +8111,7 @@
$RM conftest*
fi
@@ -5978,7 +5752,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -8309,9 +8126,9 @@
+@@ -8291,9 +8119,9 @@
@@ -5990,21 +5764,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8330,11 +8147,11 @@
+@@ -8312,11 +8140,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:8333: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8150: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8315: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8143: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8337: \$? = $ac_status" >&5
-+ echo "$as_me:8154: \$? = $ac_status" >&5
+- echo "$as_me:8319: \$? = $ac_status" >&5
++ echo "$as_me:8147: \$? = $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
-@@ -8356,7 +8173,7 @@
+@@ -8338,7 +8166,7 @@
$RM conftest*
fi
@@ -6013,7 +5787,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -8365,7 +8182,7 @@
+@@ -8347,7 +8175,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
@@ -6022,7 +5796,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -8373,10 +8190,10 @@
+@@ -8355,10 +8183,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
@@ -6035,7 +5809,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -8389,7 +8206,7 @@
+@@ -8371,7 +8199,7 @@
@@ -6044,7 +5818,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -8449,6 +8266,9 @@
+@@ -8431,6 +8259,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -6054,7 +5828,24 @@
esac
ld_shlibs=yes
-@@ -8631,7 +8451,7 @@
+@@ -8452,6 +8283,7 @@
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
++ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [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 ...
+@@ -8543,7 +8375,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'
+ ;;
+
+- gnu* | linux* | tpf* | k*bsd*-gnu)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -8613,7 +8445,7 @@
fi
;;
@@ -6063,7 +5854,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -8806,6 +8626,7 @@
+@@ -8788,6 +8620,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -6071,7 +5862,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -8831,11 +8652,7 @@
+@@ -8813,11 +8646,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -6084,7 +5875,7 @@
/* end confdefs.h. */
int
-@@ -8846,27 +8663,7 @@
+@@ -8828,27 +8657,7 @@
return 0;
}
_ACEOF
@@ -6113,7 +5904,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -8880,16 +8677,9 @@
+@@ -8862,16 +8671,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
@@ -6132,7 +5923,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -8902,11 +8692,7 @@
+@@ -8884,11 +8686,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -6145,7 +5936,7 @@
/* end confdefs.h. */
int
-@@ -8917,27 +8703,7 @@
+@@ -8899,27 +8697,7 @@
return 0;
}
_ACEOF
@@ -6174,7 +5965,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -8951,16 +8717,9 @@
+@@ -8933,16 +8711,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
@@ -6193,7 +5984,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -9172,42 +8931,16 @@
+@@ -9154,42 +8925,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -6241,7 +6032,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'
-@@ -9220,7 +8953,7 @@
+@@ -9202,7 +8947,7 @@
link_all_deplibs=yes
;;
@@ -6250,7 +6041,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9463,7 +9196,7 @@
+@@ -9445,7 +9190,7 @@
fi
fi
@@ -6259,7 +6050,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -9500,16 +9233,16 @@
+@@ -9482,16 +9227,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.
@@ -6280,7 +6071,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -9523,11 +9256,11 @@
+@@ -9505,11 +9250,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -6295,7 +6086,7 @@
then
archive_cmds_need_lc=no
else
-@@ -9538,7 +9271,7 @@
+@@ -9520,7 +9265,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -6304,7 +6095,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -9702,7 +9435,7 @@
+@@ -9684,7 +9429,7 @@
@@ -6313,7 +6104,16 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -10124,11 +9857,7 @@
+@@ -10092,7 +9837,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -10106,11 +9851,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -6326,7 +6126,7 @@
/* end confdefs.h. */
int
-@@ -10139,41 +9868,13 @@
+@@ -10121,41 +9862,13 @@
return 0;
}
_ACEOF
@@ -6372,7 +6172,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -10182,13 +9883,10 @@
+@@ -10164,13 +9877,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -6387,7 +6187,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10200,6 +9898,18 @@
+@@ -10182,6 +9892,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6406,7 +6206,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10388,7 +10098,7 @@
+@@ -10370,7 +10092,7 @@
dynamic_linker=no
;;
esac
@@ -6415,7 +6215,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -10490,7 +10200,7 @@
+@@ -10472,7 +10194,7 @@
@@ -6424,7 +6224,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -10515,7 +10225,7 @@
+@@ -10497,7 +10219,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -6433,7 +6233,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -10560,18 +10270,14 @@
+@@ -10542,184 +10264,14 @@
darwin*)
# if libdl is installed we need to link against it
@@ -6441,24 +6241,32 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl $LIBS"
-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. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -10589,43 +10295,18 @@
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen ();
+-int
+-main ()
+-{
+-return dlopen ();
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -6480,35 +6288,34 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dl_dlopen=yes
- else
+- ac_cv_lib_dl_dlopen=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
-+ ac_cv_lib_dl_dlopen=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
- $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
-
-@@ -10638,106 +10319,18 @@
- ;;
-
- *)
+- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
+-
+- lt_cv_dlopen="dyld"
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=yes
+-
+-fi
+-
+- ;;
+-
+- *)
- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-$as_echo_n "checking for shl_load... " >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
@@ -6595,29 +6402,38 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
-if test "x$ac_cv_func_shl_load" = x""yes; then
-+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-+if test "x$ac_cv_func_shl_load" = x""yes; then :
- lt_cv_dlopen="shl_load"
- else
+- lt_cv_dlopen="shl_load"
+-else
- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
- $as_echo_n "checking for shl_load in -ldld... " >&6; }
+-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld $LIBS"
+-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++LIBS="-ldl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10755,145 +10348,32 @@
+@@ -10728,81 +10280,52 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char shl_load ();
++char dlopen ();
+ int
+ main ()
+ {
+-return shl_load ();
++return dlopen ();
+ ;
return 0;
}
_ACEOF
@@ -6642,14 +6458,15 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+- ac_cv_lib_dld_shl_load=yes
+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dld_shl_load=yes
++ ac_cv_lib_dl_dlopen=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dld_shl_load=no
-+ ac_cv_lib_dld_shl_load=no
++ ac_cv_lib_dl_dlopen=no
fi
-
-rm -rf conftest.dSYM
@@ -6660,8 +6477,7 @@
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
- $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
@@ -6669,7 +6485,11 @@
-$as_echo_n "checking for dlopen... " >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
++$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -6679,26 +6499,46 @@
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++ lt_cv_dlopen="dyld"
++ lt_cv_dlopen_libs=
++ lt_cv_dlopen_self=yes
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++fi
++
++ ;;
+
-#undef dlopen
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
++ *)
++ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
++if test "x$ac_cv_func_shl_load" = x""yes; then :
++ lt_cv_dlopen="shl_load"
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
++$as_echo_n "checking for shl_load in -ldld... " >&6; }
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -10810,72 +10333,41 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -6707,14 +6547,16 @@
-choke me
-#endif
-
--int
--main ()
--{
++char shl_load ();
+ int
+ main ()
+ {
-return dlopen ();
-- ;
-- return 0;
--}
--_ACEOF
++return shl_load ();
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -6737,20 +6579,28 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_dlopen=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_dld_shl_load=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_dlopen=no
--fi
++ ac_cv_lib_dld_shl_load=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
++$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+else
@@ -6776,7 +6626,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10911,57 +10391,28 @@
+@@ -10893,57 +10385,28 @@
return 0;
}
_ACEOF
@@ -6843,7 +6693,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10979,57 +10430,28 @@
+@@ -10961,57 +10424,28 @@
return 0;
}
_ACEOF
@@ -6910,7 +6760,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11047,43 +10469,18 @@
+@@ -11029,43 +10463,18 @@
return 0;
}
_ACEOF
@@ -6960,7 +6810,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -11122,9 +10519,9 @@
+@@ -11104,9 +10513,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -6972,16 +6822,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11133,7 +10530,7 @@
+@@ -11115,7 +10524,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 11136 "configure"
-+#line 10533 "configure"
+-#line 11118 "configure"
++#line 10527 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11192,11 +10589,11 @@
+@@ -11174,11 +10583,11 @@
return status;
}
_LT_EOF
@@ -6996,7 +6846,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -11213,14 +10610,14 @@
+@@ -11195,14 +10604,14 @@
fi
@@ -7014,16 +6864,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11229,7 +10626,7 @@
+@@ -11211,7 +10620,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 11232 "configure"
-+#line 10629 "configure"
+-#line 11214 "configure"
++#line 10623 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11288,11 +10685,11 @@
+@@ -11270,11 +10679,11 @@
return status;
}
_LT_EOF
@@ -7038,7 +6888,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -11309,7 +10706,7 @@
+@@ -11291,7 +10700,7 @@
fi
@@ -7047,7 +6897,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -11348,12 +10745,12 @@
+@@ -11330,12 +10739,12 @@
striplib=
old_striplib=
@@ -7062,7 +6912,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -11362,15 +10759,15 @@
+@@ -11344,15 +10753,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -7081,7 +6931,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -11388,12 +10785,12 @@
+@@ -11370,12 +10779,12 @@
# Report which library types will actually be built
@@ -7097,7 +6947,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -11414,14 +10811,14 @@
+@@ -11396,14 +10805,14 @@
fi
;;
esac
@@ -7115,7 +6965,7 @@
$as_echo "$enable_static" >&6; }
-@@ -11457,17 +10854,13 @@
+@@ -11439,17 +10848,13 @@
@@ -7136,7 +6986,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11492,54 +10885,27 @@
+@@ -11474,54 +10879,27 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -7199,7 +7049,7 @@
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-@@ -11552,9 +10918,9 @@
+@@ -11534,9 +10912,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
@@ -7211,7 +7061,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11565,24 +10931,24 @@
+@@ -11547,24 +10925,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7241,7 +7091,7 @@
$as_echo "no" >&6; }
fi
-@@ -11592,9 +10958,9 @@
+@@ -11574,9 +10952,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
@@ -7253,7 +7103,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -11605,24 +10971,24 @@
+@@ -11587,24 +10965,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7283,7 +7133,7 @@
$as_echo "no" >&6; }
fi
-@@ -11631,7 +10997,7 @@
+@@ -11613,7 +10991,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7292,7 +7142,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -11645,9 +11011,9 @@
+@@ -11627,9 +11005,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
@@ -7304,7 +7154,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11658,24 +11024,24 @@
+@@ -11640,24 +11018,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7334,7 +7184,7 @@
$as_echo "no" >&6; }
fi
-@@ -11685,9 +11051,9 @@
+@@ -11667,9 +11045,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
@@ -7346,7 +7196,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11699,18 +11065,18 @@
+@@ -11681,18 +11059,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7368,7 +7218,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -11729,10 +11095,10 @@
+@@ -11711,10 +11089,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7381,7 +7231,7 @@
$as_echo "no" >&6; }
fi
-@@ -11744,9 +11110,9 @@
+@@ -11726,9 +11104,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
@@ -7393,7 +7243,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11757,24 +11123,24 @@
+@@ -11739,24 +11117,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7423,7 +7273,7 @@
$as_echo "no" >&6; }
fi
-@@ -11788,9 +11154,9 @@
+@@ -11770,9 +11148,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
@@ -7435,7 +7285,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -11801,24 +11167,24 @@
+@@ -11783,24 +11161,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7465,7 +7315,7 @@
$as_echo "no" >&6; }
fi
-@@ -11831,7 +11197,7 @@
+@@ -11813,7 +11191,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7474,7 +7324,660 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -11842,62 +11208,42 @@
+@@ -11824,62 +11202,42 @@
+ fi
+
+
+-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++as_fn_error "no acceptable C compiler found in \$PATH
++See \`config.log' for more details." "$LINENO" 5; }
+
+ # Provide some information about the compiler.
+-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+ 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
+-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=$?
+- $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
+-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=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-{ (ac_try="$ac_compiler -V >&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 -V >&5") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
++ if test -s conftest.err; then
++ sed '10a\
++... rest of stderr output deleted ...
++ 10q' conftest.err >conftest.er1
++ cat conftest.er1 >&5
++ fi
++ rm -f conftest.er1 conftest.err
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++done
+
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
++if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+ $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
+@@ -11893,37 +11251,16 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-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_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_compiler_gnu=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_compiler_gnu=no
++ ac_compiler_gnu=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+ $as_echo "$ac_cv_c_compiler_gnu" >&6; }
+ if test $ac_compiler_gnu = yes; then
+ GCC=yes
+@@ -11932,20 +11269,16 @@
+ fi
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then
++if test "${ac_cv_prog_cc_g+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+- 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
+@@ -11956,35 +11289,11 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-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_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- CFLAGS=""
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ CFLAGS=""
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -11995,36 +11304,12 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-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_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- :
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_compile "$LINENO"; then :
+
+- ac_c_werror_flag=$ac_save_c_werror_flag
++else
++ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+- 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
+@@ -12035,42 +11320,17 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-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_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+-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
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+ $as_echo "$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+@@ -12087,18 +11347,14 @@
+ CFLAGS=
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then
++if test "${ac_cv_prog_cc_c89+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+-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 <stdarg.h>
+ #include <stdio.h>
+@@ -12154,33 +11410,10 @@
+ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+ do
+- CC="$ac_save_CC $ac_arg"
+- rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-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_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_cv_prog_cc_c89=$ac_arg
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
++ CC="$ac_save_CC $ac_arg"
++ if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_prog_cc_c89=$ac_arg
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+@@ -12191,17 +11424,19 @@
+ # AC_CACHE_VAL
+ case "x$ac_cv_prog_cc_c89" in
+ x)
+- { $as_echo "$as_me:$LINENO: result: none needed" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+ $as_echo "none needed" >&6; } ;;
+ xno)
+- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+ $as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+ $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
++if test "x$ac_cv_prog_cc_c89" != xno; then :
+
++fi
+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -12211,9 +11446,9 @@
+
+ depcc="$CC" am_compiler_list=
+
+-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -12321,7 +11556,7 @@
+ fi
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+ $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+@@ -12344,9 +11579,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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -12357,24 +11592,24 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -12384,9 +11619,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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -12397,24 +11632,24 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -12423,7 +11658,7 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -12437,9 +11672,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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -12450,24 +11685,24 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -12477,9 +11712,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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -12491,18 +11726,18 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ if test $ac_prog_rejected = yes; then
+@@ -12521,10 +11756,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -12536,9 +11771,9 @@
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -12549,24 +11784,24 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -12580,9 +11815,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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -12593,24 +11828,24 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -12623,7 +11858,7 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -12634,62 +11869,42 @@
fi
@@ -7559,7 +8062,7 @@
/* end confdefs.h. */
int
-@@ -11911,37 +11257,16 @@
+@@ -12703,37 +11918,16 @@
return 0;
}
_ACEOF
@@ -7600,7 +8103,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -11950,20 +11275,16 @@
+@@ -12742,20 +11936,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -7624,7 +8127,7 @@
/* end confdefs.h. */
int
-@@ -11974,35 +11295,11 @@
+@@ -12766,35 +11956,11 @@
return 0;
}
_ACEOF
@@ -7663,7 +8166,7 @@
/* end confdefs.h. */
int
-@@ -12013,36 +11310,12 @@
+@@ -12805,36 +11971,12 @@
return 0;
}
_ACEOF
@@ -7704,7 +8207,7 @@
/* end confdefs.h. */
int
-@@ -12053,42 +11326,17 @@
+@@ -12845,42 +11987,17 @@
return 0;
}
_ACEOF
@@ -7749,7 +8252,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -12105,18 +11353,14 @@
+@@ -12897,18 +12014,14 @@
CFLAGS=
fi
fi
@@ -7771,7 +8274,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -12173,32 +11417,9 @@
+@@ -12965,32 +12078,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -7805,7 +8308,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -12209,17 +11430,19 @@
+@@ -13001,17 +12091,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -7828,7 +8331,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -12229,9 +11452,9 @@
+@@ -13021,9 +12113,9 @@
depcc="$CC" am_compiler_list=
@@ -7840,7 +8343,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -12339,7 +11562,7 @@
+@@ -13131,7 +12223,7 @@
fi
fi
@@ -7849,671 +8352,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -12362,9 +11585,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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -12375,24 +11598,24 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -12402,9 +11625,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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_CC"; then
-@@ -12415,24 +11638,24 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
- $as_echo "$ac_ct_CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -12441,7 +11664,7 @@
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -12455,9 +11678,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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -12468,24 +11691,24 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -12495,9 +11718,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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -12509,18 +11732,18 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- if test $ac_prog_rejected = yes; then
-@@ -12539,10 +11762,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -12554,9 +11777,9 @@
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -12567,24 +11790,24 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -12598,9 +11821,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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_CC"; then
-@@ -12611,24 +11834,24 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
- $as_echo "$ac_ct_CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -12641,7 +11864,7 @@
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -12652,62 +11875,42 @@
- fi
-
-
--test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
-
- # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
- set X $ac_compile
- ac_compiler=$2
--{ (ac_try="$ac_compiler --version >&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
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compiler --version >&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=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
--{ (ac_try="$ac_compiler -v >&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 -v >&5") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
--{ (ac_try="$ac_compiler -V >&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 -V >&5") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
-+ if test -s conftest.err; then
-+ sed '10a\
-+... rest of stderr output deleted ...
-+ 10q' conftest.err >conftest.er1
-+ cat conftest.er1 >&5
-+ fi
-+ rm -f conftest.er1 conftest.err
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }
-+done
-
--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
- $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
--if test "${ac_cv_c_compiler_gnu+set}" = set; then
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
- $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
-@@ -12721,37 +11924,16 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--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_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_compiler_gnu=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_compiler_gnu=no
-+ ac_compiler_gnu=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
- $as_echo "$ac_cv_c_compiler_gnu" >&6; }
- if test $ac_compiler_gnu = yes; then
- GCC=yes
-@@ -12760,20 +11942,16 @@
- fi
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
- $as_echo_n "checking whether $CC accepts -g... " >&6; }
--if test "${ac_cv_prog_cc_g+set}" = set; then
-+if test "${ac_cv_prog_cc_g+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
- ac_cv_prog_cc_g=no
- CFLAGS="-g"
-- 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
-@@ -12784,75 +11962,11 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--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_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- CFLAGS=""
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--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_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- :
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_c_werror_flag=$ac_save_c_werror_flag
-- CFLAGS="-g"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+else
-+ CFLAGS=""
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -12863,42 +11977,33 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--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_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_cv_prog_cc_g=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+ CFLAGS="-g"
-+ 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_prog_cc_g=yes
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
- $as_echo "$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
-@@ -12915,18 +12020,14 @@
- CFLAGS=
- fi
- fi
--{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
- $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
--if test "${ac_cv_prog_cc_c89+set}" = set; then
-+if test "${ac_cv_prog_cc_c89+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
--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 <stdarg.h>
- #include <stdio.h>
-@@ -12983,32 +12084,9 @@
- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
- CC="$ac_save_CC $ac_arg"
-- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--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_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_c89=$ac_arg
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
-@@ -13019,17 +12097,19 @@
- # AC_CACHE_VAL
- case "x$ac_cv_prog_cc_c89" in
- x)
-- { $as_echo "$as_me:$LINENO: result: none needed" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
- $as_echo "none needed" >&6; } ;;
- xno)
-- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
- $as_echo "unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
-- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
- $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
- esac
-+if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-+fi
-
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -13039,9 +12119,9 @@
-
- depcc="$CC" am_compiler_list=
-
--{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
- $as_echo_n "checking dependency style of $depcc... " >&6; }
--if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -13149,7 +12229,7 @@
- fi
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
- $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-@@ -13167,16 +12247,12 @@
+@@ -13149,16 +12241,12 @@
am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
@@ -8533,7 +8372,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -13191,48 +12267,23 @@
+@@ -13173,48 +12261,23 @@
return 0;
}
_ACEOF
@@ -8587,7 +8426,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -13242,18 +12293,14 @@
+@@ -13224,18 +12287,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -8609,7 +8448,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -13263,14 +12310,10 @@
+@@ -13245,14 +12304,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -8626,7 +8465,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -13297,60 +12340,31 @@
+@@ -13279,60 +12334,31 @@
return 0;
}
_ACEOF
@@ -8696,7 +8535,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -13363,14 +12377,14 @@
+@@ -13345,14 +12371,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8714,7 +8553,7 @@
IFS=$as_save_IFS
;;
-@@ -13378,19 +12392,19 @@
+@@ -13360,19 +12386,19 @@
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -8738,7 +8577,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_MKENUMS in
-@@ -13403,14 +12417,14 @@
+@@ -13385,14 +12411,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8756,7 +8595,7 @@
IFS=$as_save_IFS
;;
-@@ -13418,26 +12432,26 @@
+@@ -13400,26 +12426,26 @@
fi
GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
if test -n "$GLIB_MKENUMS"; then
@@ -8788,7 +8627,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -13445,35 +12459,31 @@
+@@ -13427,35 +12453,31 @@
case "$am__api_version" in
1.01234)
@@ -8830,7 +8669,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -13486,14 +12496,14 @@
+@@ -13468,14 +12490,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8848,7 +8687,7 @@
IFS=$as_save_IFS
;;
-@@ -13501,19 +12511,19 @@
+@@ -13483,19 +12505,19 @@
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -8872,7 +8711,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -13526,14 +12536,14 @@
+@@ -13508,14 +12530,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8890,7 +8729,7 @@
IFS=$as_save_IFS
;;
-@@ -13541,19 +12551,19 @@
+@@ -13523,19 +12545,19 @@
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -8914,7 +8753,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -13566,14 +12576,14 @@
+@@ -13548,14 +12570,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8932,7 +8771,7 @@
IFS=$as_save_IFS
;;
-@@ -13581,18 +12591,16 @@
+@@ -13563,18 +12585,16 @@
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -8954,86 +8793,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 $< $@'
-@@ -13635,12 +12643,88 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
+@@ -13696,9 +12716,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
@@ -9045,7 +8805,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -13653,14 +12737,14 @@
+@@ -13711,14 +12731,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9063,7 +8823,7 @@
IFS=$as_save_IFS
;;
-@@ -13668,19 +12752,19 @@
+@@ -13726,19 +12746,19 @@
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -9087,7 +8847,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -13693,14 +12777,14 @@
+@@ -13751,14 +12771,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9105,7 +8865,7 @@
IFS=$as_save_IFS
;;
-@@ -13708,19 +12792,19 @@
+@@ -13766,19 +12786,19 @@
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -9129,7 +8889,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -13733,14 +12817,14 @@
+@@ -13791,14 +12811,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9147,7 +8907,7 @@
IFS=$as_save_IFS
;;
-@@ -13748,19 +12832,19 @@
+@@ -13806,19 +12826,19 @@
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -9171,7 +8931,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -13773,14 +12857,14 @@
+@@ -13831,14 +12851,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9189,7 +8949,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -13789,33 +12873,29 @@
+@@ -13847,33 +12867,29 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -9229,7 +8989,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -13828,14 +12908,14 @@
+@@ -13886,14 +12902,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9247,7 +9007,7 @@
IFS=$as_save_IFS
;;
-@@ -13843,173 +12923,63 @@
+@@ -13901,41 +12917,35 @@
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -9262,25 +9022,25 @@
if test -z "$INTLTOOL_PERL"; then
-- { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
--$as_echo "$as_me: error: perl not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-- { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
--$as_echo "$as_me: error: perl 5.x required for intltool" >&2;}
+- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
+-$as_echo "$as_me: error: perl not found" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "perl not found" "$LINENO" 5
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
-+$as_echo_n "checking for perl >= 5.8.1... " >&6; }
-+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-+if test $? -ne 0; then
+ $as_echo_n "checking for perl >= 5.8.1... " >&6; }
+ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+ if test $? -ne 0; then
+- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
+-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
+ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
-+else
-+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+ else
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
-+$as_echo "$IT_PERL_VERSION" >&6; }
+ $as_echo "$IT_PERL_VERSION" >&6; }
fi
if test "x" != "xno-xml"; then
- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
@@ -9298,24 +9058,99 @@
fi
fi
--# Substitute ALL_LINGUAS so we can use it in po/Makefile
--
--
--# Set DATADIRNAME correctly if it is not set yet
--# (copied from glib-gettext.m4)
--if test -z "$DATADIRNAME"; then
+@@ -13945,11 +12955,7 @@
+ # Set DATADIRNAME correctly if it is not set yet
+ # (copied from glib-gettext.m4)
+ if test -z "$DATADIRNAME"; then
+- 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
+@@ -13961,120 +12967,13 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-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_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ DATADIRNAME=share
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- case $host in
++ case $host in
+ *-*-solaris*)
+- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
+-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char bind_textdomain_codeset (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef bind_textdomain_codeset
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char bind_textdomain_codeset ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+-choke me
+-#endif
-
-int
-main ()
-{
--extern int _nl_msg_cat_cntr;
-- return _nl_msg_cat_cntr
+-return bind_textdomain_codeset ();
- ;
- return 0;
-}
@@ -9341,99 +9176,8 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- DATADIRNAME=share
+- ac_cv_func_bind_textdomain_codeset=yes
-else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- case $host in
-- *-*-solaris*)
-- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
--$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
--if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char bind_textdomain_codeset (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef bind_textdomain_codeset
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char bind_textdomain_codeset ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
--choke me
--#endif
--
-+# Substitute ALL_LINGUAS so we can use it in po/Makefile
-+
-+
-+# Set DATADIRNAME correctly if it is not set yet
-+# (copied from glib-gettext.m4)
-+if test -z "$DATADIRNAME"; then
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
- int
- main ()
- {
--return bind_textdomain_codeset ();
-+extern int _nl_msg_cat_cntr;
-+ return _nl_msg_cat_cntr
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--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_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_bind_textdomain_codeset=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ DATADIRNAME=share
- else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -9447,14 +9191,12 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-+ case $host in
-+ *-*-solaris*)
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
DATADIRNAME=share
else
DATADIRNAME=lib
-@@ -14021,10 +12991,8 @@
+@@ -14086,10 +12985,8 @@
;;
esac
fi
@@ -9467,7 +9209,7 @@
fi
-@@ -14038,9 +13006,9 @@
+@@ -14103,9 +13000,9 @@
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
@@ -9479,7 +9221,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -14053,14 +13021,14 @@
+@@ -14118,14 +13015,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9497,7 +9239,7 @@
IFS=$as_save_IFS
;;
-@@ -14068,10 +13036,10 @@
+@@ -14133,10 +13030,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -9510,7 +9252,7 @@
$as_echo "no" >&6; }
fi
-@@ -14081,9 +13049,9 @@
+@@ -14146,9 +13043,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
@@ -9522,7 +9264,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -14096,14 +13064,14 @@
+@@ -14161,14 +13058,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9540,7 +9282,7 @@
IFS=$as_save_IFS
;;
-@@ -14111,10 +13079,10 @@
+@@ -14176,10 +13073,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -9553,7 +9295,7 @@
$as_echo "no" >&6; }
fi
-@@ -14123,7 +13091,7 @@
+@@ -14188,7 +13085,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9562,7 +9304,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -14136,13 +13104,13 @@
+@@ -14201,13 +13098,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -9579,7 +9321,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -14151,7 +13119,7 @@
+@@ -14216,7 +13113,7 @@
# Check whether --enable-debug was given.
@@ -9588,7 +9330,7 @@
enableval=$enable_debug;
else
enable_debug=no
-@@ -14160,16 +13128,14 @@
+@@ -14225,16 +13122,14 @@
if test x$enable_debug = xyes ; then
@@ -9607,7 +9349,7 @@
enableval=$enable_compile_warnings;
else
enable_compile_warnings="maximum"
-@@ -14200,13 +13166,9 @@
+@@ -14265,13 +13160,9 @@
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -9623,7 +9365,7 @@
/* end confdefs.h. */
int
-@@ -14217,35 +13179,14 @@
+@@ -14282,35 +13173,14 @@
return 0;
}
_ACEOF
@@ -9662,7 +9404,7 @@
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
-@@ -14259,26 +13200,24 @@
+@@ -14324,26 +13194,24 @@
fi
;;
*)
@@ -9694,7 +9436,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
-@@ -14293,7 +13232,7 @@
+@@ -14358,7 +13226,7 @@
esac
fi
fi
@@ -9703,26 +9445,7 @@
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -14302,22 +13241,23 @@
-
-
-
-+ DISABLE_DEPRECATED=""
- if test $USE_MAINTAINER_MODE = yes; then
-- DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED"
-- else
-- DISABLE_DEPRECATED=""
-+ DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
-+ for DOMAIN in $DOMAINS; do
-+ DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
-+ done
- fi
-
-
-
-+
- MORE_WARN_FLAGS=
- DEPRECATION_FLAGS=
+@@ -14383,9 +13251,7 @@
if test "$enable_maintainer_mode" = "yes"; then
@@ -9733,7 +9456,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"
-@@ -14335,11 +13275,11 @@
+@@ -14403,11 +13269,11 @@
GNOME_KEYRING_REQUIRED=2.26.0
if test -n "$PKG_CONFIG" && \
@@ -9748,7 +9471,7 @@
have_libnotify=yes
else
have_libnotify=no
-@@ -14349,24 +13289,22 @@
+@@ -14417,24 +13283,22 @@
if test "$have_libnotify" = "yes"; then
LIBNOTIFY_PACKAGE="libnotify >= $LIBNOTIFY_REQUIRED"
@@ -9777,7 +9500,7 @@
$as_echo "$enable_tests" >&6; }
if test "$enable_tests" = "yes"; then
-@@ -14380,14 +13318,15 @@
+@@ -14448,14 +13312,15 @@
pkg_failed=no
@@ -9799,7 +9522,7 @@
glib-2.0 >= \$GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14405,7 +13344,7 @@
+@@ -14473,7 +13338,7 @@
webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
@@ -9808,7 +9531,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14426,8 +13365,8 @@
+@@ -14494,8 +13359,8 @@
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
") 2>&5
ac_status=$?
@@ -9819,7 +9542,7 @@
pkg_cv_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14450,14 +13389,16 @@
+@@ -14518,14 +13383,16 @@
else
pkg_failed=yes
fi
@@ -9843,7 +9566,7 @@
glib-2.0 >= \$GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14475,7 +13416,7 @@
+@@ -14543,7 +13410,7 @@
webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
@@ -9852,7 +9575,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14496,8 +13437,8 @@
+@@ -14564,8 +13431,8 @@
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
") 2>&5
ac_status=$?
@@ -9863,7 +9586,7 @@
pkg_cv_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14520,8 +13461,9 @@
+@@ -14588,8 +13455,9 @@
else
pkg_failed=yes
fi
@@ -9875,7 +9598,7 @@
fi
-@@ -14534,7 +13476,7 @@
+@@ -14602,7 +13470,7 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9884,7 +9607,7 @@
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14552,9 +13494,9 @@
+@@ -14620,9 +13488,9 @@
webkit-1.0 >= $WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
@@ -9896,7 +9619,7 @@
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14572,41 +13514,12 @@
+@@ -14640,41 +13508,12 @@
webkit-1.0 >= $WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
@@ -9940,7 +9663,7 @@
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14634,22 +13547,11 @@
+@@ -14702,22 +13541,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.
@@ -9966,7 +9689,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14658,12 +13560,11 @@
+@@ -14726,12 +13554,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -9981,7 +9704,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14674,40 +13575,44 @@
+@@ -14742,40 +13569,44 @@
pkg_failed=no
@@ -10045,7 +9768,7 @@
fi
-@@ -14720,25 +13625,14 @@
+@@ -14788,25 +13619,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -10074,7 +9797,7 @@
$DBUS_PKG_ERRORS
-@@ -14748,22 +13642,11 @@
+@@ -14816,22 +13636,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.
@@ -10100,7 +9823,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14772,21 +13655,20 @@
+@@ -14840,21 +13649,20 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -10126,7 +9849,7 @@
$as_echo_n "(cached) " >&6
else
case $DBUS_BINDING_TOOL in
-@@ -14799,14 +13681,14 @@
+@@ -14867,14 +13675,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10144,7 +9867,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_DBUS_BINDING_TOOL" && ac_cv_path_DBUS_BINDING_TOOL="no"
-@@ -14815,19 +13697,17 @@
+@@ -14883,19 +13691,17 @@
fi
DBUS_BINDING_TOOL=$ac_cv_path_DBUS_BINDING_TOOL
if test -n "$DBUS_BINDING_TOOL"; then
@@ -10167,7 +9890,7 @@
fi
# *****
-@@ -14843,13 +13723,13 @@
+@@ -14911,13 +13717,13 @@
# Check whether --with-gconf-source was given.
@@ -10183,7 +9906,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -14858,22 +13738,20 @@
+@@ -14926,22 +13732,20 @@
# Check whether --with-gconf-schema-file-dir was given.
@@ -10210,7 +9933,7 @@
esac
fi
-@@ -14889,9 +13767,9 @@
+@@ -14957,9 +13761,9 @@
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -10222,63 +9945,67 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -14904,303 +13782,60 @@
+@@ -14972,14 +13776,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
-done
--done
--IFS=$as_save_IFS
--
-- test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-- ;;
--esac
--fi
--GCONFTOOL=$ac_cv_path_GCONFTOOL
--if test -n "$GCONFTOOL"; then
++ done
+ IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
+@@ -14988,134 +13792,29 @@
+ fi
+ GCONFTOOL=$ac_cv_path_GCONFTOOL
+ if test -n "$GCONFTOOL"; then
- { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
--$as_echo "$GCONFTOOL" >&6; }
--else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5
+ $as_echo "$GCONFTOOL" >&6; }
+ else
- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--
--if test "$GCONFTOOL" = "no"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+
+ if test "$GCONFTOOL" = "no"; then
- { { $as_echo "$as_me:$LINENO: error: gconftool-2 not found" >&5
-$as_echo "$as_me: error: gconftool-2 not found" >&2;}
- { (exit 1); exit 1; }; }
--fi
--
--# ******************
--# Portability checks
--# ******************
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--for ac_func in localtime_r memchr memmove memset mkdir mkdtemp realpath sqrt strchr strcspn strdup strerror strrchr strtol strtoul strstr
++ as_fn_error "gconftool-2 not found" "$LINENO" 5
+ fi
+
+ # ******************
+ # Portability checks
+ # ******************
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ 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
@@ -10371,18 +10098,21 @@
-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
--
--
--# for backtrace()
--
--
--for ac_header in execinfo.h fcntl.h
++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
+@@ -15125,150 +13824,12 @@
+
+
+ # 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
@@ -10413,17 +10143,7 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-+ ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-+
-+ test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-+ ;;
- esac
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -10437,24 +10157,17 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+fi
-+GCONFTOOL=$ac_cv_path_GCONFTOOL
-+if test -n "$GCONFTOOL"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5
-+$as_echo "$GCONFTOOL" >&6; }
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
+-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -10487,19 +10200,14 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_header_preproc=no
-+if test "$GCONFTOOL" = "no"; then
-+ as_fn_error "gconftool-2 not found" "$LINENO" 5
- fi
-
+-fi
+-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-+# ******************
-+# Portability checks
-+# ******************
-
+-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -10541,25 +10249,11 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+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
+-
+-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+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"
@@ -10568,7 +10262,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -15209,18 +13844,14 @@
+@@ -15277,18 +13838,14 @@
done
@@ -10590,7 +10284,7 @@
/* end confdefs.h. */
#ifndef __cplusplus
typedef int foo_t;
-@@ -15229,41 +13860,17 @@
+@@ -15297,41 +13854,17 @@
#endif
_ACEOF
@@ -10634,7 +10328,7 @@
case $ac_cv_c_inline in
inline | yes) ;;
*)
-@@ -15279,16 +13886,12 @@
+@@ -15347,16 +13880,12 @@
;;
esac
@@ -10654,7 +10348,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/time.h>
-@@ -15303,190 +13906,31 @@
+@@ -15371,190 +13900,31 @@
return 0;
}
_ACEOF
@@ -10856,7 +10550,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -15502,100 +13946,12 @@
+@@ -15570,100 +13940,12 @@
@@ -10963,7 +10657,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -15607,31 +13963,15 @@
+@@ -15675,31 +13957,15 @@
@@ -10999,91 +10693,9 @@
/* end confdefs.h. */
/* Test program from Paul Eggert and Tony Leneis. */
#ifdef TIME_WITH_SYS_TIME
-@@ -15824,48 +14164,21 @@
- break;
- if (! bigtime_test (INT_MAX))
- return 1;
-- }
-- return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
--}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--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_link") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (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_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ }
-+ return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_func_working_mktime=yes
- else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--ac_cv_func_working_mktime=no
-+ ac_cv_func_working_mktime=no
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
-
--
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_working_mktime" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_working_mktime" >&5
- $as_echo "$ac_cv_func_working_mktime" >&6; }
- if test $ac_cv_func_working_mktime = no; then
- case " $LIBOBJS " in
-@@ -15876,19 +14189,15 @@
-
- fi
-
--{ $as_echo "$as_me:$LINENO: checking for working strtod" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
- $as_echo_n "checking for working strtod... " >&6; }
--if test "${ac_cv_func_strtod+set}" = set; then
-+if test "${ac_cv_func_strtod+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- if test "$cross_compiling" = yes; then
-+ if test "$cross_compiling" = yes; then :
- ac_cv_func_strtod=no
- 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. */
-
- $ac_includes_default
-@@ -15921,44 +14230,17 @@
+@@ -15896,44 +14162,17 @@
+ return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
}
-
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -11108,15 +10720,15 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_func_strtod=yes
+ ac_cv_func_working_mktime=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
--ac_cv_func_strtod=no
-+ ac_cv_func_strtod=no
+-ac_cv_func_working_mktime=no
++ ac_cv_func_working_mktime=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
@@ -11126,15 +10738,90 @@
-
fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_working_mktime" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_working_mktime" >&5
+ $as_echo "$ac_cv_func_working_mktime" >&6; }
+ if test $ac_cv_func_working_mktime = no; then
+ case " $LIBOBJS " in
+@@ -15944,19 +14183,15 @@
+
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking for working strtod" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
+ $as_echo_n "checking for working strtod... " >&6; }
+-if test "${ac_cv_func_strtod+set}" = set; then
++if test "${ac_cv_func_strtod+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- if test "$cross_compiling" = yes; then
++ if test "$cross_compiling" = yes; then :
+ ac_cv_func_strtod=no
+ 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. */
+
+ $ac_includes_default
+@@ -15984,156 +14219,44 @@
+ strtod (string, &term);
+ if (term != string && *(term - 1) == 0)
+ return 1;
+- }
+- return 0;
+-}
+-
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-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_link") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (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_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_func_strtod=yes
+-else
+- $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-ac_cv_func_strtod=no
+-fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strtod" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5
- $as_echo "$ac_cv_func_strtod" >&6; }
- if test $ac_cv_func_strtod = no; then
- case " $LIBOBJS " in
-@@ -15967,105 +14249,20 @@
- ;;
- esac
-
+-$as_echo "$ac_cv_func_strtod" >&6; }
+-if test $ac_cv_func_strtod = no; then
+- case " $LIBOBJS " in
+- *" strtod.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS strtod.$ac_objext"
+- ;;
+-esac
+-
-{ $as_echo "$as_me:$LINENO: checking for pow" >&5
-$as_echo_n "checking for pow... " >&6; }
-if test "${ac_cv_func_pow+set}" = set; then
@@ -11207,12 +10894,33 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_pow=yes
--else
++ }
++ return 0;
++}
++
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ ac_cv_func_strtod=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ ac_cv_func_strtod=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+
- ac_cv_func_pow=no
--fi
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5
++$as_echo "$ac_cv_func_strtod" >&6; }
++if test $ac_cv_func_strtod = no; then
++ case " $LIBOBJS " in
++ *" strtod.$ac_objext "* ) ;;
++ *) LIBOBJS="$LIBOBJS strtod.$ac_objext"
++ ;;
++esac
++
+ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
+if test "x$ac_cv_func_pow" = x""yes; then :
@@ -11242,7 +10950,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16083,46 +14280,21 @@
+@@ -16151,46 +14274,21 @@
return 0;
}
_ACEOF
@@ -11296,7 +11004,7 @@
$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
fi
-@@ -16130,102 +14302,9 @@
+@@ -16198,102 +14296,9 @@
fi
@@ -11386,10 +11094,10 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+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
@@ -11401,7 +11109,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -16249,48 +14328,23 @@
+@@ -16317,48 +14322,23 @@
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $_FLAGS"
@@ -11456,7 +11164,7 @@
$as_echo "$ac_cv_have_declaration_after_statement" >&6; }
if test "$ac_cv_have_declaration_after_statement" = "yes"; then
-@@ -16309,151 +14363,12 @@
+@@ -16377,151 +14357,12 @@
# Multimedia keys
# ***************
@@ -11612,165 +11320,98 @@
_ACEOF
fi
-@@ -16467,16 +14382,16 @@
- # GObject Introspection
- # *********************
-
--{ $as_echo "$as_me:$LINENO: checking whether to enable GObject introspection support" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable GObject introspection support" >&5
- $as_echo_n "checking whether to enable GObject introspection support... " >&6; }
- # Check whether --enable-introspection was given.
+@@ -16539,62 +14380,59 @@
+
+
+ # Check whether --enable-introspection was given.
-if test "${enable_introspection+set}" = set; then
+if test "${enable_introspection+set}" = set; then :
enableval=$enable_introspection;
else
- enable_introspection=no
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $enable_introspection" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_introspection" >&5
- $as_echo "$enable_introspection" >&6; }
-
- G_IR_SCANNER=
-@@ -16491,40 +14406,44 @@
- GOBJECT_INTROSPECTION_REQUIRED=0.6.2
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for INTROSPECTION" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INTROSPECTION" >&5
- $as_echo_n "checking for INTROSPECTION... " >&6; }
-
--if test -n "$INTROSPECTION_CFLAGS"; then
-- pkg_cv_INTROSPECTION_CFLAGS="$INTROSPECTION_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$INTROSPECTION_CFLAGS"; then
-+ pkg_cv_INTROSPECTION_CFLAGS="$INTROSPECTION_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
+ enable_introspection=auto
+ fi
+
+
+- { $as_echo "$as_me:$LINENO: checking for gobject-introspection" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5
+ $as_echo_n "checking for gobject-introspection... " >&6; }
+
+- case $enable_introspection in
+- no) found_introspection="no (disabled, use --enable-introspection to enable)"
+- ;;
+- yes) if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\"") >&5
++ case $enable_introspection in #(
++ no) :
++ found_introspection="no (disabled, use --enable-introspection to enable)"
++ ;; #(
++ yes) :
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$INTROSPECTION_LIBS"; then
-- pkg_cv_INTROSPECTION_LIBS="$INTROSPECTION_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$INTROSPECTION_LIBS"; then
-+ pkg_cv_INTROSPECTION_LIBS="$INTROSPECTION_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
+ :
+ else
+- { { $as_echo "$as_me:$LINENO: error: gobject-introspection-1.0 is not installed" >&5
+-$as_echo "$as_me: error: gobject-introspection-1.0 is not installed" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "gobject-introspection-1.0 is not installed" "$LINENO" 5
+ fi
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\"") >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.7") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_INTROSPECTION_LIBS=`$PKG_CONFIG --libs "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -16537,26 +14456,15 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1`
-+ INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED"`
- else
-- INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1`
-+ INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$INTROSPECTION_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED) were not met:
--
--$INTROSPECTION_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables INTROSPECTION_CFLAGS
--and INTROSPECTION_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 (gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED) were not met:
--
-+ as_fn_error "Package requirements (gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED) were not met:
-+
- $INTROSPECTION_PKG_ERRORS
-
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
-@@ -16565,22 +14473,11 @@
- Alternatively, you may set the environment variables INTROSPECTION_CFLAGS
- and INTROSPECTION_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
--" >&2;}
+ found_introspection=yes
+ else
+- { { $as_echo "$as_me:$LINENO: error: You need to have gobject-introspection >= 0.6.7 installed to build GNOME Web Browser" >&5
+-$as_echo "$as_me: error: You need to have gobject-introspection >= 0.6.7 installed to build GNOME Web Browser" >&2;}
- { (exit 1); exit 1; }; }
-+" "$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}: 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 INTROSPECTION_CFLAGS
--and INTROSPECTION_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.
-
-@@ -16589,12 +14486,11 @@
- 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; }
- else
- INTROSPECTION_CFLAGS=$pkg_cv_INTROSPECTION_CFLAGS
- INTROSPECTION_LIBS=$pkg_cv_INTROSPECTION_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- :
- fi
-@@ -16606,9 +14502,7 @@
- GIRTYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-
++ as_fn_error "You need to have gobject-introspection >= 0.6.7 installed to build GNOME Web Browser" "$LINENO" 5
+ fi
+- ;;
+- auto) if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\"") >&5
++ ;; #(
++ auto) :
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.7") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ found_introspection=yes
+ else
+ found_introspection=no
+ fi
+- ;;
+- *) { { $as_echo "$as_me:$LINENO: error: invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" >&5
+-$as_echo "$as_me: error: invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" >&2;}
+- { (exit 1); exit 1; }; }
++ ;; #(
++ *) :
++ as_fn_error "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
+ ;;
+ esac
+-
+- { $as_echo "$as_me:$LINENO: result: $found_introspection" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
+ $as_echo "$found_introspection" >&6; }
+
+ INTROSPECTION_SCANNER=
+@@ -16635,9 +14473,7 @@
+ if test "$found_introspection" = "yes"; then
+ EPIPHANY_FEATURES="$EPIPHANY_FEATURES introspection"
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_INTROSPECTION 1
@@ -11779,7 +11420,7 @@
fi
-@@ -16631,22 +14525,20 @@
+@@ -16645,22 +14481,20 @@
# Seed
# ****
@@ -11798,7 +11439,7 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_seed" >&5
$as_echo "$enable_seed" >&6; }
- if test "$enable_seed" = "yes" -a "$enable_introspection" != "yes"; then
+ if test "$enable_seed" = "yes" -a "$found_introspection" != "yes"; then
- { { $as_echo "$as_me:$LINENO: error: GObject introspection support must be enabled for Seed" >&5
-$as_echo "$as_me: error: GObject introspection support must be enabled for Seed" >&2;}
- { (exit 1); exit 1; }; }
@@ -11806,7 +11447,7 @@
fi
if test "$enable_seed" = "yes"; then
-@@ -16655,40 +14547,44 @@
+@@ -16669,40 +14503,44 @@
SEED_REQUIRED=2.27.91
pkg_failed=no
@@ -11870,7 +11511,7 @@
fi
-@@ -16701,25 +14597,14 @@
+@@ -16715,25 +14553,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11899,7 +11540,7 @@
$SEED_PKG_ERRORS
-@@ -16729,22 +14614,11 @@
+@@ -16743,22 +14570,11 @@
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.
@@ -11925,7 +11566,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -16753,20 +14627,17 @@
+@@ -16767,20 +14583,17 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11949,7 +11590,7 @@
fi
-@@ -16785,56 +14656,60 @@
+@@ -16797,55 +14610,59 @@
# NSS
# ***
@@ -11969,7 +11610,6 @@
$as_echo "$enable_nss" >&6; }
if test "$enable_nss" = "yes"; then
- EPIPHANY_FEATURES="$EPIPHANY_FEATURES nss"
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for NSS" >&5
@@ -12032,7 +11672,7 @@
fi
-@@ -16847,14 +14722,14 @@
+@@ -16858,25 +14675,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12046,25 +11686,25 @@
echo "$NSS_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (nss) were not met:
+-
+-$NSS_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables NSS_CFLAGS
+-and NSS_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 (nss) were not met:
+ as_fn_error "Package requirements (nss) were not met:
$NSS_PKG_ERRORS
-@@ -16864,33 +14739,11 @@
+@@ -16886,22 +14692,11 @@
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.
--" >&5
--$as_echo "$as_me: error: Package requirements (nss) were not met:
--
--$NSS_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables NSS_CFLAGS
--and NSS_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
@@ -12087,7 +11727,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -16899,20 +14752,17 @@
+@@ -16910,20 +14705,17 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12111,7 +11751,7 @@
fi
-@@ -16932,16 +14782,16 @@
+@@ -16944,16 +14736,16 @@
# Zeroconf bookmarks sites
@@ -12131,7 +11771,7 @@
$as_echo "$enable_zeroconf" >&6; }
if test "$enable_zeroconf" != "no"; then
-@@ -16949,52 +14799,56 @@
+@@ -16961,52 +14753,56 @@
pkg_failed=no
@@ -12209,7 +11849,7 @@
fi
-@@ -17007,18 +14861,18 @@
+@@ -17019,18 +14815,18 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12233,7 +11873,7 @@
$as_echo "no" >&6; }
have_avahi=no
elif test $pkg_failed = untried; then
-@@ -17026,15 +14880,13 @@
+@@ -17038,15 +14834,13 @@
else
AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS
AVAHI_LIBS=$pkg_cv_AVAHI_LIBS
@@ -12251,7 +11891,7 @@
elif test "$have_avahi" = "yes"; then
enable_zeroconf=yes
else
-@@ -17044,9 +14896,7 @@
+@@ -17056,9 +14850,7 @@
if test "$enable_zeroconf" = "yes"; then
@@ -12262,7 +11902,7 @@
fi
-@@ -17061,55 +14911,59 @@
+@@ -17073,55 +14865,59 @@
# NetworkManager
@@ -12344,7 +11984,7 @@
fi
-@@ -17122,14 +14976,14 @@
+@@ -17134,14 +14930,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12362,7 +12002,7 @@
$as_echo "no" >&6; }
have_network_manager=no
elif test $pkg_failed = untried; then
-@@ -17137,26 +14991,22 @@
+@@ -17149,26 +14945,22 @@
else
NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS
NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS
@@ -12393,7 +12033,7 @@
fi
-@@ -17197,18 +15047,18 @@
+@@ -17209,18 +15001,18 @@
ISO_CODES_REQUIRED=0.35
if test -n "$PKG_CONFIG" && \
@@ -12416,7 +12056,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
-@@ -17217,7 +15067,7 @@
+@@ -17229,7 +15021,7 @@
result=no
have_iso_codes=no
fi
@@ -12425,7 +12065,7 @@
$as_echo "$result" >&6; }
fi
-@@ -17228,14 +15078,10 @@
+@@ -17240,14 +15032,10 @@
_ACEOF
@@ -12442,7 +12082,7 @@
fi
GETTEXT_PACKAGE=epiphany
-@@ -17246,151 +15092,12 @@
+@@ -17258,151 +15046,12 @@
_ACEOF
@@ -12599,7 +12239,7 @@
_ACEOF
fi
-@@ -17398,16 +15105,12 @@
+@@ -17410,16 +15059,12 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -12619,7 +12259,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -17418,207 +15121,45 @@
+@@ -17430,46 +15075,19 @@
return 0;
}
_ACEOF
@@ -12651,31 +12291,31 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- am_cv_val_LC_MESSAGES=no
--fi
++ am_cv_val_LC_MESSAGES=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
--$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
-- if test $am_cv_val_LC_MESSAGES = yes; then
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
+ $as_echo "$am_cv_val_LC_MESSAGES" >&6; }
+ if test $am_cv_val_LC_MESSAGES = yes; then
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LC_MESSAGES 1
-_ACEOF
--
-- fi
-- fi
-- USE_NLS=yes
--
--
-- gt_cv_have_gettext=no
--
-- CATOBJEXT=NONE
-- XGETTEXT=:
-- INTLLIBS=
--
++$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
+
+ fi
+ fi
+@@ -17482,155 +15100,20 @@
+ XGETTEXT=:
+ INTLLIBS=
+
- if test "${ac_cv_header_libintl_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
-$as_echo_n "checking for libintl.h... " >&6; }
@@ -12761,8 +12401,7 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-+ am_cv_val_LC_MESSAGES=no
- fi
+-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
@@ -12804,30 +12443,12 @@
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_libintl_h=$ac_header_preproc
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-$as_echo "$ac_cv_header_libintl_h" >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
-+$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
-+ if test $am_cv_val_LC_MESSAGES = yes; then
-
+-
-fi
-if test "x$ac_cv_header_libintl_h" = x""yes; then
-+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
-+
-+ fi
-+ fi
-+ USE_NLS=yes
-+
-+
-+ gt_cv_have_gettext=no
-+
-+ CATOBJEXT=NONE
-+ XGETTEXT=:
-+ INTLLIBS=
-+
+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
gt_cv_func_dgettext_libintl="no"
@@ -12852,7 +12473,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -17631,54 +15172,25 @@
+@@ -17643,54 +15126,25 @@
return 0;
}
_ACEOF
@@ -12915,7 +12536,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -17691,141 +15203,26 @@
+@@ -17703,141 +15157,26 @@
return 0;
}
_ACEOF
@@ -12942,27 +12563,23 @@
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
gt_cv_func_dgettext_libc=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_func_dgettext_libc=no
-+ gt_cv_func_dgettext_libc=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-
- fi
+-
+-fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
- $as_echo "$gt_cv_func_dgettext_libc" >&6; }
- fi
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+-$as_echo "$gt_cv_func_dgettext_libc" >&6; }
+- fi
+-
+- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-
-for ac_func in bind_textdomain_codeset
-do
@@ -13044,12 +12661,16 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
--fi
--
++else
++ gt_cv_func_dgettext_libc=no
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -13057,6 +12678,11 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
++$as_echo "$gt_cv_func_dgettext_libc" >&6; }
++ fi
++
++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+ for ac_func in bind_textdomain_codeset
+do :
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
@@ -13067,7 +12693,7 @@
_ACEOF
fi
-@@ -17840,18 +15237,14 @@
+@@ -17852,18 +15191,14 @@
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -13089,7 +12715,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17869,55 +15262,26 @@
+@@ -17881,55 +15216,26 @@
return 0;
}
_ACEOF
@@ -13154,7 +12780,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17935,55 +15299,26 @@
+@@ -17947,55 +15253,26 @@
return 0;
}
_ACEOF
@@ -13219,7 +12845,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18001,43 +15336,18 @@
+@@ -18013,43 +15290,18 @@
return 0;
}
_ACEOF
@@ -13269,7 +12895,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -18047,22 +15357,18 @@
+@@ -18059,22 +15311,18 @@
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -13297,7 +12923,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18080,55 +15386,26 @@
+@@ -18092,55 +15340,26 @@
return 0;
}
_ACEOF
@@ -13362,7 +12988,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18146,160 +15423,45 @@
+@@ -18158,43 +15377,18 @@
return 0;
}
_ACEOF
@@ -13405,189 +13031,19 @@
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
--$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
-- gt_cv_func_dgettext_libintl=yes
-- libintl_extra_libs=-liconv
--else
-- :
--fi
--
--else
-- :
--fi
--
-- fi
--
-- #
-- # If we found libintl, then check in it for bind_textdomain_codeset();
-- # we'll prefer libc if neither have bind_textdomain_codeset(),
-- # and both have dgettext and ngettext
-- #
-- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-- glib_save_LIBS="$LIBS"
-- LIBS="$LIBS -lintl $libintl_extra_libs"
-- unset ac_cv_func_bind_textdomain_codeset
++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
+ gt_cv_func_dgettext_libintl=yes
+ libintl_extra_libs=-liconv
+ else
+@@ -18216,102 +15410,12 @@
+ glib_save_LIBS="$LIBS"
+ LIBS="$LIBS -lintl $libintl_extra_libs"
+ unset ac_cv_func_bind_textdomain_codeset
-
-for ac_func in bind_textdomain_codeset
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* 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
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--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_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
-+$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
-+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
-+ gt_cv_func_dgettext_libintl=yes
-+ libintl_extra_libs=-liconv
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
-+ :
- fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+else
-+ :
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+
-+ fi
-+
-+ #
-+ # If we found libintl, then check in it for bind_textdomain_codeset();
-+ # we'll prefer libc if neither have bind_textdomain_codeset(),
-+ # and both have dgettext and ngettext
-+ #
-+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-+ glib_save_LIBS="$LIBS"
-+ LIBS="$LIBS -lintl $libintl_extra_libs"
-+ unset ac_cv_func_bind_textdomain_codeset
-+ for ac_func in bind_textdomain_codeset
-+do :
-+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
- _ACEOF
-
- fi
-@@ -18329,15 +15491,13 @@
-
- if test "$gt_cv_have_gettext" = "yes"; then
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETTEXT 1
--_ACEOF
-+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
-
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_MSGFMT+set}" = set; then
-+if test "${ac_cv_path_MSGFMT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case "$MSGFMT" in
-@@ -18362,118 +15522,28 @@
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
- if test "$MSGFMT" != "no"; then
-- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
- $as_echo "$MSGFMT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- if test "$MSGFMT" != "no"; then
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS $INTLLIBS"
--
--for ac_func in dcgettext
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -13680,158 +13136,57 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+ for ac_func in dcgettext
++ for ac_func in bind_textdomain_codeset
+do :
-+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
-+if test "x$ac_cv_func_dcgettext" = x""yes; then :
++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_DCGETTEXT 1
++#define HAVE_BIND_TEXTDOMAIN_CODESET 1
_ACEOF
fi
- done
-
- MSGFMT_OPTS=
-- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
- $as_echo_n "checking if msgfmt accepts -c... " >&6; }
- cat >conftest.foo <<_ACEOF
-
-@@ -18488,14 +15558,14 @@
- "Content-Transfer-Encoding: 8bit\n"
-
- _ACEOF
--if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
-+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
- ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
--else { $as_echo "$as_me:$LINENO: result: no" >&5
-+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- echo "$as_me: failed input was:" >&5
- sed 's/^/| /' conftest.foo >&5
-@@ -18503,9 +15573,9 @@
-
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
+@@ -18341,15 +15445,13 @@
+
+ if test "$gt_cv_have_gettext" = "yes"; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETTEXT 1
+-_ACEOF
++$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+
+ # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GMSGFMT+set}" = set; then
-+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+-if test "${ac_cv_path_MSGFMT+set}" = set; then
++if test "${ac_cv_path_MSGFMT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- case $GMSGFMT in
-@@ -18518,14 +15588,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -18534,19 +15604,19 @@
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
- if test -n "$GMSGFMT"; then
-- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
- $as_echo "$GMSGFMT" >&6; }
+ case "$MSGFMT" in
+@@ -18374,118 +15476,28 @@
+ fi
+ MSGFMT="$ac_cv_path_MSGFMT"
+ if test "$MSGFMT" != "no"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+ $as_echo "$MSGFMT" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-
-
- # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_XGETTEXT+set}" = set; then
-+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case "$XGETTEXT" in
-@@ -18571,18 +15641,14 @@
- fi
- XGETTEXT="$ac_cv_path_XGETTEXT"
- if test "$XGETTEXT" != ":"; then
-- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
- $as_echo "$XGETTEXT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-- 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
-@@ -18594,121 +15660,14 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--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_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- CATOBJEXT=.gmo
- DATADIRNAME=share
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- case $host in
-+ case $host in
- *-*-solaris*)
-- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
--$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
--if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+ if test "$MSGFMT" != "no"; then
+ glib_save_LIBS="$LIBS"
+ LIBS="$LIBS $INTLLIBS"
+-
+-for ac_func in dcgettext
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
@@ -13840,12 +13195,12 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char bind_textdomain_codeset (); below.
+- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
@@ -13855,7 +13210,7 @@
-# include <assert.h>
-#endif
-
--#undef bind_textdomain_codeset
+-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -13863,18 +13218,18 @@
-#ifdef __cplusplus
-extern "C"
-#endif
--char bind_textdomain_codeset ();
+-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
--return bind_textdomain_codeset ();
+-return $ac_func ();
- ;
- return 0;
-}
@@ -13900,8 +13255,256 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+- eval "$as_ac_var=yes"
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ for ac_func in dcgettext
++do :
++ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
++if test "x$ac_cv_func_dcgettext" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_DCGETTEXT 1
+ _ACEOF
+
+ fi
+ done
+
+ MSGFMT_OPTS=
+- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
+ $as_echo_n "checking if msgfmt accepts -c... " >&6; }
+ cat >conftest.foo <<_ACEOF
+
+@@ -18500,14 +15512,14 @@
+ "Content-Transfer-Encoding: 8bit\n"
+
+ _ACEOF
+-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
++if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
+ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-else { $as_echo "$as_me:$LINENO: result: no" >&5
++else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ echo "$as_me: failed input was:" >&5
+ sed 's/^/| /' conftest.foo >&5
+@@ -18515,9 +15527,9 @@
+
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GMSGFMT+set}" = set; then
++if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GMSGFMT in
+@@ -18530,14 +15542,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+@@ -18546,19 +15558,19 @@
+ fi
+ GMSGFMT=$ac_cv_path_GMSGFMT
+ if test -n "$GMSGFMT"; then
+- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+ $as_echo "$GMSGFMT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XGETTEXT+set}" = set; then
++if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case "$XGETTEXT" in
+@@ -18583,144 +15595,33 @@
+ fi
+ XGETTEXT="$ac_cv_path_XGETTEXT"
+ if test "$XGETTEXT" != ":"; then
+- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+ $as_echo "$XGETTEXT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-fi
+-
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-extern int _nl_msg_cat_cntr;
+- return _nl_msg_cat_cntr
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-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_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- CATOBJEXT=.gmo
+- DATADIRNAME=share
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- case $host in
+- *-*-solaris*)
+- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
+-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char bind_textdomain_codeset (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef bind_textdomain_codeset
++fi
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char bind_textdomain_codeset ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+-choke me
+-#endif
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
+ int
+ main ()
+ {
+-return bind_textdomain_codeset ();
++extern int _nl_msg_cat_cntr;
++ return _nl_msg_cat_cntr
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-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_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
- ac_cv_func_bind_textdomain_codeset=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ CATOBJEXT=.gmo
++ DATADIRNAME=share
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -13915,12 +13518,14 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
++ case $host in
++ *-*-solaris*)
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -18723,10 +15682,8 @@
+@@ -18735,10 +15636,8 @@
;;
esac
fi
@@ -13933,7 +13538,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -18740,9 +15697,7 @@
+@@ -18752,9 +15651,7 @@
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -13944,7 +13549,7 @@
fi
-@@ -18750,7 +15705,7 @@
+@@ -18762,7 +15659,7 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -13953,7 +13558,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -18783,7 +15738,7 @@
+@@ -18795,7 +15692,7 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -13962,7 +13567,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -18808,7 +15763,7 @@
+@@ -18820,7 +15717,7 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -13971,7 +13576,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -18856,7 +15811,7 @@
+@@ -18868,7 +15765,7 @@
# Check whether --with-distributor-name was given.
@@ -13980,7 +13585,7 @@
withval=$with_distributor_name; LSB_DISTRIBUTOR="$withval"
fi
-@@ -18866,9 +15821,9 @@
+@@ -18878,9 +15775,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
@@ -13992,7 +13597,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LSB_RELEASE"; then
-@@ -18879,24 +15834,24 @@
+@@ -18891,24 +15788,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14022,12 +13627,13 @@
$as_echo "no" >&6; }
fi
-@@ -18926,29 +15881,33 @@
+@@ -18938,35 +15835,33 @@
gdu_cv_version_required=0.3.2
+-{ $as_echo "$as_me:$LINENO: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
-+$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
+ $as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
@@ -14043,15 +13649,17 @@
fi
if test "$gdu_cv_have_gdu" = "yes"; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
+ $as_echo "yes" >&6; }
:
else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
- { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
-$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
- { (exit 1); exit 1; }; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
fi
@@ -14063,7 +13671,7 @@
withval=$with_help_dir;
else
with_help_dir='${datadir}/gnome/help'
-@@ -18959,7 +15918,7 @@
+@@ -18977,7 +15872,7 @@
# Check whether --with-omf-dir was given.
@@ -14072,7 +13680,7 @@
withval=$with_omf_dir;
else
with_omf_dir='${datadir}/omf'
-@@ -18970,7 +15929,7 @@
+@@ -18988,7 +15883,7 @@
# Check whether --with-help-formats was given.
@@ -14081,7 +13689,7 @@
withval=$with_help_formats;
else
with_help_formats=''
-@@ -18980,7 +15939,7 @@
+@@ -18998,7 +15893,7 @@
# Check whether --enable-scrollkeeper was given.
@@ -14090,154 +13698,16 @@
enableval=$enable_scrollkeeper;
else
enable_scrollkeeper=yes
-@@ -19003,143 +15962,15 @@
- HAVE_GNOME_DOC_UTILS_FALSE='#'
- else
- HAVE_GNOME_DOC_UTILS_TRUE='#'
-- HAVE_GNOME_DOC_UTILS_FALSE=
--fi
--
--
--
--
--
-- # Extract the first word of "gtkdoc-check", so it can be a program name with args.
--set dummy gtkdoc-check; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $GTKDOC_CHECK in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
--if test -n "$GTKDOC_CHECK"; then
-- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
--$as_echo "$GTKDOC_CHECK" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
-- for ac_prog in gtkdoc-rebase
--do
-- # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $GTKDOC_REBASE in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
--if test -n "$GTKDOC_REBASE"; then
-- { $as_echo "$as_me:$LINENO: result: $GTKDOC_REBASE" >&5
--$as_echo "$GTKDOC_REBASE" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
-- test -n "$GTKDOC_REBASE" && break
--done
--test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true"
--
-- # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
--set dummy gtkdoc-mkpdf; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $GTKDOC_MKPDF in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
--if test -n "$GTKDOC_MKPDF"; then
-- { $as_echo "$as_me:$LINENO: result: $GTKDOC_MKPDF" >&5
--$as_echo "$GTKDOC_MKPDF" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ HAVE_GNOME_DOC_UTILS_FALSE=
- fi
-
-
-
-
-+
+@@ -19029,7 +15924,7 @@
+
+
# Check whether --with-html-dir was given.
-if test "${with_html_dir+set}" = set; then
+if test "${with_html_dir+set}" = set; then :
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -19149,7 +15980,7 @@
+@@ -19039,7 +15934,7 @@
# Check whether --enable-gtk-doc was given.
@@ -14246,7 +13716,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -19158,42 +15989,66 @@
+@@ -19048,31 +15943,29 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -14260,8 +13730,8 @@
+ test $ac_status = 0; }; then
:
else
-- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" >&5
--$as_echo "$as_me: error: You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" >&2;}
+- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&5
+-$as_echo "$as_me: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "You need to have gtk-doc >= 1.0 installed to build gtk-doc" "$LINENO" 5
fi
@@ -14274,104 +13744,50 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
$as_echo "$enable_gtk_doc" >&6; }
-- # Check whether --enable-gtk-doc-html was given.
--if test "${enable_gtk_doc_html+set}" = set; then
-- enableval=$enable_gtk_doc_html;
-+ for ac_prog in gtkdoc-check
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
+ for ac_prog in gtkdoc-check
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
+if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
-- enable_gtk_doc_html=yes
--fi
-+ case $GTKDOC_CHECK in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
+ $as_echo_n "(cached) " >&6
+ else
+ case $GTKDOC_CHECK in
+@@ -19085,14 +15978,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
+ break 2
+ fi
+ done
+-done
+ done
-+IFS=$as_save_IFS
-
-- # Check whether --enable-gtk-doc-pdf was given.
--if test "${enable_gtk_doc_pdf+set}" = set; then
-- enableval=$enable_gtk_doc_pdf;
-+ ;;
-+esac
-+fi
-+GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
-+if test -n "$GTKDOC_CHECK"; then
+ IFS=$as_save_IFS
+
+ ;;
+@@ -19100,10 +15993,10 @@
+ fi
+ GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
+ if test -n "$GTKDOC_CHECK"; then
+- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
-+$as_echo "$GTKDOC_CHECK" >&6; }
- else
-- enable_gtk_doc_pdf=no
+ $as_echo "$GTKDOC_CHECK" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-
-
-- if test -n "$GTKDOC_MKPDF"; then
-- enable_gtk_doc_pdf=no
-- fi
-+ test -n "$GTKDOC_CHECK" && break
-+done
-
-
- if test x$enable_gtk_doc = xyes; then
-@@ -19204,22 +16059,6 @@
- ENABLE_GTK_DOC_FALSE=
- fi
-
-- if test x$enable_gtk_doc_html = xyes; then
-- GTK_DOC_BUILD_HTML_TRUE=
-- GTK_DOC_BUILD_HTML_FALSE='#'
--else
-- GTK_DOC_BUILD_HTML_TRUE='#'
-- GTK_DOC_BUILD_HTML_FALSE=
--fi
--
-- if test x$enable_gtk_doc_pdf = xyes; then
-- GTK_DOC_BUILD_PDF_TRUE=
-- GTK_DOC_BUILD_PDF_FALSE='#'
--else
-- GTK_DOC_BUILD_PDF_TRUE='#'
-- GTK_DOC_BUILD_PDF_FALSE=
--fi
--
- if test -n "$LIBTOOL"; then
- GTK_DOC_USE_LIBTOOL_TRUE=
- GTK_DOC_USE_LIBTOOL_FALSE='#'
-@@ -19228,14 +16067,6 @@
- GTK_DOC_USE_LIBTOOL_FALSE=
- fi
-
-- if test -n "$GTKDOC_REBASE"; then
-- GTK_DOC_USE_REBASE_TRUE=
-- GTK_DOC_USE_REBASE_FALSE='#'
--else
-- GTK_DOC_USE_REBASE_TRUE='#'
-- GTK_DOC_USE_REBASE_FALSE=
--fi
--
-
-
- # ****************************
-@@ -19254,9 +16085,7 @@
+ $as_echo "no" >&6; }
+ fi
+
+@@ -19135,9 +16028,7 @@
# ************
@@ -14382,7 +13798,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"
-@@ -19289,13 +16118,13 @@
+@@ -19170,13 +16061,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -14398,7 +13814,7 @@
esac ;;
esac
done
-@@ -19303,8 +16132,8 @@
+@@ -19184,8 +16075,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -14409,7 +13825,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -19327,11 +16156,11 @@
+@@ -19208,11 +16099,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" &&
@@ -14423,7 +13839,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -19351,8 +16180,8 @@
+@@ -19232,8 +16123,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.
@@ -14434,7 +13850,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -19368,157 +16197,86 @@
+@@ -19249,136 +16140,86 @@
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -14504,13 +13920,13 @@
+ as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
- if test -z "${ENABLE_INTROSPECTION_TRUE}" && test -z "${ENABLE_INTROSPECTION_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_INTROSPECTION\" was never defined.
+ if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_INTROSPECTION\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"ENABLE_INTROSPECTION\" was never defined.
+-$as_echo "$as_me: error: conditional \"HAVE_INTROSPECTION\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"ENABLE_INTROSPECTION\" was never defined.
++ as_fn_error "conditional \"HAVE_INTROSPECTION\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_SEED_TRUE}" && test -z "${ENABLE_SEED_FALSE}"; then
@@ -14582,20 +13998,6 @@
-$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
--fi
--if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -14603,13 +14005,6 @@
- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
@@ -14629,7 +14024,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -19528,17 +16286,18 @@
+@@ -19388,17 +16229,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -14655,7 +14050,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -19546,23 +16305,15 @@
+@@ -19406,23 +16248,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -14684,7 +14079,7 @@
as_nl='
'
export as_nl
-@@ -19570,7 +16321,13 @@
+@@ -19430,7 +16264,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
@@ -14699,7 +14094,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -19581,7 +16338,7 @@
+@@ -19441,7 +16281,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -14708,7 +14103,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -19604,13 +16361,6 @@
+@@ -19464,13 +16304,6 @@
}
fi
@@ -14722,7 +14117,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -19620,15 +16370,15 @@
+@@ -19480,15 +16313,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -14741,7 +14136,7 @@
IFS=$as_save_IFS
;;
-@@ -19640,12 +16390,16 @@
+@@ -19500,12 +16333,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -14762,7 +14157,7 @@
done
PS1='$ '
PS2='> '
-@@ -19657,7 +16411,89 @@
+@@ -19517,7 +16354,89 @@
LANGUAGE=C
export LANGUAGE
@@ -14853,7 +14248,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -19671,8 +16507,12 @@
+@@ -19531,8 +16450,12 @@
as_basename=false
fi
@@ -14867,7 +14262,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -19692,76 +16532,25 @@
+@@ -19552,76 +16475,25 @@
}
s/.*/./; q'`
@@ -14955,7 +14350,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -19790,8 +16579,56 @@
+@@ -19650,8 +16522,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -15013,7 +14408,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -19810,10 +16647,10 @@
+@@ -19670,10 +16590,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -15026,7 +14421,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -19828,13 +16665,19 @@
+@@ -19688,13 +16608,19 @@
exec 6>&1
@@ -15042,13 +14437,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.29.3, which was
+ This file was extended by GNOME Web Browser $as_me 2.29.5, 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
-@@ -19866,13 +16709,15 @@
+@@ -19726,13 +16652,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -15067,7 +14462,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -19891,16 +16736,17 @@
+@@ -19751,16 +16679,17 @@
Configuration commands:
$config_commands
@@ -15078,7 +14473,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.29.3
+ GNOME Web Browser config.status 2.29.5
-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,
@@ -15089,7 +14484,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -19936,6 +16782,8 @@
+@@ -19796,6 +16725,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -15098,7 +14493,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -19943,20 +16791,19 @@
+@@ -19803,20 +16734,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -15123,7 +14518,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -19964,11 +16811,10 @@
+@@ -19824,11 +16754,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -15138,7 +14533,7 @@
ac_need_defaults=false ;;
esac
-@@ -20303,9 +17149,7 @@
+@@ -20163,9 +17092,7 @@
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -15149,7 +14544,7 @@
esac
done
-@@ -20332,7 +17176,7 @@
+@@ -20192,7 +17119,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -15158,7 +14553,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -20343,11 +17187,7 @@
+@@ -20203,11 +17130,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -15171,7 +14566,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -20355,10 +17195,16 @@
+@@ -20215,10 +17138,16 @@
if test -n "$CONFIG_FILES"; then
@@ -15190,7 +14585,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -20372,24 +17218,18 @@
+@@ -20232,24 +17161,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -15218,7 +14613,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -20411,7 +17251,7 @@
+@@ -20271,7 +17194,7 @@
t delim
:nl
h
@@ -15227,7 +14622,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -20425,7 +17265,7 @@
+@@ -20285,7 +17208,7 @@
t nl
:delim
h
@@ -15236,7 +14631,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -20478,9 +17318,7 @@
+@@ -20338,9 +17261,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -15247,7 +14642,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -20521,9 +17359,7 @@
+@@ -20381,9 +17302,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -15258,7 +14653,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -20608,9 +17444,7 @@
+@@ -20468,9 +17387,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -15269,7 +14664,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -20623,9 +17457,7 @@
+@@ -20483,9 +17400,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -15280,7 +14675,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -20653,12 +17485,10 @@
+@@ -20513,12 +17428,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -15295,7 +14690,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -20669,7 +17499,7 @@
+@@ -20529,7 +17442,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -15304,7 +14699,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -20682,9 +17512,7 @@
+@@ -20542,9 +17455,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -15315,7 +14710,7 @@
esac
;;
esac
-@@ -20712,47 +17540,7 @@
+@@ -20572,47 +17483,7 @@
q
}
s/.*/./; q'`
@@ -15364,7 +14759,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -20809,7 +17597,6 @@
+@@ -20669,7 +17540,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=
@@ -15372,7 +14767,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -20819,12 +17606,11 @@
+@@ -20679,12 +17549,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -15387,7 +14782,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
-@@ -20834,7 +17620,7 @@
+@@ -20694,7 +17563,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -15396,7 +14791,7 @@
esac
_ACEOF
-@@ -20863,14 +17649,12 @@
+@@ -20723,14 +17592,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -15413,7 +14808,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;}
-@@ -20880,9 +17664,7 @@
+@@ -20740,9 +17607,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -15424,7 +14819,7 @@
;;
:H)
#
-@@ -20893,25 +17675,19 @@
+@@ -20753,25 +17618,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -15454,7 +14849,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -20949,7 +17725,7 @@
+@@ -20809,7 +17668,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -15463,7 +14858,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -21044,47 +17820,7 @@
+@@ -20904,47 +17763,7 @@
q
}
s/.*/./; q'`
@@ -15512,20 +14907,18 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -21730,10 +18466,8 @@
- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+@@ -21591,9 +18410,7 @@
esac ;;
"po/stamp-it":C)
-- if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then
+ if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
- { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
- { (exit 1); exit 1; }; }
-+ if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
+ as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -21756,15 +18490,12 @@
+@@ -21616,15 +18433,12 @@
done # for ac_tag
@@ -15543,7 +14936,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -21785,10 +18516,10 @@
+@@ -21645,10 +18459,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.
@@ -15556,49 +14949,16 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-diff -Naur epiphany-browser-2.29.3.old/data/art/Makefile.in epiphany-browser-2.29.3/data/art/Makefile.in
---- epiphany-browser-2.29.3.old/data/art/Makefile.in 2009-11-30 19:28:24.000000000 +0100
-+++ epiphany-browser-2.29.3/data/art/Makefile.in 2009-12-03 15:54:35.943093881 +0100
-@@ -142,8 +142,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -156,29 +154,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -213,6 +192,7 @@
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/data/art/Makefile.in epiphany-browser-2.29.5/data/art/Makefile.in
+--- epiphany-browser-2.29.5.old/data/art/Makefile.in 2010-01-11 21:37:19.000000000 +0100
++++ epiphany-browser-2.29.5/data/art/Makefile.in 2010-01-13 10:10:37.142518346 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -194,6 +194,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15606,49 +14966,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur epiphany-browser-2.29.3.old/data/glade/Makefile.in epiphany-browser-2.29.3/data/glade/Makefile.in
---- epiphany-browser-2.29.3.old/data/glade/Makefile.in 2009-11-30 19:28:24.000000000 +0100
-+++ epiphany-browser-2.29.3/data/glade/Makefile.in 2009-12-03 15:54:36.003094246 +0100
-@@ -142,8 +142,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -156,29 +154,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -213,6 +192,7 @@
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/data/glade/Makefile.in epiphany-browser-2.29.5/data/glade/Makefile.in
+--- epiphany-browser-2.29.5.old/data/glade/Makefile.in 2010-01-11 21:37:20.000000000 +0100
++++ epiphany-browser-2.29.5/data/glade/Makefile.in 2010-01-13 10:10:37.266519920 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -194,6 +194,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15656,49 +14983,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur epiphany-browser-2.29.3.old/data/icons/Makefile.in epiphany-browser-2.29.3/data/icons/Makefile.in
---- epiphany-browser-2.29.3.old/data/icons/Makefile.in 2009-11-30 19:28:25.000000000 +0100
-+++ epiphany-browser-2.29.3/data/icons/Makefile.in 2009-12-03 15:54:36.067095045 +0100
-@@ -120,8 +120,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -134,29 +132,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -191,6 +170,7 @@
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/data/icons/Makefile.in epiphany-browser-2.29.5/data/icons/Makefile.in
+--- epiphany-browser-2.29.5.old/data/icons/Makefile.in 2010-01-11 21:37:20.000000000 +0100
++++ epiphany-browser-2.29.5/data/icons/Makefile.in 2010-01-13 10:10:37.410520137 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -172,6 +172,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15706,49 +15000,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur epiphany-browser-2.29.3.old/data/Makefile.in epiphany-browser-2.29.3/data/Makefile.in
---- epiphany-browser-2.29.3.old/data/Makefile.in 2009-11-30 19:28:24.000000000 +0100
-+++ epiphany-browser-2.29.3/data/Makefile.in 2009-12-03 15:54:35.875094660 +0100
-@@ -192,8 +192,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -206,29 +204,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -263,6 +242,7 @@
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/data/Makefile.in epiphany-browser-2.29.5/data/Makefile.in
+--- epiphany-browser-2.29.5.old/data/Makefile.in 2010-01-11 21:37:19.000000000 +0100
++++ epiphany-browser-2.29.5/data/Makefile.in 2010-01-13 10:10:37.010520212 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -244,6 +244,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15756,49 +15017,34 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur epiphany-browser-2.29.3.old/data/ui/Makefile.in epiphany-browser-2.29.3/data/ui/Makefile.in
---- epiphany-browser-2.29.3.old/data/ui/Makefile.in 2009-11-30 19:28:25.000000000 +0100
-+++ epiphany-browser-2.29.3/data/ui/Makefile.in 2009-12-03 15:54:36.132100228 +0100
-@@ -142,8 +142,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -156,29 +154,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -213,6 +192,7 @@
+@@ -625,7 +626,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @fail= failcom='exit 1'; \
++ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -650,7 +651,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @fail= failcom='exit 1'; \
++ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/data/ui/Makefile.in epiphany-browser-2.29.5/data/ui/Makefile.in
+--- epiphany-browser-2.29.5.old/data/ui/Makefile.in 2010-01-11 21:37:20.000000000 +0100
++++ epiphany-browser-2.29.5/data/ui/Makefile.in 2010-01-13 10:10:37.562523264 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -194,6 +194,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15806,49 +15052,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur epiphany-browser-2.29.3.old/doc/Makefile.in epiphany-browser-2.29.3/doc/Makefile.in
---- epiphany-browser-2.29.3.old/doc/Makefile.in 2009-11-30 19:28:25.000000000 +0100
-+++ epiphany-browser-2.29.3/doc/Makefile.in 2009-12-03 15:54:36.196095649 +0100
-@@ -183,8 +183,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -197,29 +195,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -254,6 +233,7 @@
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/doc/Makefile.in epiphany-browser-2.29.5/doc/Makefile.in
+--- epiphany-browser-2.29.5.old/doc/Makefile.in 2010-01-11 21:37:20.000000000 +0100
++++ epiphany-browser-2.29.5/doc/Makefile.in 2010-01-13 10:10:37.706523474 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -235,6 +235,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15856,49 +15069,34 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur epiphany-browser-2.29.3.old/doc/reference/Makefile.in epiphany-browser-2.29.3/doc/reference/Makefile.in
---- epiphany-browser-2.29.3.old/doc/reference/Makefile.in 2009-11-30 19:28:25.000000000 +0100
-+++ epiphany-browser-2.29.3/doc/reference/Makefile.in 2009-12-03 15:54:36.264094098 +0100
-@@ -121,8 +121,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -135,29 +133,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -192,6 +171,7 @@
+@@ -400,7 +401,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @fail= failcom='exit 1'; \
++ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -425,7 +426,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @fail= failcom='exit 1'; \
++ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/doc/reference/Makefile.in epiphany-browser-2.29.5/doc/reference/Makefile.in
+--- epiphany-browser-2.29.5.old/doc/reference/Makefile.in 2010-01-11 21:37:20.000000000 +0100
++++ epiphany-browser-2.29.5/doc/reference/Makefile.in 2010-01-13 10:10:37.874520309 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -176,6 +176,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15906,49 +15104,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur epiphany-browser-2.29.3.old/embed/Makefile.in epiphany-browser-2.29.3/embed/Makefile.in
---- epiphany-browser-2.29.3.old/embed/Makefile.in 2009-11-30 19:28:27.000000000 +0100
-+++ epiphany-browser-2.29.3/embed/Makefile.in 2009-12-03 15:54:36.483094499 +0100
-@@ -197,8 +197,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -211,29 +209,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -268,6 +247,7 @@
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/embed/Makefile.in epiphany-browser-2.29.5/embed/Makefile.in
+--- epiphany-browser-2.29.5.old/embed/Makefile.in 2010-01-11 21:37:20.000000000 +0100
++++ epiphany-browser-2.29.5/embed/Makefile.in 2010-01-13 10:10:38.106520476 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -249,6 +249,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15956,374 +15121,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur epiphany-browser-2.29.3.old/gnome-doc-utils.make epiphany-browser-2.29.3/gnome-doc-utils.make
---- epiphany-browser-2.29.3.old/gnome-doc-utils.make 2009-11-18 13:38:39.000000000 +0100
-+++ epiphany-browser-2.29.3/gnome-doc-utils.make 2009-12-03 15:54:29.495161116 +0100
-@@ -92,6 +92,14 @@
- ## The name of the document being built
- DOC_MODULE ?=
-
-+## @ DOC_ID
-+## The unique identifier for a Mallard document
-+DOC_ID ?=
-+
-+## @ DOC_PAGES
-+## Page files in a Mallard document
-+DOC_PAGES ?=
-+
- ## @ DOC_ENTITIES
- ## Files included with a SYSTEM entity
- DOC_ENTITIES ?=
-@@ -123,9 +131,11 @@
- ## Variables for Bootstrapping
-
- _xml2po ?= `which xml2po`
-+_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
-
- _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
- _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
-+_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
- _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
- _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
- _ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
-@@ -205,6 +215,10 @@
- ## The top-level documentation file in the C locale
- _DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
-
-+## @ _DOC_C_PAGES
-+## Page files in a Mallard document in the C locale
-+_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
-+
- ## @ _DOC_C_ENTITIES
- ## Files included with a SYSTEM entity in the C locale
- _DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
-@@ -217,13 +231,14 @@
- ## All documentation files in the C locale
- _DOC_C_DOCS = \
- $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \
-- $(_DOC_C_MODULE)
-+ $(_DOC_C_PAGES) $(_DOC_C_MODULE)
-
- ## @ _DOC_C_DOCS_NOENT
- ## All documentation files in the C locale,
- ## except files included with a SYSTEM entity
- _DOC_C_DOCS_NOENT = \
-- $(_DOC_C_MODULE) $(_DOC_C_INCLUDES)
-+ $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \
-+ $(_DOC_C_PAGES)
-
- ## @ _DOC_C_FIGURES
- ## All figures and other external data in the C locale
-@@ -245,7 +260,7 @@
-
- ## @ _DOC_POFILES
- ## The .po files used for translating the document
--_DOC_POFILES = $(if $(DOC_MODULE), \
-+_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \
- $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
-
- .PHONY: po
-@@ -256,6 +271,12 @@
- _DOC_LC_MODULES = $(if $(DOC_MODULE), \
- $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
-
-+## @ _DOC_LC_PAGES
-+## Page files in a Mallard document in all other locales
-+_DOC_LC_PAGES = \
-+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES), \
-+ $(lc)/$(notdir $(page)) ))
-+
- ## @ _DOC_LC_XINCLUDES
- ## Files included with XInclude in all other locales
- _DOC_LC_INCLUDES = \
-@@ -272,7 +293,7 @@
- ## @ _DOC_LC_DOCS
- ## All documentation files in all other locales
- _DOC_LC_DOCS = \
-- $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) \
-+ $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) $(_DOC_LC_PAGES) \
- $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
-
- ## @ _DOC_LC_FIGURES
-@@ -299,16 +320,16 @@
- done; \
- if ! test -f $@; then \
- echo "(cd $(dir $@) && \
-- $(_xml2po) -e $$docs > $(notdir $@).tmp && \
-+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
- cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \
- (cd $(dir $@) && \
-- $(_xml2po) -e $$docs > $(notdir $@).tmp && \
-+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
- cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \
- else \
- echo "(cd $(dir $@) && \
-- $(_xml2po) -e -u $(notdir $@) $$docs)"; \
-+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \
- (cd $(dir $@) && \
-- $(_xml2po) -e -u $(notdir $@) $$docs); \
-+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
- fi
-
- # FIXME: fix the dependancy
-@@ -317,9 +338,10 @@
- $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
- if ! test -d $(dir $@); then mkdir $(dir $@); fi
- if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
-+ po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \
-+ if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \
- (cd $(dir $@) && \
-- $(_xml2po) -e -p \
-- "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
-+ $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \
- "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
- cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
-
-@@ -329,7 +351,7 @@
- .PHONY: pot
- pot: $(_DOC_POT)
- $(_DOC_POT): $(_DOC_C_DOCS_NOENT)
-- $(_xml2po) -e -o $@ $^
-+ $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
-
-
- ################################################################################
-@@ -347,6 +369,7 @@
-
-
- ################################################################################
-+## All
-
- all: \
- $(_DOC_C_DOCS) $(_DOC_LC_DOCS) \
-@@ -354,6 +377,9 @@
- $(_DOC_HTML_ALL) $(_DOC_POFILES)
-
-
-+################################################################################
-+## Clean
-+
- .PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
-
- clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
-@@ -372,7 +398,7 @@
- rm -f "$$lc/.xml2po.mo"; \
- fi; \
- done
--clean-doc-dir:
-+clean-doc-dir: clean-doc-lc
- @for lc in C $(_DOC_REAL_LINGUAS); do \
- for dir in `find $$lc -depth -type d`; do \
- if ! test $$dir -ef $(srcdir)/$$dir; then \
-@@ -385,7 +411,7 @@
- _clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
- _clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
- _clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
--_clean_dir = $(if $(DOC_MODULE),clean-doc-dir)
-+_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
-
- clean-local: \
- $(_clean_omf) $(_clean_dsk) \
-@@ -401,10 +427,14 @@
- $(_clean_lc) $(_clean_dir)
-
-
--.PHONY: dist-doc-docs dist-doc-figs dist-doc-omf dist-doc-dsk
--doc-dist-hook: \
-- $(if $(DOC_MODULE),dist-doc-docs) \
-- $(if $(_DOC_C_FIGURES),dist-doc-figs) \
-+
-+################################################################################
-+## Dist
-+
-+.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
-+doc-dist-hook: \
-+ $(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs) \
-+ $(if $(_DOC_C_FIGURES),dist-doc-figs) \
- $(if $(_DOC_OMF_IN),dist-doc-omf)
- # $(if $(_DOC_DSK_IN),dist-doc-dsk)
-
-@@ -451,9 +481,14 @@
- $(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
-
-
-+
-+################################################################################
-+## Check
-+
- .PHONY: check-doc-docs check-doc-omf
- check: \
- $(if $(DOC_MODULE),check-doc-docs) \
-+ $(if $(DOC_ID),check-doc-pages) \
- $(if $(_DOC_OMF_IN),check-doc-omf)
-
- check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-@@ -469,6 +504,21 @@
- xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
- done
-
-+check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
-+ for lc in C $(_DOC_REAL_LINGUAS); do \
-+ if test -f "$$lc"; \
-+ then d=; \
-+ xmlpath="$$lc"; \
-+ else \
-+ d="$(srcdir)/"; \
-+ xmlpath="$$lc:$(srcdir)/$$lc"; \
-+ fi; \
-+ for page in $(DOC_PAGES); do \
-+ echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
-+ xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
-+ done; \
-+ done
-+
- check-doc-omf: $(_DOC_OMF_ALL)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
- echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-@@ -476,9 +526,16 @@
- done
-
-
-+
-+################################################################################
-+## Install
-+
- .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-+
-+_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
-+
- install-data-local: \
-- $(if $(DOC_MODULE),install-doc-docs) \
-+ $(if $(DOC_MODULE)$(DOC_ID),install-doc-docs) \
- $(if $(_DOC_HTML_ALL),install-doc-html) \
- $(if $(_DOC_C_FIGURES),install-doc-figs) \
- $(if $(_DOC_OMF_IN),install-doc-omf)
-@@ -486,42 +543,46 @@
-
- install-doc-docs:
- @for lc in C $(_DOC_REAL_LINGUAS); do \
-- echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \
-- $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc; \
-+ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
-+ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
- docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-- docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
- if ! test -d "$$docdir"; then \
- echo "$(mkinstalldirs) $$docdir"; \
- $(mkinstalldirs) "$$docdir"; \
- fi; \
-- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
-- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
-+ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-+ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
- done
-
- install-doc-figs:
- @list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \
- for lc in C $(_DOC_REAL_LINGUAS); do \
-+ figsymlink=false; \
- if test -f "$$lc/$$fig"; then \
- figfile="$$lc/$$fig"; \
- elif test -f "$(srcdir)/$$lc/$$fig"; then \
- figfile="$(srcdir)/$$lc/$$fig"; \
-- elif test -f "C/$$fig"; then \
-- figfile="C/$$fig"; \
- else \
-- figfile="$(srcdir)/C/$$fig"; \
-+ figsymlink=true; \
- fi; \
- figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-- figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
-+ figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
- if ! test -d "$$figdir"; then \
- echo "$(mkinstalldirs) $$figdir"; \
- $(mkinstalldirs) "$$figdir"; \
- fi; \
- figbase=`echo $$fig | sed -e 's/^.*\///'`; \
-- echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
-- $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
-+ if $$figsymlink; then \
-+ echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \
-+ ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \
-+ else \
-+ echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
-+ $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
-+ fi; \
- done; \
- done
-
-@@ -529,23 +590,27 @@
- echo install-html
-
- install-doc-omf:
-- $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)
-+ $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-- $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \
-+ echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-+ $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
- done
- @if test "x$(_ENABLE_SK)" = "xtrue"; then \
-- echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
-- scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
-+ echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
-+ scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
- fi;
-
- install-doc-dsk:
- echo install-dsk
-
-
-+
-+################################################################################
-+## Uninstall
-+
- .PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
- uninstall-local: \
-- $(if $(DOC_MODULE),uninstall-doc-docs) \
-+ $(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs) \
- $(if $(_DOC_HTML_ALL),uninstall-doc-html) \
- $(if $(_DOC_C_FIGURES),uninstall-doc-figs) \
- $(if $(_DOC_OMF_IN),uninstall-doc-omf)
-@@ -553,22 +618,22 @@
-
- uninstall-doc-docs:
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
-- echo " rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
-- rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
-+ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
- done
-
- uninstall-doc-figs:
- @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
-- echo "rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
-- rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
-+ echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
-+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
- done;
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
- if test "x$(_ENABLE_SK)" = "xtrue"; then \
-- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-+ echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-+ scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
- fi; \
-- echo "rm -f $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-- rm -f "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-+ echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-+ rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
- done
-diff -Naur epiphany-browser-2.29.3.old/gtk-doc.make epiphany-browser-2.29.3/gtk-doc.make
---- epiphany-browser-2.29.3.old/gtk-doc.make 1970-01-01 01:00:00.000000000 +0100
-+++ epiphany-browser-2.29.3/gtk-doc.make 2009-12-03 15:54:29.407135399 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/gtk-doc.make epiphany-browser-2.29.5/gtk-doc.make
+--- epiphany-browser-2.29.5.old/gtk-doc.make 1970-01-01 01:00:00.000000000 +0100
++++ epiphany-browser-2.29.5/gtk-doc.make 2010-01-13 10:10:30.614522331 +0100
@@ -0,0 +1,196 @@
+# -*- mode: makefile -*-
+
@@ -16521,49 +15321,16 @@
+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
-diff -Naur epiphany-browser-2.29.3.old/help/Makefile.in epiphany-browser-2.29.3/help/Makefile.in
---- epiphany-browser-2.29.3.old/help/Makefile.in 2009-11-30 19:28:27.000000000 +0100
-+++ epiphany-browser-2.29.3/help/Makefile.in 2009-12-03 15:54:36.576095701 +0100
-@@ -143,8 +143,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -157,29 +155,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -214,6 +193,7 @@
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/help/Makefile.in epiphany-browser-2.29.5/help/Makefile.in
+--- epiphany-browser-2.29.5.old/help/Makefile.in 2010-01-11 21:37:20.000000000 +0100
++++ epiphany-browser-2.29.5/help/Makefile.in 2010-01-13 10:10:38.194519855 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -195,6 +195,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -16571,378 +15338,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -295,6 +275,7 @@
- $(DOC_LINGUAS))
-
- _DOC_ABS_SRCDIR = @abs_srcdir@
-+_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
- @ENABLE_SK_TRUE at _ENABLE_SK = true
-
- ################################################################################
-@@ -328,14 +309,16 @@
-
- ################################################################################
- _DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
-+_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
- _DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
- _DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc))
- _DOC_C_DOCS = \
- $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \
-- $(_DOC_C_MODULE)
-+ $(_DOC_C_PAGES) $(_DOC_C_MODULE)
-
- _DOC_C_DOCS_NOENT = \
-- $(_DOC_C_MODULE) $(_DOC_C_INCLUDES)
-+ $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \
-+ $(_DOC_C_PAGES)
-
- _DOC_C_FIGURES = $(if $(DOC_FIGURES), \
- $(foreach fig,$(DOC_FIGURES),C/$(fig)), \
-@@ -351,12 +334,16 @@
-
-
- ###############################################################################
--_DOC_POFILES = $(if $(DOC_MODULE), \
-+_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \
- $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
-
- _DOC_LC_MODULES = $(if $(DOC_MODULE), \
- $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
-
-+_DOC_LC_PAGES = \
-+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES), \
-+ $(lc)/$(notdir $(page)) ))
-+
- _DOC_LC_INCLUDES = \
- $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \
- $(lc)/$(notdir $(inc)) ))
-@@ -368,7 +355,7 @@
- $(lc)/$(notdir $(doc)) ))
-
- _DOC_LC_DOCS = \
-- $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) \
-+ $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) $(_DOC_LC_PAGES) \
- $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
-
- _DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \
-@@ -388,7 +375,8 @@
- _clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
- _clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
- _clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
--_clean_dir = $(if $(DOC_MODULE),clean-doc-dir)
-+_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
-+_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
- DOC_MODULE = epiphany
- DOC_ENTITIES = legal.xml
- DOC_LINGUAS = ca cs bg de el en_GB es eu fi fr it ja oc nl ru sv uk
-@@ -648,6 +636,10 @@
-
- DOC_MODULE ?=
-
-+DOC_ID ?=
-+
-+DOC_PAGES ?=
-+
- DOC_ENTITIES ?=
-
- DOC_INCLUDES ?=
-@@ -664,6 +656,7 @@
-
- _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
- _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
-+_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
- _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
- _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
- _ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
-@@ -708,16 +701,16 @@
- done; \
- if ! test -f $@; then \
- echo "(cd $(dir $@) && \
-- $(_xml2po) -e $$docs > $(notdir $@).tmp && \
-+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
- cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \
- (cd $(dir $@) && \
-- $(_xml2po) -e $$docs > $(notdir $@).tmp && \
-+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
- cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \
- else \
- echo "(cd $(dir $@) && \
-- $(_xml2po) -e -u $(notdir $@) $$docs)"; \
-+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \
- (cd $(dir $@) && \
-- $(_xml2po) -e -u $(notdir $@) $$docs); \
-+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
- fi
-
- # FIXME: fix the dependancy
-@@ -726,15 +719,16 @@
- $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
- if ! test -d $(dir $@); then mkdir $(dir $@); fi
- if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
-+ po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \
-+ if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \
- (cd $(dir $@) && \
-- $(_xml2po) -e -p \
-- "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
-+ $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \
- "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
- cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
- .PHONY: pot
- pot: $(_DOC_POT)
- $(_DOC_POT): $(_DOC_C_DOCS_NOENT)
-- $(_xml2po) -e -o $@ $^
-+ $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
-
- $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
- xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
-@@ -746,6 +740,8 @@
- $(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \
- $(_DOC_HTML_ALL) $(_DOC_POFILES)
-
-+################################################################################
-+
- .PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
-
- clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
-@@ -764,7 +760,7 @@
- rm -f "$$lc/.xml2po.mo"; \
- fi; \
- done
--clean-doc-dir:
-+clean-doc-dir: clean-doc-lc
- @for lc in C $(_DOC_REAL_LINGUAS); do \
- for dir in `find $$lc -depth -type d`; do \
- if ! test $$dir -ef $(srcdir)/$$dir; then \
-@@ -787,10 +783,12 @@
- $(_clean_omf) $(_clean_dsk) \
- $(_clean_lc) $(_clean_dir)
-
--.PHONY: dist-doc-docs dist-doc-figs dist-doc-omf dist-doc-dsk
--doc-dist-hook: \
-- $(if $(DOC_MODULE),dist-doc-docs) \
-- $(if $(_DOC_C_FIGURES),dist-doc-figs) \
-+################################################################################
-+
-+.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
-+doc-dist-hook: \
-+ $(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs) \
-+ $(if $(_DOC_C_FIGURES),dist-doc-figs) \
- $(if $(_DOC_OMF_IN),dist-doc-omf)
- # $(if $(_DOC_DSK_IN),dist-doc-dsk)
-
-@@ -836,9 +834,12 @@
- echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
- $(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
-
-+################################################################################
-+
- .PHONY: check-doc-docs check-doc-omf
- check: \
- $(if $(DOC_MODULE),check-doc-docs) \
-+ $(if $(DOC_ID),check-doc-pages) \
- $(if $(_DOC_OMF_IN),check-doc-omf)
-
- check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-@@ -854,15 +855,33 @@
- xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
- done
-
-+check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
-+ for lc in C $(_DOC_REAL_LINGUAS); do \
-+ if test -f "$$lc"; \
-+ then d=; \
-+ xmlpath="$$lc"; \
-+ else \
-+ d="$(srcdir)/"; \
-+ xmlpath="$$lc:$(srcdir)/$$lc"; \
-+ fi; \
-+ for page in $(DOC_PAGES); do \
-+ echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
-+ xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
-+ done; \
-+ done
-+
- check-doc-omf: $(_DOC_OMF_ALL)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
- echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
- xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
- done
-
-+################################################################################
-+
- .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-+
- install-data-local: \
-- $(if $(DOC_MODULE),install-doc-docs) \
-+ $(if $(DOC_MODULE)$(DOC_ID),install-doc-docs) \
- $(if $(_DOC_HTML_ALL),install-doc-html) \
- $(if $(_DOC_C_FIGURES),install-doc-figs) \
- $(if $(_DOC_OMF_IN),install-doc-omf)
-@@ -870,42 +889,46 @@
-
- install-doc-docs:
- @for lc in C $(_DOC_REAL_LINGUAS); do \
-- echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \
-- $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc; \
-+ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
-+ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
- docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-- docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
- if ! test -d "$$docdir"; then \
- echo "$(mkinstalldirs) $$docdir"; \
- $(mkinstalldirs) "$$docdir"; \
- fi; \
-- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
-- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
-+ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-+ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
- done
-
- install-doc-figs:
- @list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \
- for lc in C $(_DOC_REAL_LINGUAS); do \
-+ figsymlink=false; \
- if test -f "$$lc/$$fig"; then \
- figfile="$$lc/$$fig"; \
- elif test -f "$(srcdir)/$$lc/$$fig"; then \
- figfile="$(srcdir)/$$lc/$$fig"; \
-- elif test -f "C/$$fig"; then \
-- figfile="C/$$fig"; \
- else \
-- figfile="$(srcdir)/C/$$fig"; \
-+ figsymlink=true; \
- fi; \
- figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-- figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
-+ figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
- if ! test -d "$$figdir"; then \
- echo "$(mkinstalldirs) $$figdir"; \
- $(mkinstalldirs) "$$figdir"; \
- fi; \
- figbase=`echo $$fig | sed -e 's/^.*\///'`; \
-- echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
-- $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
-+ if $$figsymlink; then \
-+ echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \
-+ ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \
-+ else \
-+ echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
-+ $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
-+ fi; \
- done; \
- done
-
-@@ -913,22 +936,24 @@
- echo install-html
-
- install-doc-omf:
-- $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)
-+ $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-- $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \
-+ echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-+ $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
- done
- @if test "x$(_ENABLE_SK)" = "xtrue"; then \
-- echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
-- scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
-+ echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
-+ scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
- fi;
-
- install-doc-dsk:
- echo install-dsk
-
-+################################################################################
-+
- .PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
- uninstall-local: \
-- $(if $(DOC_MODULE),uninstall-doc-docs) \
-+ $(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs) \
- $(if $(_DOC_HTML_ALL),uninstall-doc-html) \
- $(if $(_DOC_C_FIGURES),uninstall-doc-figs) \
- $(if $(_DOC_OMF_IN),uninstall-doc-omf)
-@@ -936,24 +961,24 @@
-
- uninstall-doc-docs:
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
-- echo " rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
-- rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
-+ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
- done
-
- uninstall-doc-figs:
- @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
-- echo "rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
-- rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
-+ echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
-+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
- done;
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
- if test "x$(_ENABLE_SK)" = "xtrue"; then \
-- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-+ echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-+ scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
- fi; \
-- echo "rm -f $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-- rm -f "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-+ echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-+ rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
- done
-
- dist-hook: doc-dist-hook
-diff -Naur epiphany-browser-2.29.3.old/lib/egg/Makefile.in epiphany-browser-2.29.3/lib/egg/Makefile.in
---- epiphany-browser-2.29.3.old/lib/egg/Makefile.in 2009-11-30 19:28:28.000000000 +0100
-+++ epiphany-browser-2.29.3/lib/egg/Makefile.in 2009-12-03 15:54:36.916095056 +0100
-@@ -166,8 +166,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -180,29 +178,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -237,6 +216,7 @@
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/lib/egg/Makefile.in epiphany-browser-2.29.5/lib/egg/Makefile.in
+--- epiphany-browser-2.29.5.old/lib/egg/Makefile.in 2010-01-11 21:37:21.000000000 +0100
++++ epiphany-browser-2.29.5/lib/egg/Makefile.in 2010-01-13 10:10:38.550520620 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -218,6 +218,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -16950,49 +15355,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur epiphany-browser-2.29.3.old/lib/Makefile.in epiphany-browser-2.29.3/lib/Makefile.in
---- epiphany-browser-2.29.3.old/lib/Makefile.in 2009-11-30 19:28:27.000000000 +0100
-+++ epiphany-browser-2.29.3/lib/Makefile.in 2009-12-03 15:54:36.760094914 +0100
-@@ -264,8 +264,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -278,29 +276,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -335,6 +314,7 @@
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/lib/Makefile.in epiphany-browser-2.29.5/lib/Makefile.in
+--- epiphany-browser-2.29.5.old/lib/Makefile.in 2010-01-11 21:37:21.000000000 +0100
++++ epiphany-browser-2.29.5/lib/Makefile.in 2010-01-13 10:10:38.418520037 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -328,6 +328,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17000,7 +15372,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -466,7 +446,7 @@
+@@ -444,7 +445,7 @@
-I$(top_srcdir)/lib/egg \
-DDATADIR="\"$(datadir)\"" \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -17009,49 +15381,34 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-diff -Naur epiphany-browser-2.29.3.old/lib/widgets/Makefile.in epiphany-browser-2.29.3/lib/widgets/Makefile.in
---- epiphany-browser-2.29.3.old/lib/widgets/Makefile.in 2009-11-30 19:28:28.000000000 +0100
-+++ epiphany-browser-2.29.3/lib/widgets/Makefile.in 2009-12-03 15:54:37.028096445 +0100
-@@ -161,8 +161,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -175,29 +173,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -232,6 +211,7 @@
+@@ -822,7 +823,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @fail= failcom='exit 1'; \
++ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -847,7 +848,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @fail= failcom='exit 1'; \
++ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/lib/widgets/Makefile.in epiphany-browser-2.29.5/lib/widgets/Makefile.in
+--- epiphany-browser-2.29.5.old/lib/widgets/Makefile.in 2010-01-11 21:37:21.000000000 +0100
++++ epiphany-browser-2.29.5/lib/widgets/Makefile.in 2010-01-13 10:10:38.670519041 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -213,6 +213,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17059,15 +15416,15 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur epiphany-browser-2.29.3.old/ltmain.sh epiphany-browser-2.29.3/ltmain.sh
---- epiphany-browser-2.29.3.old/ltmain.sh 2009-11-18 13:38:39.000000000 +0100
-+++ epiphany-browser-2.29.3/ltmain.sh 2009-12-03 15:54:28.536126028 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/ltmain.sh epiphany-browser-2.29.5/ltmain.sh
+--- epiphany-browser-2.29.5.old/ltmain.sh 2010-01-05 19:51:24.000000000 +0100
++++ epiphany-browser-2.29.5/ltmain.sh 2010-01-13 10:10:29.794518588 +0100
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
--# $progname: (GNU libtool) 2.2.6
-+# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
+-# $progname: (GNU libtool) 2.2.6b
++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -17075,10 +15432,10 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
--VERSION=2.2.6
-+VERSION="2.2.6 Debian-2.2.6a-4"
+-VERSION=2.2.6b
++VERSION="2.2.6b Debian-2.2.6b-2"
TIMESTAMP=""
- package_revision=1.3012
+ package_revision=1.3017
@@ -5033,7 +5033,10 @@
case $pass in
@@ -17140,179 +15497,18 @@
esac
;;
no)
-diff -Naur epiphany-browser-2.29.3.old/m4/gnome-doc-utils.m4 epiphany-browser-2.29.3/m4/gnome-doc-utils.m4
---- epiphany-browser-2.29.3.old/m4/gnome-doc-utils.m4 2009-11-18 13:38:39.000000000 +0100
-+++ epiphany-browser-2.29.3/m4/gnome-doc-utils.m4 2009-12-03 15:54:29.528097774 +0100
-@@ -36,15 +36,19 @@
- # GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
- #
- AC_DEFUN([GNOME_DOC_INIT],
--[
-+[AC_REQUIRE([AC_PROG_LN_S])dnl
-+
- ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
-
-+AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
- PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
- [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
-
- if test "$gdu_cv_have_gdu" = "yes"; then
-+ AC_MSG_RESULT([yes])
- ifelse([$2],,[:],[$2])
- else
-+ AC_MSG_RESULT([no])
- ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
- fi
-
-diff -Naur epiphany-browser-2.29.3.old/m4/gtk-doc.m4 epiphany-browser-2.29.3/m4/gtk-doc.m4
---- epiphany-browser-2.29.3.old/m4/gtk-doc.m4 2009-11-18 13:38:39.000000000 +0100
-+++ epiphany-browser-2.29.3/m4/gtk-doc.m4 2009-12-03 15:54:29.391133434 +0100
-@@ -8,12 +8,6 @@
- [
- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
--
-- dnl check for tools we added during development
-- AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
-- AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
-- AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
--
- dnl for overriding the documentation installation directory
- AC_ARG_WITH([html-dir],
- AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-@@ -32,30 +26,14 @@
- [PKG_CHECK_EXISTS([gtk-doc],,
- AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
- [PKG_CHECK_EXISTS([gtk-doc >= $1],,
-- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
-+ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
- fi
-
- AC_MSG_CHECKING([whether to build gtk-doc documentation])
- AC_MSG_RESULT($enable_gtk_doc)
-
-- dnl enable/disable output formats
-- AC_ARG_ENABLE([gtk-doc-html],
-- AS_HELP_STRING([--enable-gtk-doc-html],
-- [build documentation in html format [[default=yes]]]),,
-- [enable_gtk_doc_html=yes])
-- AC_ARG_ENABLE([gtk-doc-pdf],
-- AS_HELP_STRING([--enable-gtk-doc-pdf],
-- [build documentation in pdf format [[default=no]]]),,
-- [enable_gtk_doc_pdf=no])
--
-- if test -n "$GTKDOC_MKPDF"; then
-- enable_gtk_doc_pdf=no
-- fi
--
-+ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
-
- AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
-- AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
-- AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
- AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
-- AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
- ])
-diff -Naur epiphany-browser-2.29.3.old/m4/intltool.m4 epiphany-browser-2.29.3/m4/intltool.m4
---- epiphany-browser-2.29.3.old/m4/intltool.m4 2009-11-18 13:38:39.000000000 +0100
-+++ epiphany-browser-2.29.3/m4/intltool.m4 2009-12-03 15:54:29.339200643 +0100
-@@ -75,25 +75,25 @@
- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
--AC_SUBST(INTLTOOL_DESKTOP_RULE)
--AC_SUBST(INTLTOOL_DIRECTORY_RULE)
--AC_SUBST(INTLTOOL_KEYS_RULE)
--AC_SUBST(INTLTOOL_PROP_RULE)
--AC_SUBST(INTLTOOL_OAF_RULE)
--AC_SUBST(INTLTOOL_PONG_RULE)
--AC_SUBST(INTLTOOL_SERVER_RULE)
--AC_SUBST(INTLTOOL_SHEET_RULE)
--AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
--AC_SUBST(INTLTOOL_UI_RULE)
--AC_SUBST(INTLTOOL_XAM_RULE)
--AC_SUBST(INTLTOOL_KBD_RULE)
--AC_SUBST(INTLTOOL_XML_RULE)
--AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
--AC_SUBST(INTLTOOL_CAVES_RULE)
--AC_SUBST(INTLTOOL_SCHEMAS_RULE)
--AC_SUBST(INTLTOOL_THEME_RULE)
--AC_SUBST(INTLTOOL_SERVICE_RULE)
--AC_SUBST(INTLTOOL_POLICY_RULE)
-+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-+_IT_SUBST(INTLTOOL_KEYS_RULE)
-+_IT_SUBST(INTLTOOL_PROP_RULE)
-+_IT_SUBST(INTLTOOL_OAF_RULE)
-+_IT_SUBST(INTLTOOL_PONG_RULE)
-+_IT_SUBST(INTLTOOL_SERVER_RULE)
-+_IT_SUBST(INTLTOOL_SHEET_RULE)
-+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-+_IT_SUBST(INTLTOOL_UI_RULE)
-+_IT_SUBST(INTLTOOL_XAM_RULE)
-+_IT_SUBST(INTLTOOL_KBD_RULE)
-+_IT_SUBST(INTLTOOL_XML_RULE)
-+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-+_IT_SUBST(INTLTOOL_CAVES_RULE)
-+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-+_IT_SUBST(INTLTOOL_THEME_RULE)
-+_IT_SUBST(INTLTOOL_SERVICE_RULE)
-+_IT_SUBST(INTLTOOL_POLICY_RULE)
-
- # Check the gettext tools to make sure they are GNU
- AC_PATH_PROG(XGETTEXT, xgettext)
-@@ -110,12 +110,17 @@
- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
- fi
-
--AC_PATH_PROG(INTLTOOL_PERL, [perl])
-+AC_PATH_PROG(INTLTOOL_PERL, perl)
- if test -z "$INTLTOOL_PERL"; then
-- AC_MSG_ERROR([perl not found; required for intltool])
-+ AC_MSG_ERROR([perl not found])
- fi
--if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-- AC_MSG_ERROR([perl 5.x required for intltool])
-+AC_MSG_CHECKING([for perl >= 5.8.1])
-+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-+if test $? -ne 0; then
-+ AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-+else
-+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-+ AC_MSG_RESULT([$IT_PERL_VERSION])
- fi
- if test "x$2" != "xno-xml"; then
- AC_MSG_CHECKING([for XML::Parser])
-@@ -171,7 +176,7 @@
- dnl of config.status.
- AC_CONFIG_COMMANDS_PRE([
- AC_CONFIG_COMMANDS([$1/stamp-it], [
-- if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then
-+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
- AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
- fi
- rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-@@ -193,6 +198,17 @@
- ])dnl
- ])
-
-+# _IT_SUBST(VARIABLE)
-+# -------------------
-+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-+#
-+AC_DEFUN([_IT_SUBST],
-+[
-+AC_SUBST([$1])
-+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-+]
-+)
-+
- # deprecated macros
- AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
- # A hint is needed for aclocal from Automake <= 1.9.4:
-diff -Naur epiphany-browser-2.29.3.old/m4/libtool.m4 epiphany-browser-2.29.3/m4/libtool.m4
---- epiphany-browser-2.29.3.old/m4/libtool.m4 2009-11-18 13:38:39.000000000 +0100
-+++ epiphany-browser-2.29.3/m4/libtool.m4 2009-12-03 15:54:28.680124275 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/m4/libtool.m4 epiphany-browser-2.29.5/m4/libtool.m4
+--- epiphany-browser-2.29.5.old/m4/libtool.m4 2010-01-05 19:51:24.000000000 +0100
++++ epiphany-browser-2.29.5/m4/libtool.m4 2010-01-13 10:10:29.898518891 +0100
+@@ -2445,7 +2445,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
@@ -2470,13 +2470,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -17347,7 +15543,12 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -3079,7 +3088,7 @@
+@@ -3075,11 +3084,11 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -17356,6 +15557,15 @@
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
+@@ -3696,7 +3705,7 @@
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
@@ -3760,7 +3769,7 @@
;;
esac
@@ -17365,6 +15575,15 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -3980,7 +3989,7 @@
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
@@ -4185,6 +4194,9 @@
cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
@@ -17385,7 +15604,24 @@
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4431,7 +4446,7 @@
+@@ -4270,6 +4285,7 @@
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
++ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [[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 ...
+@@ -4361,7 +4377,7 @@
+ _LT_TAGVAR(archive_expsym_cmds, $1)='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'
+ ;;
+
+- gnu* | linux* | tpf* | k*bsd*-gnu)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -4431,7 +4447,7 @@
fi
;;
@@ -17394,7 +15630,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -4606,6 +4621,7 @@
+@@ -4606,6 +4622,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -17402,7 +15638,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -4844,7 +4860,7 @@
+@@ -4844,7 +4861,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -17411,49 +15647,25 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-diff -Naur epiphany-browser-2.29.3.old/Makefile.in epiphany-browser-2.29.3/Makefile.in
---- epiphany-browser-2.29.3.old/Makefile.in 2009-11-30 19:28:30.000000000 +0100
-+++ epiphany-browser-2.29.3/Makefile.in 2009-12-03 15:54:37.827095960 +0100
-@@ -179,8 +179,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -193,29 +191,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -250,6 +229,7 @@
+@@ -5844,7 +5861,7 @@
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/Makefile.in epiphany-browser-2.29.5/Makefile.in
+--- epiphany-browser-2.29.5.old/Makefile.in 2010-01-11 21:37:22.000000000 +0100
++++ epiphany-browser-2.29.5/Makefile.in 2010-01-13 10:10:39.434545747 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -231,6 +231,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17461,70 +15673,78 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur epiphany-browser-2.29.3.old/po/Makefile.in.in epiphany-browser-2.29.3/po/Makefile.in.in
---- epiphany-browser-2.29.3.old/po/Makefile.in.in 2009-11-18 13:38:39.000000000 +0100
-+++ epiphany-browser-2.29.3/po/Makefile.in.in 2009-12-03 15:54:29.299192555 +0100
-@@ -21,7 +21,7 @@
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
-
--SHELL = /bin/sh
-+SHELL = @SHELL@
-
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
-@@ -56,7 +56,7 @@
-
- PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-
--USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-
- USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-
-diff -Naur epiphany-browser-2.29.3.old/src/bookmarks/Makefile.in epiphany-browser-2.29.3/src/bookmarks/Makefile.in
---- epiphany-browser-2.29.3.old/src/bookmarks/Makefile.in 2009-11-30 19:28:29.000000000 +0100
-+++ epiphany-browser-2.29.3/src/bookmarks/Makefile.in 2009-12-03 15:54:37.583094914 +0100
-@@ -209,8 +209,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -223,29 +221,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -280,6 +259,7 @@
+@@ -399,7 +400,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @fail= failcom='exit 1'; \
++ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -424,7 +425,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @fail= failcom='exit 1'; \
++ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -588,8 +589,7 @@
+ fi; \
+ done
+ -test -n "$(am__skip_mode_fix)" \
+- || find "$(distdir)" -type d ! -perm -755 \
+- -exec chmod u+rwx,go+rx {} \; -o \
++ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+@@ -632,17 +632,17 @@
+ distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
++ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
++ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/po/Makefile.in.in epiphany-browser-2.29.5/po/Makefile.in.in
+--- epiphany-browser-2.29.5.old/po/Makefile.in.in 2010-01-05 19:51:24.000000000 +0100
++++ epiphany-browser-2.29.5/po/Makefile.in.in 2010-01-13 10:10:30.558520869 +0100
+@@ -129,7 +129,7 @@
+ done
+
+ # Empty stubs to satisfy archaic automake needs
+-dvi info ctags tags CTAGS TAGS ID:
++dvi info tags TAGS ID:
+
+ # Define this as empty until I found a useful application.
+ install-exec installcheck:
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/src/bookmarks/Makefile.in epiphany-browser-2.29.5/src/bookmarks/Makefile.in
+--- epiphany-browser-2.29.5.old/src/bookmarks/Makefile.in 2010-01-11 21:37:22.000000000 +0100
++++ epiphany-browser-2.29.5/src/bookmarks/Makefile.in 2010-01-13 10:10:39.206521518 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -261,6 +261,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17532,49 +15752,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur epiphany-browser-2.29.3.old/src/Makefile.in epiphany-browser-2.29.3/src/Makefile.in
---- epiphany-browser-2.29.3.old/src/Makefile.in 2009-11-30 19:28:29.000000000 +0100
-+++ epiphany-browser-2.29.3/src/Makefile.in 2009-12-03 15:54:37.403094662 +0100
-@@ -346,8 +346,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -360,29 +358,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -417,6 +396,7 @@
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/src/Makefile.in epiphany-browser-2.29.5/src/Makefile.in
+--- epiphany-browser-2.29.5.old/src/Makefile.in 2010-01-11 21:37:21.000000000 +0100
++++ epiphany-browser-2.29.5/src/Makefile.in 2010-01-13 10:10:38.994520412 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -384,6 +384,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17582,7 +15769,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -550,8 +530,8 @@
+@@ -511,8 +512,8 @@
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
@@ -17593,49 +15780,34 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
-diff -Naur epiphany-browser-2.29.3.old/tests/Makefile.in epiphany-browser-2.29.3/tests/Makefile.in
---- epiphany-browser-2.29.3.old/tests/Makefile.in 2009-11-30 19:28:30.000000000 +0100
-+++ epiphany-browser-2.29.3/tests/Makefile.in 2009-12-03 15:54:37.671095475 +0100
-@@ -170,8 +170,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -184,29 +182,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -241,6 +220,7 @@
+@@ -1181,7 +1182,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @fail= failcom='exit 1'; \
++ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -1206,7 +1207,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @fail= failcom='exit 1'; \
++ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/tests/Makefile.in epiphany-browser-2.29.5/tests/Makefile.in
+--- epiphany-browser-2.29.5.old/tests/Makefile.in 2010-01-11 21:37:22.000000000 +0100
++++ epiphany-browser-2.29.5/tests/Makefile.in 2010-01-13 10:10:39.322520751 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -222,6 +222,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
More information about the pkg-gnome-commits
mailing list