r21990 - in /desktop/unstable/epiphany-browser/debian: changelog control patches/99_autoreconf.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Tue Oct 20 06:16:02 UTC 2009
Author: slomo
Date: Tue Oct 20 06:15:44 2009
New Revision: 21990
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21990
Log:
* New upstream bugfix release:
+ debian/patches/99_autoreconf.patch:
- Regenerated for the new version.
Modified:
desktop/unstable/epiphany-browser/debian/changelog
desktop/unstable/epiphany-browser/debian/control
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=21990&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Tue Oct 20 06:15:44 2009
@@ -1,3 +1,11 @@
+epiphany-browser (2.28.1-1) unstable; urgency=low
+
+ * New upstream bugfix release:
+ + debian/patches/99_autoreconf.patch:
+ - Regenerated for the new version.
+
+ -- Sebastian Dröge <slomo at debian.org> Tue, 20 Oct 2009 08:09:52 +0200
+
epiphany-browser (2.28.0-4) unstable; urgency=low
* debian/control.in:
Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=21990&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control [utf-8] Tue Oct 20 06:15:44 2009
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Gustavo Noronha Silva <kov at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Gustavo Noronha Silva <kov at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5),
pkg-config,
libglib2.0-dev (>= 2.18.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=21990&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] Tue Oct 20 06:15:44 2009
@@ -1,16 +1,109 @@
-libtoolize --force --copy
-aclocal-1.10 -I m4
-automake-1.10
-autoconf
-Index: epiphany-browser-2.28.0/configure
-===================================================================
---- epiphany-browser-2.28.0.orig/configure 2009-09-24 18:15:07.340447944 -0300
-+++ epiphany-browser-2.28.0/configure 2009-09-24 18:20:03.584440260 -0300
+diff -Naur epiphany-browser-2.28.1.old/aclocal.m4 epiphany-browser-2.28.1/aclocal.m4
+--- epiphany-browser-2.28.1.old/aclocal.m4 2009-10-18 17:25:07.000000000 +0200
++++ epiphany-browser-2.28.1/aclocal.m4 2009-10-20 08:13:20.000000000 +0200
+@@ -13,8 +13,8 @@
+
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+-[m4_warning([this file was generated for autoconf 2.63.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
++[m4_warning([this file was generated for autoconf 2.64.
+ 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 @@
+ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+ # ---------------------------------------------
+ m4_define([_PKG_CONFIG],
+-[if test -n "$$1"; then
+- pkg_cv_[]$1="$$1"
+- elif test -n "$PKG_CONFIG"; then
+- PKG_CHECK_EXISTS([$3],
+- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+- [pkg_failed=yes])
+- else
+- pkg_failed=untried
++[if test -n "$PKG_CONFIG"; then
++ if test -n "$$1"; then
++ pkg_cv_[]$1="$$1"
++ else
++ PKG_CHECK_EXISTS([$3],
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++ [pkg_failed=yes])
++ fi
++else
++ pkg_failed=untried
+ fi[]dnl
+ ])# _PKG_CONFIG
+
+@@ -837,9 +843,9 @@
+ if test $pkg_failed = yes; then
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ else
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+diff -Naur epiphany-browser-2.28.1.old/config.guess epiphany-browser-2.28.1/config.guess
+diff -Naur epiphany-browser-2.28.1.old/config.h.in epiphany-browser-2.28.1/config.h.in
+--- epiphany-browser-2.28.1.old/config.h.in 2009-10-18 17:25:22.000000000 +0200
++++ epiphany-browser-2.28.1/config.h.in 2009-10-20 08:13:22.000000000 +0200
+@@ -169,6 +169,9 @@
+ /* Define to the one symbol short name of this package. */
+ #undef PACKAGE_TARNAME
+
++/* Define to the home page for this package. */
++#undef PACKAGE_URL
++
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+
+diff -Naur epiphany-browser-2.28.1.old/config.sub epiphany-browser-2.28.1/config.sub
+diff -Naur epiphany-browser-2.28.1.old/configure epiphany-browser-2.28.1/configure
+--- epiphany-browser-2.28.1.old/configure 2009-10-18 17:25:14.000000000 +0200
++++ epiphany-browser-2.28.1/configure 2009-10-20 08:13:22.000000000 +0200
@@ -1,20 +1,22 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for GNOME Web Browser 2.28.0.
-+# Generated by GNU Autoconf 2.64 for GNOME Web Browser 2.28.0.
+-# Generated by GNU Autoconf 2.63 for GNOME Web Browser 2.28.1.
++# Generated by GNU Autoconf 2.64 for GNOME Web Browser 2.28.1.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany>.
#
@@ -478,7 +571,7 @@
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
-+
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
@@ -554,7 +647,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)
-}
@@ -570,6 +662,10 @@
-as_func_ret_failure () {
- return 1
-}
+
+-exitcode=0
+-if as_func_success; then
+- :
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
@@ -582,16 +678,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
@@ -602,23 +702,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
@@ -805,14 +898,36 @@
PACKAGE_NAME='GNOME Web Browser'
-PACKAGE_TARNAME='epiphany'
+PACKAGE_TARNAME='epiphany-browser'
- PACKAGE_VERSION='2.28.0'
- PACKAGE_STRING='GNOME Web Browser 2.28.0'
+ PACKAGE_VERSION='2.28.1'
+ PACKAGE_STRING='GNOME Web Browser 2.28.1'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
+PACKAGE_URL=''
ac_unique_file="configure.ac"
# Factoring default headers for most tests.
-@@ -1023,6 +978,7 @@
+@@ -795,20 +750,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
+@@ -1023,6 +970,7 @@
program_transform_name
prefix
exec_prefix
@@ -820,7 +935,16 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1197,8 +1153,7 @@
+@@ -1062,8 +1010,6 @@
+ enable_scrollkeeper
+ with_html_dir
+ enable_gtk_doc
+-enable_gtk_doc_html
+-enable_gtk_doc_pdf
+ '
+ ac_precious_vars='build_alias
+ host_alias
+@@ -1197,8 +1143,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 &&
@@ -830,7 +954,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1224,8 +1179,7 @@
+@@ -1224,8 +1169,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 &&
@@ -840,7 +964,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1429,8 +1383,7 @@
+@@ -1429,8 +1373,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 &&
@@ -850,7 +974,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1446,8 +1399,7 @@
+@@ -1446,8 +1389,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 &&
@@ -860,7 +984,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1477,17 +1429,17 @@
+@@ -1477,17 +1419,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -884,7 +1008,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1504,15 +1456,13 @@
+@@ -1504,15 +1446,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -902,7 +1026,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1535,8 +1485,7 @@
+@@ -1535,8 +1475,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -912,7 +1036,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1566,11 +1515,9 @@
+@@ -1566,11 +1505,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -926,7 +1050,7 @@
# Find the source files, if location was not specified.
-@@ -1609,13 +1556,11 @@
+@@ -1609,13 +1546,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -942,7 +1066,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1689,7 +1634,8 @@
+@@ -1689,7 +1624,8 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
@@ -952,7 +1076,7 @@
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
-@@ -1736,7 +1682,8 @@
+@@ -1736,7 +1672,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)
@@ -962,21 +1086,59 @@
--enable-introspection Enable GObject introspection (default: disabled)
--enable-seed Enable Seed support (default: disabled)
--enable-nss Enable NSS support (default: enabled)
-@@ -1867,21 +1814,432 @@
- if $ac_init_version; then
- cat <<\_ACEOF
- GNOME Web Browser configure 2.28.0
--generated by GNU Autoconf 2.63
+@@ -1747,8 +1684,6 @@
+ 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]
+
+ Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+@@ -1848,40 +1783,451 @@
+ esac
+ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+- cd "$ac_dir" || { ac_status=$?; continue; }
+- # Check for guested configure.
+- if test -f "$ac_srcdir/configure.gnu"; then
+- echo &&
+- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+- elif test -f "$ac_srcdir/configure"; then
+- echo &&
+- $SHELL "$ac_srcdir/configure" --help=recursive
+- else
+- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+- fi || ac_status=$?
+- cd "$ac_pwd" || { ac_status=$?; break; }
+- done
++ cd "$ac_dir" || { ac_status=$?; continue; }
++ # Check for guested configure.
++ if test -f "$ac_srcdir/configure.gnu"; then
++ echo &&
++ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
++ elif test -f "$ac_srcdir/configure"; then
++ echo &&
++ $SHELL "$ac_srcdir/configure" --help=recursive
++ else
++ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++ fi || ac_status=$?
++ cd "$ac_pwd" || { ac_status=$?; break; }
++ done
++fi
++
++test -n "$ac_init_help" && exit $ac_status
++if $ac_init_version; then
++ cat <<\_ACEOF
++GNOME Web Browser configure 2.28.1
+generated by GNU Autoconf 2.64
-
--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. ##
@@ -1289,11 +1451,16 @@
+ ac_header_preproc=yes
+else
+ ac_header_preproc=no
-+fi
+ fi
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
-+
+
+-test -n "$ac_init_help" && exit $ac_status
+-if $ac_init_version; then
+- cat <<\_ACEOF
+-GNOME Web Browser configure 2.28.1
+-generated by GNU Autoconf 2.63
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+ yes:no: )
@@ -1333,7 +1500,11 @@
+$as_echo "$ac_res" >&6; }
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+
+
+-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_header_mongrel
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
@@ -1360,7 +1531,8 @@
+ ;
+ return 0;
+}
-+_ACEOF
+ _ACEOF
+- exit
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
@@ -1382,7 +1554,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; }
@@ -1393,13 +1565,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.28.0, which was
+ It was created by GNOME Web Browser $as_me 2.28.1, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
-@@ -1917,8 +2275,8 @@
+@@ -1917,8 +2263,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1410,7 +1582,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1955,9 +2313,9 @@
+@@ -1955,9 +2301,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1422,7 +1594,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1973,13 +2331,13 @@
+@@ -1973,13 +2319,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -1439,7 +1611,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -2004,13 +2362,13 @@
+@@ -2004,13 +2350,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -1455,7 +1627,7 @@
esac ;;
esac
done
-@@ -2082,39 +2440,41 @@
+@@ -2082,39 +2428,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -1502,7 +1674,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2133,7 +2493,7 @@
+@@ -2133,7 +2481,7 @@
do
test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
@@ -1511,7 +1683,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2144,7 +2504,7 @@
+@@ -2144,7 +2492,7 @@
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
@@ -1520,7 +1692,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2152,14 +2512,14 @@
+@@ -2152,14 +2500,14 @@
esac
fi
else
@@ -1539,7 +1711,7 @@
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
-@@ -2170,11 +2530,11 @@
+@@ -2170,11 +2518,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -1553,7 +1725,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2184,17 +2544,17 @@
+@@ -2184,17 +2532,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
@@ -1575,7 +1747,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2206,43 +2566,20 @@
+@@ -2206,43 +2554,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -1626,7 +1798,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2296,24 +2633,16 @@
+@@ -2296,24 +2621,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -1659,7 +1831,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2339,10 +2668,10 @@
+@@ -2339,10 +2656,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.
@@ -1672,7 +1844,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2350,11 +2679,11 @@
+@@ -2350,11 +2667,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1688,7 +1860,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2391,7 +2720,7 @@
+@@ -2391,7 +2708,7 @@
;;
esac
@@ -1697,7 +1869,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2407,7 +2736,7 @@
+@@ -2407,7 +2724,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -1706,7 +1878,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2418,7 +2747,7 @@
+@@ -2418,7 +2735,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -1715,7 +1887,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2429,15 +2758,11 @@
+@@ -2429,15 +2746,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -1733,7 +1905,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2459,11 +2784,8 @@
+@@ -2459,11 +2772,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".
@@ -1747,7 +1919,7 @@
fi
test "$2" = conftest.file
-@@ -2472,13 +2794,10 @@
+@@ -2472,13 +2782,10 @@
# Ok.
:
else
@@ -1764,7 +1936,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2506,7 +2825,7 @@
+@@ -2506,7 +2813,7 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -1773,7 +1945,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2527,9 +2846,9 @@
+@@ -2527,9 +2834,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
@@ -1785,7 +1957,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2540,24 +2859,24 @@
+@@ -2540,24 +2847,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1815,7 +1987,7 @@
$as_echo "no" >&6; }
fi
-@@ -2567,9 +2886,9 @@
+@@ -2567,9 +2874,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
@@ -1827,7 +1999,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2580,24 +2899,24 @@
+@@ -2580,24 +2887,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1857,7 +2029,7 @@
$as_echo "no" >&6; }
fi
-@@ -2606,7 +2925,7 @@
+@@ -2606,7 +2913,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -1866,7 +2038,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2619,10 +2938,10 @@
+@@ -2619,10 +2926,10 @@
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -1879,7 +2051,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2630,7 +2949,7 @@
+@@ -2630,7 +2937,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1888,7 +2060,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 #(
-@@ -2642,7 +2961,7 @@
+@@ -2642,7 +2949,7 @@
esac
done
done
@@ -1897,7 +2069,7 @@
IFS=$as_save_IFS
fi
-@@ -2658,7 +2977,7 @@
+@@ -2658,7 +2965,7 @@
MKDIR_P="$ac_install_sh -d"
fi
fi
@@ -1906,7 +2078,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2671,9 +2990,9 @@
+@@ -2671,9 +2978,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
@@ -1918,7 +2090,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2684,24 +3003,24 @@
+@@ -2684,24 +2991,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1948,7 +2120,7 @@
$as_echo "no" >&6; }
fi
-@@ -2709,11 +3028,11 @@
+@@ -2709,11 +3016,11 @@
test -n "$AWK" && break
done
@@ -1962,7 +2134,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2731,11 +3050,11 @@
+@@ -2731,11 +3038,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -1976,7 +2148,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2755,9 +3074,7 @@
+@@ -2755,9 +3062,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -1987,16 +2159,16 @@
fi
fi
-@@ -2772,7 +3089,7 @@
+@@ -2772,7 +3077,7 @@
# Define the identity of the package.
- PACKAGE='epiphany'
+ PACKAGE='epiphany-browser'
- VERSION='2.28.0'
-
-
-@@ -2808,7 +3125,7 @@
+ VERSION='2.28.1'
+
+
+@@ -2808,7 +3113,7 @@
AMTAR=${AMTAR-"${am_missing_run}tar"}
@@ -2005,7 +2177,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'
-@@ -2881,13 +3198,13 @@
+@@ -2881,13 +3186,13 @@
done
rm -rf conftest.dir
@@ -2021,7 +2193,7 @@
$as_echo "$am_cv_prog_tar_ustar" >&6; }
-@@ -2897,7 +3214,7 @@
+@@ -2897,7 +3202,7 @@
# Use AM_SILENT_RULES if present
# Check whether --enable-silent-rules was given.
@@ -2030,7 +2202,7 @@
enableval=$enable_silent_rules;
fi
-@@ -2913,16 +3230,16 @@
+@@ -2913,16 +3218,16 @@
enable_maintainer_mode=yes
fi
@@ -2050,7 +2222,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2937,7 +3254,7 @@
+@@ -2937,7 +3242,7 @@
# Check whether --enable-shared was given.
@@ -2059,7 +2231,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -2968,7 +3285,7 @@
+@@ -2968,7 +3273,7 @@
# Check whether --enable-static was given.
@@ -2068,7 +2240,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -3005,7 +3322,7 @@
+@@ -3005,7 +3310,7 @@
case `pwd` in
*\ * | *\ *)
@@ -2077,7 +2249,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -3030,35 +3347,27 @@
+@@ -3030,35 +3335,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -2120,7 +2292,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -3074,28 +3383,24 @@
+@@ -3074,28 +3371,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -2154,7 +2326,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -3123,7 +3428,7 @@
+@@ -3123,7 +3416,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -2163,7 +2335,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -3151,12 +3456,12 @@
+@@ -3151,12 +3444,12 @@
fi
@@ -2178,7 +2350,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -3181,9 +3486,9 @@
+@@ -3181,9 +3474,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
@@ -2190,7 +2362,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3194,24 +3499,24 @@
+@@ -3194,24 +3487,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2220,7 +2392,7 @@
$as_echo "no" >&6; }
fi
-@@ -3221,9 +3526,9 @@
+@@ -3221,9 +3514,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
@@ -2232,7 +2404,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3234,24 +3539,24 @@
+@@ -3234,24 +3527,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2262,7 +2434,7 @@
$as_echo "no" >&6; }
fi
-@@ -3260,7 +3565,7 @@
+@@ -3260,7 +3553,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2271,7 +2443,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3274,9 +3579,9 @@
+@@ -3274,9 +3567,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
@@ -2283,7 +2455,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3287,24 +3592,24 @@
+@@ -3287,24 +3580,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2313,7 +2485,7 @@
$as_echo "no" >&6; }
fi
-@@ -3314,9 +3619,9 @@
+@@ -3314,9 +3607,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
@@ -2325,7 +2497,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3328,18 +3633,18 @@
+@@ -3328,18 +3621,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2347,7 +2519,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3358,10 +3663,10 @@
+@@ -3358,10 +3651,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2360,7 +2532,7 @@
$as_echo "no" >&6; }
fi
-@@ -3373,9 +3678,9 @@
+@@ -3373,9 +3666,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
@@ -2372,7 +2544,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3386,24 +3691,24 @@
+@@ -3386,24 +3679,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2402,7 +2574,7 @@
$as_echo "no" >&6; }
fi
-@@ -3417,9 +3722,9 @@
+@@ -3417,9 +3710,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
@@ -2414,7 +2586,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3430,24 +3735,24 @@
+@@ -3430,24 +3723,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2444,7 +2616,7 @@
$as_echo "no" >&6; }
fi
-@@ -3460,7 +3765,7 @@
+@@ -3460,7 +3753,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2453,7 +2625,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3471,73 +3776,55 @@
+@@ -3471,73 +3764,55 @@
fi
@@ -2552,7 +2724,7 @@
$as_echo_n "checking for C compiler default output file name... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-@@ -3554,17 +3841,17 @@
+@@ -3554,17 +3829,17 @@
done
rm -f $ac_rmfiles
@@ -2575,7 +2747,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,
-@@ -3581,7 +3868,7 @@
+@@ -3581,7 +3856,7 @@
# certainly right.
break;;
*.* )
@@ -2584,7 +2756,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3600,84 +3887,75 @@
+@@ -3600,84 +3875,75 @@
else
ac_file=''
fi
@@ -2645,11 +2817,11 @@
+ { { $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: cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
++as_fn_error "cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
-+as_fn_error "cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
+-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
@@ -2694,7 +2866,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
-@@ -3692,32 +3970,24 @@
+@@ -3692,32 +3958,24 @@
esac
done
else
@@ -2734,7 +2906,7 @@
/* end confdefs.h. */
int
-@@ -3729,17 +3999,17 @@
+@@ -3729,17 +3987,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -2757,7 +2929,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3752,31 +4022,23 @@
+@@ -3752,31 +4010,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2796,7 +2968,7 @@
/* end confdefs.h. */
int
-@@ -3790,37 +4052,16 @@
+@@ -3790,37 +4040,16 @@
return 0;
}
_ACEOF
@@ -2837,7 +3009,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3829,20 +4070,16 @@
+@@ -3829,20 +4058,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -2861,7 +3033,7 @@
/* end confdefs.h. */
int
-@@ -3853,35 +4090,11 @@
+@@ -3853,35 +4078,11 @@
return 0;
}
_ACEOF
@@ -2900,7 +3072,7 @@
/* end confdefs.h. */
int
-@@ -3892,36 +4105,12 @@
+@@ -3892,36 +4093,12 @@
return 0;
}
_ACEOF
@@ -2941,7 +3113,7 @@
/* end confdefs.h. */
int
-@@ -3932,42 +4121,17 @@
+@@ -3932,42 +4109,17 @@
return 0;
}
_ACEOF
@@ -2986,7 +3158,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3984,18 +4148,14 @@
+@@ -3984,18 +4136,14 @@
CFLAGS=
fi
fi
@@ -3008,7 +3180,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -4052,32 +4212,9 @@
+@@ -4052,32 +4200,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -3042,7 +3214,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -4088,17 +4225,19 @@
+@@ -4088,17 +4213,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -3065,7 +3237,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -4108,9 +4247,9 @@
+@@ -4108,9 +4235,9 @@
depcc="$CC" am_compiler_list=
@@ -3077,7 +3249,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4218,7 +4357,7 @@
+@@ -4218,7 +4345,7 @@
fi
fi
@@ -3086,7 +3258,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4233,9 +4372,9 @@
+@@ -4233,9 +4360,9 @@
fi
@@ -3098,7 +3270,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -4243,7 +4382,7 @@
+@@ -4243,7 +4370,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -3107,7 +3279,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -4252,7 +4391,7 @@
+@@ -4252,7 +4379,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3116,7 +3288,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
-@@ -4272,7 +4411,7 @@
+@@ -4272,7 +4399,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
@@ -3125,7 +3297,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"
-@@ -4287,19 +4426,17 @@
+@@ -4287,19 +4414,17 @@
$ac_path_SED_found && break 3
done
done
@@ -3148,7 +3320,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -4317,9 +4454,9 @@
+@@ -4317,9 +4442,9 @@
@@ -3160,7 +3332,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4330,7 +4467,7 @@
+@@ -4330,7 +4455,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3169,7 +3341,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
-@@ -4350,7 +4487,7 @@
+@@ -4350,7 +4475,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
@@ -3178,7 +3350,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"
-@@ -4365,26 +4502,24 @@
+@@ -4365,26 +4490,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -3210,7 +3382,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4398,7 +4533,7 @@
+@@ -4398,7 +4521,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3219,7 +3391,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
-@@ -4418,7 +4553,7 @@
+@@ -4418,7 +4541,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
@@ -3228,7 +3400,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"
-@@ -4433,12 +4568,10 @@
+@@ -4433,12 +4556,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -3243,7 +3415,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4446,14 +4579,14 @@
+@@ -4446,14 +4567,14 @@
fi
fi
@@ -3261,7 +3433,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -4467,7 +4600,7 @@
+@@ -4467,7 +4588,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3270,7 +3442,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
-@@ -4487,7 +4620,7 @@
+@@ -4487,7 +4608,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
@@ -3279,7 +3451,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"
-@@ -4502,12 +4635,10 @@
+@@ -4502,12 +4623,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -3294,7 +3466,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -4515,7 +4646,7 @@
+@@ -4515,7 +4634,7 @@
fi
fi
@@ -3303,7 +3475,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -4541,7 +4672,7 @@
+@@ -4541,7 +4660,7 @@
# Check whether --with-gnu-ld was given.
@@ -3312,7 +3484,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -4550,7 +4681,7 @@
+@@ -4550,7 +4669,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -3321,7 +3493,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -4580,13 +4711,13 @@
+@@ -4580,13 +4699,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -3338,7 +3510,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -4617,18 +4748,16 @@
+@@ -4617,18 +4736,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -3362,7 +3534,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -4641,7 +4770,7 @@
+@@ -4641,7 +4758,7 @@
;;
esac
fi
@@ -3371,7 +3543,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -4653,9 +4782,9 @@
+@@ -4653,9 +4770,9 @@
@@ -3383,7 +3555,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -4702,7 +4831,7 @@
+@@ -4702,7 +4819,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -3392,7 +3564,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -4713,9 +4842,9 @@
+@@ -4713,9 +4830,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
@@ -3404,7 +3576,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -4726,24 +4855,24 @@
+@@ -4726,24 +4843,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3434,7 +3606,7 @@
$as_echo "no" >&6; }
fi
-@@ -4757,9 +4886,9 @@
+@@ -4757,9 +4874,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
@@ -3446,7 +3618,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -4770,24 +4899,24 @@
+@@ -4770,24 +4887,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3476,7 +3648,7 @@
$as_echo "no" >&6; }
fi
-@@ -4800,7 +4929,7 @@
+@@ -4800,7 +4917,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3485,7 +3657,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4820,44 +4949,44 @@
+@@ -4820,44 +4937,44 @@
@@ -3499,15 +3671,15 @@
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4830: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:4959: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:4947: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4833: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:4962: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:4950: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4836: output\"" >&5)
-+ (eval echo "\"\$as_me:4965: output\"" >&5)
++ (eval echo "\"\$as_me:4953: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -3541,7 +3713,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -4975,10 +5104,10 @@
+@@ -4975,10 +5092,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -3554,7 +3726,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -4992,7 +5121,7 @@
+@@ -4992,7 +5109,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -3563,7 +3735,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -5002,17 +5131,17 @@
+@@ -5002,17 +5119,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -3584,7 +3756,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -5047,14 +5176,14 @@
+@@ -5047,14 +5164,14 @@
@@ -3602,7 +3774,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -5083,9 +5212,9 @@
+@@ -5083,9 +5200,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
@@ -3614,7 +3786,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -5096,24 +5225,24 @@
+@@ -5096,24 +5213,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3644,7 +3816,7 @@
$as_echo "no" >&6; }
fi
-@@ -5123,9 +5252,9 @@
+@@ -5123,9 +5240,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
@@ -3656,7 +3828,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -5136,24 +5265,24 @@
+@@ -5136,24 +5253,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3686,7 +3858,7 @@
$as_echo "no" >&6; }
fi
-@@ -5162,7 +5291,7 @@
+@@ -5162,7 +5279,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3695,7 +3867,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5182,9 +5311,9 @@
+@@ -5182,9 +5299,9 @@
@@ -3707,7 +3879,16 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -5378,7 +5507,7 @@
+@@ -5303,7 +5420,7 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ 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
+@@ -5378,7 +5495,7 @@
esac
fi
@@ -3716,7 +3897,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
-@@ -5398,9 +5527,9 @@
+@@ -5398,9 +5515,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
@@ -3728,7 +3909,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -5411,24 +5540,24 @@
+@@ -5411,24 +5528,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3758,7 +3939,7 @@
$as_echo "no" >&6; }
fi
-@@ -5438,9 +5567,9 @@
+@@ -5438,9 +5555,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
@@ -3770,7 +3951,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -5451,24 +5580,24 @@
+@@ -5451,24 +5568,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3800,7 +3981,7 @@
$as_echo "no" >&6; }
fi
-@@ -5477,7 +5606,7 @@
+@@ -5477,7 +5594,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3809,7 +3990,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5503,9 +5632,9 @@
+@@ -5503,9 +5620,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
@@ -3821,7 +4002,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -5516,24 +5645,24 @@
+@@ -5516,24 +5633,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3851,7 +4032,7 @@
$as_echo "no" >&6; }
fi
-@@ -5543,9 +5672,9 @@
+@@ -5543,9 +5660,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
@@ -3863,7 +4044,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -5556,24 +5685,24 @@
+@@ -5556,24 +5673,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3893,7 +4074,7 @@
$as_echo "no" >&6; }
fi
-@@ -5582,7 +5711,7 @@
+@@ -5582,7 +5699,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3902,7 +4083,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5602,9 +5731,9 @@
+@@ -5602,9 +5719,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
@@ -3914,7 +4095,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -5615,24 +5744,24 @@
+@@ -5615,24 +5732,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3944,7 +4125,7 @@
$as_echo "no" >&6; }
fi
-@@ -5642,9 +5771,9 @@
+@@ -5642,9 +5759,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
@@ -3956,7 +4137,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -5655,24 +5784,24 @@
+@@ -5655,24 +5772,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3986,7 +4167,7 @@
$as_echo "no" >&6; }
fi
-@@ -5681,7 +5810,7 @@
+@@ -5681,7 +5798,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3995,7 +4176,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5759,9 +5888,9 @@
+@@ -5759,9 +5876,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -4007,7 +4188,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -5877,18 +6006,18 @@
+@@ -5877,18 +5994,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -4032,7 +4213,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -5941,11 +6070,11 @@
+@@ -5941,11 +6058,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -4047,7 +4228,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -5979,10 +6108,10 @@
+@@ -5979,10 +6096,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
@@ -4060,7 +4241,7 @@
$as_echo "ok" >&6; }
fi
-@@ -6009,7 +6138,7 @@
+@@ -6009,7 +6126,7 @@
# Check whether --enable-libtool-lock was given.
@@ -4069,7 +4250,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -6021,11 +6150,11 @@
+@@ -6021,11 +6138,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4084,13 +4265,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -6039,12 +6168,12 @@
+@@ -6039,12 +6156,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6042 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 6171 "configure"' > conftest.$ac_ext
++ echo '#line 6159 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4101,7 +4282,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -6078,11 +6207,11 @@
+@@ -6078,11 +6195,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4116,7 +4297,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -6131,9 +6260,9 @@
+@@ -6131,9 +6248,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -4128,7 +4309,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -6142,11 +6271,7 @@
+@@ -6142,11 +6259,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4141,7 +4322,7 @@
/* end confdefs.h. */
int
-@@ -6157,38 +6282,13 @@
+@@ -6157,38 +6270,13 @@
return 0;
}
_ACEOF
@@ -4184,7 +4365,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -6196,7 +6296,7 @@
+@@ -6196,7 +6284,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -4193,7 +4374,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
-@@ -6206,11 +6306,11 @@
+@@ -6206,11 +6294,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4208,7 +4389,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -6236,9 +6336,9 @@
+@@ -6236,9 +6324,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
@@ -4220,7 +4401,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -6249,24 +6349,24 @@
+@@ -6249,24 +6337,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4250,7 +4431,7 @@
$as_echo "no" >&6; }
fi
-@@ -6276,9 +6376,9 @@
+@@ -6276,9 +6364,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
@@ -4262,7 +4443,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -6289,24 +6389,24 @@
+@@ -6289,24 +6377,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4292,7 +4473,7 @@
$as_echo "no" >&6; }
fi
-@@ -6315,7 +6415,7 @@
+@@ -6315,7 +6403,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4301,7 +4482,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6328,9 +6428,9 @@
+@@ -6328,9 +6416,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
@@ -4313,7 +4494,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -6341,24 +6441,24 @@
+@@ -6341,24 +6429,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4343,7 +4524,7 @@
$as_echo "no" >&6; }
fi
-@@ -6368,9 +6468,9 @@
+@@ -6368,9 +6456,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
@@ -4355,7 +4536,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -6381,24 +6481,24 @@
+@@ -6381,24 +6469,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4385,7 +4566,7 @@
$as_echo "no" >&6; }
fi
-@@ -6407,7 +6507,7 @@
+@@ -6407,7 +6495,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4394,7 +4575,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6420,9 +6520,9 @@
+@@ -6420,9 +6508,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
@@ -4406,7 +4587,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -6433,24 +6533,24 @@
+@@ -6433,24 +6521,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4436,7 +4617,7 @@
$as_echo "no" >&6; }
fi
-@@ -6460,9 +6560,9 @@
+@@ -6460,9 +6548,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
@@ -4448,7 +4629,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -6473,24 +6573,24 @@
+@@ -6473,24 +6561,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4478,7 +4659,7 @@
$as_echo "no" >&6; }
fi
-@@ -6499,7 +6599,7 @@
+@@ -6499,7 +6587,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4487,7 +4668,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6512,9 +6612,9 @@
+@@ -6512,9 +6600,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
@@ -4499,7 +4680,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -6525,24 +6625,24 @@
+@@ -6525,24 +6613,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4529,7 +4710,7 @@
$as_echo "no" >&6; }
fi
-@@ -6552,9 +6652,9 @@
+@@ -6552,9 +6640,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
@@ -4541,7 +4722,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -6565,24 +6665,24 @@
+@@ -6565,24 +6653,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4571,7 +4752,7 @@
$as_echo "no" >&6; }
fi
-@@ -6591,7 +6691,7 @@
+@@ -6591,7 +6679,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4580,7 +4761,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6604,9 +6704,9 @@
+@@ -6604,9 +6692,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
@@ -4592,7 +4773,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -6617,24 +6717,24 @@
+@@ -6617,24 +6705,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4622,7 +4803,7 @@
$as_echo "no" >&6; }
fi
-@@ -6644,9 +6744,9 @@
+@@ -6644,9 +6732,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
@@ -4634,7 +4815,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -6657,24 +6757,24 @@
+@@ -6657,24 +6745,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4664,7 +4845,7 @@
$as_echo "no" >&6; }
fi
-@@ -6683,7 +6783,7 @@
+@@ -6683,7 +6771,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4673,7 +4854,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6719,9 +6819,9 @@
+@@ -6719,9 +6807,9 @@
@@ -4685,7 +4866,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -6746,22 +6846,18 @@
+@@ -6746,22 +6834,18 @@
rm -f conftest.*
fi
fi
@@ -4712,7 +4893,7 @@
/* end confdefs.h. */
int
-@@ -6772,42 +6868,17 @@
+@@ -6772,42 +6856,17 @@
return 0;
}
_ACEOF
@@ -4760,7 +4941,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -6849,14 +6920,14 @@
+@@ -6849,14 +6908,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
@@ -4777,7 +4958,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -6871,11 +6942,7 @@
+@@ -6871,11 +6930,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.
@@ -4790,7 +4971,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -6884,78 +6951,34 @@
+@@ -6884,78 +6939,34 @@
#endif
Syntax error
_ACEOF
@@ -4874,7 +5055,7 @@
break
fi
-@@ -6967,7 +6990,7 @@
+@@ -6967,7 +6978,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -4883,7 +5064,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -6978,11 +7001,7 @@
+@@ -6978,11 +6989,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.
@@ -4896,7 +5077,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -6991,87 +7010,40 @@
+@@ -6991,87 +6998,40 @@
#endif
Syntax error
_ACEOF
@@ -4993,7 +5174,7 @@
fi
ac_ext=c
-@@ -7081,16 +7053,12 @@
+@@ -7081,16 +7041,12 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -5013,7 +5194,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -7105,48 +7073,23 @@
+@@ -7105,48 +7061,23 @@
return 0;
}
_ACEOF
@@ -5067,7 +5248,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -7156,18 +7099,14 @@
+@@ -7156,18 +7087,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -5089,7 +5270,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -7177,14 +7116,10 @@
+@@ -7177,14 +7104,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -5106,7 +5287,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -7211,118 +7146,34 @@
+@@ -7211,181 +7134,34 @@
return 0;
}
_ACEOF
@@ -5137,46 +5318,39 @@
- $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
-+if ac_fn_c_try_run "$LINENO"; then :
-
+-
-( exit $ac_status )
-ac_cv_header_stdc=no
-+else
-+ ac_cv_header_stdc=no
- fi
+-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
- fi
+-fi
+-
+-
+-fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+{ $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 "$ac_cv_header_stdc" >&6; }
+-if test $ac_cv_header_stdc = yes; then
+-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
- fi
-
- # 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
+-
+-fi
+-
+-# 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`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -5229,21 +5403,17 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_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
-@@ -7332,62 +7183,13 @@
- done
-
-
--
- for ac_header in dlfcn.h
+- 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
@@ -5258,7 +5428,8 @@
-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
@@ -5280,15 +5451,26 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
--else
+ 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
++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
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -5296,17 +5478,41 @@
-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
+@@ -7395,6 +7171,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
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++ cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
- _ACEOF
-
- fi
-@@ -7408,7 +7210,7 @@
++_ACEOF
++
++fi
++
++done
++
++
+
+ # Set options
+
+@@ -7408,7 +7198,7 @@
# Check whether --with-pic was given.
@@ -5315,7 +5521,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -7424,7 +7226,7 @@
+@@ -7424,7 +7214,7 @@
# Check whether --enable-fast-install was given.
@@ -5324,7 +5530,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -7505,9 +7307,9 @@
+@@ -7505,9 +7295,9 @@
setopt NO_GLOB_SUBST
fi
@@ -5336,7 +5542,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -7520,7 +7322,7 @@
+@@ -7520,7 +7310,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -5345,7 +5551,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -7613,9 +7415,9 @@
+@@ -7613,9 +7403,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -5357,7 +5563,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -7666,10 +7468,10 @@
+@@ -7666,10 +7456,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -5370,7 +5576,7 @@
$as_echo "no" >&6; }
fi
-@@ -7679,9 +7481,9 @@
+@@ -7679,9 +7469,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -5382,7 +5588,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -7732,10 +7534,10 @@
+@@ -7732,10 +7522,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -5395,7 +5601,7 @@
$as_echo "no" >&6; }
fi
-@@ -7816,9 +7618,9 @@
+@@ -7816,9 +7606,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -5407,21 +5613,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -7834,11 +7636,11 @@
+@@ -7834,11 +7624,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:7837: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7639: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7627: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7841: \$? = $ac_status" >&5
-+ echo "$as_me:7643: \$? = $ac_status" >&5
++ echo "$as_me:7631: \$? = $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.
-@@ -7851,7 +7653,7 @@
+@@ -7851,7 +7641,7 @@
$RM conftest*
fi
@@ -5430,7 +5636,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -7871,7 +7673,7 @@
+@@ -7871,7 +7661,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -5439,7 +5645,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -8143,7 +7945,7 @@
+@@ -8143,7 +7933,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -5448,7 +5654,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -8155,9 +7957,9 @@
+@@ -8155,9 +7945,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -5460,21 +5666,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -8173,11 +7975,11 @@
+@@ -8173,11 +7963,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:8176: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7978: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7966: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8180: \$? = $ac_status" >&5
-+ echo "$as_me:7982: \$? = $ac_status" >&5
++ echo "$as_me:7970: \$? = $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.
-@@ -8190,7 +7992,7 @@
+@@ -8190,7 +7980,7 @@
$RM conftest*
fi
@@ -5483,7 +5689,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -8214,9 +8016,9 @@
+@@ -8214,9 +8004,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -5495,7 +5701,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -8242,7 +8044,7 @@
+@@ -8242,7 +8032,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -5504,7 +5710,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -8257,9 +8059,9 @@
+@@ -8257,9 +8047,9 @@
@@ -5516,21 +5722,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8278,11 +8080,11 @@
+@@ -8278,11 +8068,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:8281: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8083: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8071: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8285: \$? = $ac_status" >&5
-+ echo "$as_me:8087: \$? = $ac_status" >&5
++ echo "$as_me:8075: \$? = $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
-@@ -8304,7 +8106,7 @@
+@@ -8304,7 +8094,7 @@
$RM conftest*
fi
@@ -5539,7 +5745,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -8312,9 +8114,9 @@
+@@ -8312,9 +8102,9 @@
@@ -5551,21 +5757,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8333,11 +8135,11 @@
+@@ -8333,11 +8123,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:8336: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8138: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8126: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8340: \$? = $ac_status" >&5
-+ echo "$as_me:8142: \$? = $ac_status" >&5
++ echo "$as_me:8130: \$? = $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
-@@ -8359,7 +8161,7 @@
+@@ -8359,7 +8149,7 @@
$RM conftest*
fi
@@ -5574,7 +5780,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -8368,7 +8170,7 @@
+@@ -8368,7 +8158,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
@@ -5583,7 +5789,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -8376,10 +8178,10 @@
+@@ -8376,10 +8166,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
@@ -5596,7 +5802,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -8392,7 +8194,7 @@
+@@ -8392,7 +8182,7 @@
@@ -5605,7 +5811,34 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -8834,11 +8636,7 @@
+@@ -8452,6 +8242,9 @@
+ openbsd*)
+ with_gnu_ld=no
+ ;;
++ linux* | k*bsd*-gnu)
++ link_all_deplibs=no
++ ;;
+ esac
+
+ ld_shlibs=yes
+@@ -8634,7 +8427,7 @@
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -8809,6 +8602,7 @@
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
++ link_all_deplibs=no
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -8834,11 +8628,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -5618,7 +5851,7 @@
/* end confdefs.h. */
int
-@@ -8849,27 +8647,7 @@
+@@ -8849,27 +8639,7 @@
return 0;
}
_ACEOF
@@ -5647,7 +5880,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -8883,16 +8661,9 @@
+@@ -8883,16 +8653,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
@@ -5666,7 +5899,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -8905,11 +8676,7 @@
+@@ -8905,11 +8668,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -5679,7 +5912,7 @@
/* end confdefs.h. */
int
-@@ -8920,27 +8687,7 @@
+@@ -8920,27 +8679,7 @@
return 0;
}
_ACEOF
@@ -5708,7 +5941,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -8954,16 +8701,9 @@
+@@ -8954,16 +8693,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -5727,7 +5960,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -9175,42 +8915,16 @@
+@@ -9175,42 +8907,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -5775,7 +6008,16 @@
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'
-@@ -9466,7 +9180,7 @@
+@@ -9223,7 +8929,7 @@
+ link_all_deplibs=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -9466,7 +9172,7 @@
fi
fi
@@ -5784,7 +6026,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -9503,16 +9217,16 @@
+@@ -9503,16 +9209,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.
@@ -5805,7 +6047,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -9526,11 +9240,11 @@
+@@ -9526,11 +9232,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -5820,7 +6062,7 @@
then
archive_cmds_need_lc=no
else
-@@ -9541,7 +9255,7 @@
+@@ -9541,7 +9247,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -5829,7 +6071,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -9705,7 +9419,7 @@
+@@ -9705,7 +9411,7 @@
@@ -5838,7 +6080,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -10127,11 +9841,7 @@
+@@ -10127,11 +9833,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -5851,7 +6093,7 @@
/* end confdefs.h. */
int
-@@ -10142,41 +9852,13 @@
+@@ -10142,41 +9844,13 @@
return 0;
}
_ACEOF
@@ -5897,7 +6139,41 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -10391,7 +10073,7 @@
+@@ -10185,13 +9859,10 @@
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # Add ABI-specific directories to the system library path.
+- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -10203,6 +9874,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -10391,7 +10074,7 @@
dynamic_linker=no
;;
esac
@@ -5906,7 +6182,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -10493,7 +10175,7 @@
+@@ -10493,7 +10176,7 @@
@@ -5915,7 +6191,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -10518,7 +10200,7 @@
+@@ -10518,7 +10201,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -5924,7 +6200,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -10563,18 +10245,14 @@
+@@ -10563,18 +10246,14 @@
darwin*)
# if libdl is installed we need to link against it
@@ -5946,7 +6222,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10592,43 +10270,18 @@
+@@ -10592,43 +10271,18 @@
return 0;
}
_ACEOF
@@ -5996,31 +6272,21 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -10641,33 +10294,19 @@
+@@ -10641,106 +10295,18 @@
;;
*)
- { $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
-+ 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
+- $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
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
@@ -6037,84 +6303,6 @@
-#endif
-
-#undef shl_load
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -10676,13 +10315,6 @@
- extern "C"
- #endif
- char shl_load ();
--/* 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_shl_load || defined __stub___shl_load
--choke me
--#endif
--
- int
- main ()
- {
-@@ -10691,212 +10323,32 @@
- 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_shl_load=yes
-+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_shl_load=no
-+ 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
-+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_shl_load" >&5
--$as_echo "$ac_cv_func_shl_load" >&6; }
--if test "x$ac_cv_func_shl_load" = x""yes; then
-- lt_cv_dlopen="shl_load"
--else
-- { $as_echo "$as_me:$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 >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_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
@@ -6123,6 +6311,13 @@
-extern "C"
-#endif
-char shl_load ();
+-/* 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_shl_load || defined __stub___shl_load
+-choke me
+-#endif
+-
-int
-main ()
-{
@@ -6152,19 +6347,85 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_dld_shl_load=yes
+- ac_cv_func_shl_load=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_func_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
--LIBS=$ac_check_lib_save_LIBS
-fi
+-{ $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
+- { $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; }
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++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 >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.
+@@ -10758,145 +10324,32 @@
+ 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 :
+ ac_cv_lib_dld_shl_load=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
+ 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
-{ $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; }
@@ -6280,7 +6541,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10914,57 +10366,28 @@
+@@ -10914,57 +10367,28 @@
return 0;
}
_ACEOF
@@ -6347,7 +6608,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10982,57 +10405,28 @@
+@@ -10982,57 +10406,28 @@
return 0;
}
_ACEOF
@@ -6414,7 +6675,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11050,43 +10444,18 @@
+@@ -11050,43 +10445,18 @@
return 0;
}
_ACEOF
@@ -6464,7 +6725,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -11125,9 +10494,9 @@
+@@ -11125,9 +10495,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -6476,16 +6737,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11136,7 +10505,7 @@
+@@ -11136,7 +10506,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11139 "configure"
-+#line 10508 "configure"
++#line 10509 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11195,11 +10564,11 @@
+@@ -11195,11 +10565,11 @@
return status;
}
_LT_EOF
@@ -6500,7 +6761,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -11216,14 +10585,14 @@
+@@ -11216,14 +10586,14 @@
fi
@@ -6518,16 +6779,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11232,7 +10601,7 @@
+@@ -11232,7 +10602,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11235 "configure"
-+#line 10604 "configure"
++#line 10605 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11291,11 +10660,11 @@
+@@ -11291,11 +10661,11 @@
return status;
}
_LT_EOF
@@ -6542,7 +6803,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -11312,7 +10681,7 @@
+@@ -11312,7 +10682,7 @@
fi
@@ -6551,7 +6812,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -11351,12 +10720,12 @@
+@@ -11351,12 +10721,12 @@
striplib=
old_striplib=
@@ -6566,7 +6827,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -11365,15 +10734,15 @@
+@@ -11365,15 +10735,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -6585,7 +6846,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -11391,12 +10760,12 @@
+@@ -11391,12 +10761,12 @@
# Report which library types will actually be built
@@ -6601,7 +6862,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -11417,14 +10786,14 @@
+@@ -11417,14 +10787,14 @@
fi
;;
esac
@@ -6619,7 +6880,7 @@
$as_echo "$enable_static" >&6; }
-@@ -11465,9 +10834,9 @@
+@@ -11465,9 +10835,9 @@
# Josh Triplett <josh at freedesktop.org>
# Extract the first word of "bash", so it can be a program name with args.
set dummy bash; ac_word=$2
@@ -6631,7 +6892,7 @@
$as_echo_n "(cached) " >&6
else
case $DOLT_BASH in
-@@ -11480,14 +10849,14 @@
+@@ -11480,14 +10850,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6649,7 +6910,7 @@
IFS=$as_save_IFS
;;
-@@ -11495,15 +10864,15 @@
+@@ -11495,15 +10865,15 @@
fi
DOLT_BASH=$ac_cv_path_DOLT_BASH
if test -n "$DOLT_BASH"; then
@@ -6668,7 +6929,7 @@
$as_echo_n "checking if dolt supports this host... " >&6; }
dolt_supported=yes
if test x$DOLT_BASH = x; then
-@@ -11525,12 +10894,12 @@
+@@ -11525,12 +10895,12 @@
;;
esac
if test x$dolt_supported = xno ; then
@@ -6683,7 +6944,7 @@
$as_echo "yes, replacing libtool" >&6; }
cat <<__DOLTCOMPILE__EOF__ >doltcompile
-@@ -11658,17 +11027,13 @@
+@@ -11658,17 +11028,13 @@
# end dolt
@@ -6704,7 +6965,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11693,54 +11058,27 @@
+@@ -11693,54 +11059,27 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -6767,7 +7028,7 @@
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-@@ -11753,9 +11091,9 @@
+@@ -11753,9 +11092,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
@@ -6779,7 +7040,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11766,24 +11104,24 @@
+@@ -11766,24 +11105,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6809,7 +7070,7 @@
$as_echo "no" >&6; }
fi
-@@ -11793,9 +11131,9 @@
+@@ -11793,9 +11132,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
@@ -6821,7 +7082,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -11806,24 +11144,24 @@
+@@ -11806,24 +11145,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6851,7 +7112,7 @@
$as_echo "no" >&6; }
fi
-@@ -11832,7 +11170,7 @@
+@@ -11832,7 +11171,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6860,7 +7121,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -11846,9 +11184,9 @@
+@@ -11846,9 +11185,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
@@ -6872,7 +7133,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11859,24 +11197,24 @@
+@@ -11859,24 +11198,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6902,7 +7163,7 @@
$as_echo "no" >&6; }
fi
-@@ -11886,9 +11224,9 @@
+@@ -11886,9 +11225,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
@@ -6914,7 +7175,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11900,18 +11238,18 @@
+@@ -11900,18 +11239,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6936,7 +7197,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -11930,10 +11268,10 @@
+@@ -11930,10 +11269,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -6949,7 +7210,7 @@
$as_echo "no" >&6; }
fi
-@@ -11945,9 +11283,9 @@
+@@ -11945,9 +11284,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
@@ -6961,7 +7222,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11958,24 +11296,24 @@
+@@ -11958,24 +11297,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6991,7 +7252,7 @@
$as_echo "no" >&6; }
fi
-@@ -11989,9 +11327,9 @@
+@@ -11989,9 +11328,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
@@ -7003,7 +7264,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -12002,24 +11340,24 @@
+@@ -12002,24 +11341,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7033,7 +7294,7 @@
$as_echo "no" >&6; }
fi
-@@ -12032,7 +11370,7 @@
+@@ -12032,7 +11371,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7042,7 +7303,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -12043,62 +11381,42 @@
+@@ -12043,62 +11382,42 @@
fi
@@ -7127,7 +7388,7 @@
/* end confdefs.h. */
int
-@@ -12112,37 +11430,16 @@
+@@ -12112,37 +11431,16 @@
return 0;
}
_ACEOF
@@ -7168,7 +7429,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -12151,20 +11448,16 @@
+@@ -12151,20 +11449,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -7192,7 +7453,7 @@
/* end confdefs.h. */
int
-@@ -12175,35 +11468,11 @@
+@@ -12175,35 +11469,11 @@
return 0;
}
_ACEOF
@@ -7231,7 +7492,7 @@
/* end confdefs.h. */
int
-@@ -12214,36 +11483,12 @@
+@@ -12214,36 +11484,12 @@
return 0;
}
_ACEOF
@@ -7272,7 +7533,7 @@
/* end confdefs.h. */
int
-@@ -12254,42 +11499,17 @@
+@@ -12254,42 +11500,17 @@
return 0;
}
_ACEOF
@@ -7317,7 +7578,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -12306,18 +11526,14 @@
+@@ -12306,18 +11527,14 @@
CFLAGS=
fi
fi
@@ -7339,7 +7600,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -12374,32 +11590,9 @@
+@@ -12374,32 +11591,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -7373,7 +7634,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -12410,17 +11603,19 @@
+@@ -12410,17 +11604,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -7396,7 +7657,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -12430,9 +11625,9 @@
+@@ -12430,9 +11626,9 @@
depcc="$CC" am_compiler_list=
@@ -7408,7 +7669,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -12540,7 +11735,7 @@
+@@ -12540,7 +11736,7 @@
fi
fi
@@ -7417,7 +7678,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -12563,9 +11758,9 @@
+@@ -12563,9 +11759,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
@@ -7429,7 +7690,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12576,24 +11771,24 @@
+@@ -12576,24 +11772,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7459,7 +7720,7 @@
$as_echo "no" >&6; }
fi
-@@ -12603,9 +11798,9 @@
+@@ -12603,9 +11799,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
@@ -7471,7 +7732,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -12616,24 +11811,24 @@
+@@ -12616,24 +11812,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7501,7 +7762,7 @@
$as_echo "no" >&6; }
fi
-@@ -12642,7 +11837,7 @@
+@@ -12642,7 +11838,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7510,7 +7771,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -12656,9 +11851,9 @@
+@@ -12656,9 +11852,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
@@ -7522,7 +7783,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12669,24 +11864,24 @@
+@@ -12669,24 +11865,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7552,7 +7813,7 @@
$as_echo "no" >&6; }
fi
-@@ -12696,9 +11891,9 @@
+@@ -12696,9 +11892,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
@@ -7564,7 +7825,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12710,18 +11905,18 @@
+@@ -12710,18 +11906,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7586,7 +7847,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -12740,10 +11935,10 @@
+@@ -12740,10 +11936,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7599,7 +7860,7 @@
$as_echo "no" >&6; }
fi
-@@ -12755,9 +11950,9 @@
+@@ -12755,9 +11951,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
@@ -7611,7 +7872,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12768,24 +11963,24 @@
+@@ -12768,24 +11964,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7641,7 +7902,7 @@
$as_echo "no" >&6; }
fi
-@@ -12799,9 +11994,9 @@
+@@ -12799,9 +11995,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
@@ -7653,7 +7914,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -12812,24 +12007,24 @@
+@@ -12812,24 +12008,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7683,7 +7944,7 @@
$as_echo "no" >&6; }
fi
-@@ -12842,7 +12037,7 @@
+@@ -12842,7 +12038,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7692,7 +7953,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -12853,62 +12048,42 @@
+@@ -12853,62 +12049,42 @@
fi
@@ -7713,14 +7974,19 @@
set X $ac_compile
ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
++for ac_option in --version -v -V -qversion; do
++ { { ac_try="$ac_compiler $ac_option >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler --version >&5") 2>&5
-- ac_status=$?
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
@@ -7735,19 +8001,14 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-+for ac_option in --version -v -V -qversion; do
-+ { { ac_try="$ac_compiler $ac_option >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -V >&5") 2>&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
+- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ if test -s conftest.err; then
@@ -7777,7 +8038,7 @@
/* end confdefs.h. */
int
-@@ -12922,37 +12097,16 @@
+@@ -12922,37 +12098,16 @@
return 0;
}
_ACEOF
@@ -7818,7 +8079,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -12961,20 +12115,16 @@
+@@ -12961,20 +12116,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -7842,87 +8103,7 @@
/* end confdefs.h. */
int
-@@ -12985,35 +12135,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
-@@ -13024,36 +12150,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
-@@ -13064,42 +12166,17 @@
+@@ -12985,75 +12136,11 @@
return 0;
}
_ACEOF
@@ -7950,7 +8131,101 @@
- $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
+@@ -13064,42 +12151,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
@@ -7967,7 +8242,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -13116,18 +12193,14 @@
+@@ -13116,18 +12194,14 @@
CFLAGS=
fi
fi
@@ -7989,7 +8264,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -13184,32 +12257,9 @@
+@@ -13184,32 +12258,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -8023,7 +8298,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -13220,17 +12270,19 @@
+@@ -13220,17 +12271,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -8046,7 +8321,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -13240,9 +12292,9 @@
+@@ -13240,9 +12293,9 @@
depcc="$CC" am_compiler_list=
@@ -8058,7 +8333,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -13350,7 +12402,7 @@
+@@ -13350,7 +12403,7 @@
fi
fi
@@ -8067,7 +8342,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -13368,16 +12420,12 @@
+@@ -13368,16 +12421,12 @@
am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
@@ -8087,7 +8362,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -13392,48 +12440,23 @@
+@@ -13392,48 +12441,23 @@
return 0;
}
_ACEOF
@@ -8141,7 +8416,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -13443,18 +12466,14 @@
+@@ -13443,18 +12467,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -8163,7 +8438,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -13464,14 +12483,10 @@
+@@ -13464,14 +12484,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -8180,7 +8455,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -13498,60 +12513,31 @@
+@@ -13498,60 +12514,31 @@
return 0;
}
_ACEOF
@@ -8250,7 +8525,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -13564,14 +12550,14 @@
+@@ -13564,14 +12551,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8268,7 +8543,7 @@
IFS=$as_save_IFS
;;
-@@ -13579,19 +12565,19 @@
+@@ -13579,19 +12566,19 @@
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -8292,7 +8567,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_MKENUMS in
-@@ -13604,14 +12590,14 @@
+@@ -13604,14 +12591,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8310,7 +8585,7 @@
IFS=$as_save_IFS
;;
-@@ -13619,26 +12605,26 @@
+@@ -13619,26 +12606,26 @@
fi
GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
if test -n "$GLIB_MKENUMS"; then
@@ -8342,7 +8617,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -13646,35 +12632,31 @@
+@@ -13646,35 +12633,31 @@
case "$am__api_version" in
1.01234)
@@ -8384,7 +8659,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -13687,14 +12669,14 @@
+@@ -13687,14 +12670,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8402,7 +8677,7 @@
IFS=$as_save_IFS
;;
-@@ -13702,19 +12684,19 @@
+@@ -13702,19 +12685,19 @@
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -8426,7 +8701,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -13727,14 +12709,14 @@
+@@ -13727,14 +12710,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8444,7 +8719,7 @@
IFS=$as_save_IFS
;;
-@@ -13742,19 +12724,19 @@
+@@ -13742,19 +12725,19 @@
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -8468,7 +8743,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -13767,14 +12749,14 @@
+@@ -13767,14 +12750,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8486,7 +8761,7 @@
IFS=$as_save_IFS
;;
-@@ -13782,18 +12764,16 @@
+@@ -13782,18 +12765,16 @@
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -8508,7 +8783,86 @@
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 $< $@'
-@@ -13839,9 +12819,9 @@
+@@ -13836,12 +12817,88 @@
+
+
+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
# 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
@@ -8520,7 +8874,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -13854,14 +12834,14 @@
+@@ -13854,14 +12911,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8538,7 +8892,7 @@
IFS=$as_save_IFS
;;
-@@ -13869,19 +12849,19 @@
+@@ -13869,19 +12926,19 @@
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -8562,7 +8916,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -13894,14 +12874,14 @@
+@@ -13894,14 +12951,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8580,7 +8934,7 @@
IFS=$as_save_IFS
;;
-@@ -13909,19 +12889,19 @@
+@@ -13909,19 +12966,19 @@
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -8604,7 +8958,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -13934,14 +12914,14 @@
+@@ -13934,14 +12991,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8622,7 +8976,7 @@
IFS=$as_save_IFS
;;
-@@ -13949,19 +12929,19 @@
+@@ -13949,19 +13006,19 @@
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -8646,7 +9000,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -13974,14 +12954,14 @@
+@@ -13974,14 +13031,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8664,7 +9018,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -13990,33 +12970,29 @@
+@@ -13990,33 +13047,29 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -8704,7 +9058,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -14029,14 +13005,14 @@
+@@ -14029,14 +13082,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8722,7 +9076,7 @@
IFS=$as_save_IFS
;;
-@@ -14044,34 +13020,28 @@
+@@ -14044,173 +13097,63 @@
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -8740,13 +9094,22 @@
- { { $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; }; }
-+ as_fn_error "perl not found; required for intltool" "$LINENO" 5
- fi
- if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+-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;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "perl 5.x required for intltool" "$LINENO" 5
++ as_fn_error "perl not found" "$LINENO" 5
++fi
++{ $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_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
++else
++ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
++$as_echo "$IT_PERL_VERSION" >&6; }
fi
if test "x" != "xno-xml"; then
- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
@@ -8762,106 +9125,26 @@
- { (exit 1); exit 1; }; }
+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
fi
- fi
-
-@@ -14081,11 +13051,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
-@@ -14097,136 +13063,27 @@
- 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
-+ 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
+-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
- 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
-+ DATADIRNAME=lib
-+fi
-
--/* 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 ()
-{
--return bind_textdomain_codeset ();
+-extern int _nl_msg_cat_cntr;
+- return _nl_msg_cat_cntr
- ;
- return 0;
-}
@@ -8887,894 +9170,30 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_func_bind_textdomain_codeset=yes
+- DATADIRNAME=share
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_func_bind_textdomain_codeset=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
--{ $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
-- DATADIRNAME=share
+- 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
-- DATADIRNAME=lib
--fi
--
-- ;;
-- *)
-- DATADIRNAME=lib
-- ;;
-- esac
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
-+ ;;
-+ *)
-+ DATADIRNAME=lib
-+ ;;
-+ esac
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-
-
-
-@@ -14239,9 +13096,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
--{ $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_PKG_CONFIG+set}" = set; then
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $PKG_CONFIG in
-@@ -14254,14 +13111,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_PKG_CONFIG="$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
-
- ;;
-@@ -14269,10 +13126,10 @@
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
- $as_echo "$PKG_CONFIG" >&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
-
-@@ -14282,9 +13139,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
--{ $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_ac_pt_PKG_CONFIG+set}" = set; then
-+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $ac_pt_PKG_CONFIG in
-@@ -14297,14 +13154,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_ac_pt_PKG_CONFIG="$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
-
- ;;
-@@ -14312,10 +13169,10 @@
- fi
- ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
- if test -n "$ac_pt_PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
- $as_echo "$ac_pt_PKG_CONFIG" >&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
-
-@@ -14324,7 +13181,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
-@@ -14337,13 +13194,13 @@
- fi
- if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.9.0
-- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
- $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $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; }
- PKG_CONFIG=""
- fi
-@@ -14352,7 +13209,7 @@
-
-
- # Check whether --enable-debug was given.
--if test "${enable_debug+set}" = set; then
-+if test "${enable_debug+set}" = set; then :
- enableval=$enable_debug;
- else
- enable_debug=no
-@@ -14361,16 +13218,14 @@
-
- if test x$enable_debug = xyes ; then
-
--cat >>confdefs.h <<\_ACEOF
--#define GNOME_ENABLE_DEBUG 1
--_ACEOF
-+$as_echo "#define GNOME_ENABLE_DEBUG 1" >>confdefs.h
-
- fi
-
-
-
- # Check whether --enable-compile-warnings was given.
--if test "${enable_compile_warnings+set}" = set; then
-+if test "${enable_compile_warnings+set}" = set; then :
- enableval=$enable_compile_warnings;
- else
- enable_compile_warnings="maximum"
-@@ -14401,13 +13256,9 @@
- for option in -Wno-sign-compare; do
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $option"
-- { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5
- $as_echo_n "checking whether gcc understands $option... " >&6; }
-- 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
-@@ -14418,35 +13269,14 @@
- 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 :
- has_option=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- has_option=no
-+ has_option=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS="$SAVE_CFLAGS"
-- { $as_echo "$as_me:$LINENO: result: $has_option" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5
- $as_echo "$has_option" >&6; }
- if test $has_option = yes; then
- warning_flags="$warning_flags $option"
-@@ -14460,26 +13290,24 @@
- fi
- ;;
- *)
-- { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
--$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
- ;;
- esac
- CFLAGS="$realsave_CFLAGS"
-- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
- $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
-- { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5
- $as_echo "$warning_flags" >&6; }
-
- # Check whether --enable-iso-c was given.
--if test "${enable_iso_c+set}" = set; then
-+if test "${enable_iso_c+set}" = set; then :
- enableval=$enable_iso_c;
- else
- enable_iso_c=no
- fi
-
-
-- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5
- $as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
- complCFLAGS=
- if test "x$enable_iso_c" != "xno"; then
-@@ -14494,7 +13322,7 @@
- esac
- fi
- fi
-- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5
- $as_echo "$complCFLAGS" >&6; }
-
- WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -14516,9 +13344,7 @@
-
- if test "$enable_maintainer_mode" = "yes"; then
-
--cat >>confdefs.h <<\_ACEOF
--#define MAINTAINER_MODE 1
--_ACEOF
-+$as_echo "#define MAINTAINER_MODE 1" >>confdefs.h
-
- 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"
-@@ -14536,11 +13362,11 @@
- GNOME_KEYRING_REQUIRED=2.26.0
-
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\"") >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 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
- have_libnotify=yes
- else
- have_libnotify=no
-@@ -14550,24 +13376,22 @@
- if test "$have_libnotify" = "yes"; then
- LIBNOTIFY_PACKAGE="libnotify >= $LIBNOTIFY_REQUIRED"
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBNOTIFY 1
--_ACEOF
-+$as_echo "#define HAVE_LIBNOTIFY 1" >>confdefs.h
-
- fi
-
- # Tests
-
--{ $as_echo "$as_me:$LINENO: checking whether to build tests" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build tests" >&5
- $as_echo_n "checking whether to build tests... " >&6; }
- # Check whether --enable-tests was given.
--if test "${enable_tests+set}" = set; then
-+if test "${enable_tests+set}" = set; then :
- enableval=$enable_tests;
- else
- enable_tests=yes
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $enable_tests" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_tests" >&5
- $as_echo "$enable_tests" >&6; }
-
- if test "$enable_tests" = "yes"; then
-@@ -14581,14 +13405,15 @@
-
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for DEPENDENCIES" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPENDENCIES" >&5
- $as_echo_n "checking for DEPENDENCIES... " >&6; }
-
--if test -n "$DEPENDENCIES_CFLAGS"; then
-- pkg_cv_DEPENDENCIES_CFLAGS="$DEPENDENCIES_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$DEPENDENCIES_CFLAGS"; then
-+ pkg_cv_DEPENDENCIES_CFLAGS="$DEPENDENCIES_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
- glib-2.0 >= \$GLIB_REQUIRED
- gmodule-2.0
- gthread-2.0
-@@ -14606,7 +13431,7 @@
- webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
- libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
- gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
-- \"") >&5
-+ \""; } >&5
- ($PKG_CONFIG --exists --print-errors "
- glib-2.0 >= $GLIB_REQUIRED
- gmodule-2.0
-@@ -14627,8 +13452,8 @@
- gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
- ") 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_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "
- glib-2.0 >= $GLIB_REQUIRED
- gmodule-2.0
-@@ -14651,14 +13476,16 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$DEPENDENCIES_LIBS"; then
-- pkg_cv_DEPENDENCIES_LIBS="$DEPENDENCIES_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$DEPENDENCIES_LIBS"; then
-+ pkg_cv_DEPENDENCIES_LIBS="$DEPENDENCIES_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
- glib-2.0 >= \$GLIB_REQUIRED
- gmodule-2.0
- gthread-2.0
-@@ -14676,7 +13503,7 @@
- webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
- libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
- gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
-- \"") >&5
-+ \""; } >&5
- ($PKG_CONFIG --exists --print-errors "
- glib-2.0 >= $GLIB_REQUIRED
- gmodule-2.0
-@@ -14697,8 +13524,8 @@
- gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
- ") 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_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "
- glib-2.0 >= $GLIB_REQUIRED
- gmodule-2.0
-@@ -14721,8 +13548,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -14735,7 +13563,7 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
-+ DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
- glib-2.0 >= $GLIB_REQUIRED
- gmodule-2.0
- gthread-2.0
-@@ -14753,9 +13581,9 @@
- webkit-1.0 >= $WEBKIT_GTK_REQUIRED
- libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
- gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
-- " 2>&1`
-+ "`
- else
-- DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "
-+ DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
- glib-2.0 >= $GLIB_REQUIRED
- gmodule-2.0
- gthread-2.0
-@@ -14773,41 +13601,12 @@
- webkit-1.0 >= $WEBKIT_GTK_REQUIRED
- libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
- gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
-- " 2>&1`
-+ "`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$DEPENDENCIES_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (
-- glib-2.0 >= $GLIB_REQUIRED
-- gmodule-2.0
-- gthread-2.0
-- gio-unix-2.0 >= $GLIB_REQUIRED
-- gtk+-2.0 >= $GTK_REQUIRED
-- gtk+-unix-print-2.0 >= $GTK_REQUIRED
-- ice
-- x11
-- sm
-- libxml-2.0 >= $LIBXML_REQUIRED
-- libxslt >= $LIBXSLT_REQUIRED
-- gconf-2.0
-- libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
-- $LIBNOTIFY_PACKAGE
-- webkit-1.0 >= $WEBKIT_GTK_REQUIRED
-- libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
-- gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
-- ) were not met:
--
--$DEPENDENCIES_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 DEPENDENCIES_CFLAGS
--and DEPENDENCIES_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements (
-+ as_fn_error "Package requirements (
- glib-2.0 >= $GLIB_REQUIRED
- gmodule-2.0
- gthread-2.0
-@@ -14835,22 +13634,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.
--" >&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 DEPENDENCIES_CFLAGS
--and DEPENDENCIES_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.
-
-@@ -14859,12 +13647,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
- DEPENDENCIES_CFLAGS=$pkg_cv_DEPENDENCIES_CFLAGS
- DEPENDENCIES_LIBS=$pkg_cv_DEPENDENCIES_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- :
- fi
-@@ -14875,40 +13662,44 @@
-
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
- $as_echo_n "checking for DBUS... " >&6; }
-
--if test -n "$DBUS_CFLAGS"; then
-- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$DBUS_CFLAGS"; then
-+ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
- ac_status=$?
-- $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_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$DBUS_LIBS"; then
-- pkg_cv_DBUS_LIBS="$DBUS_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$DBUS_LIBS"; then
-+ pkg_cv_DBUS_LIBS="$DBUS_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
- ac_status=$?
-- $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_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -14921,25 +13712,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
-+ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
- else
-- DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
-+ DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$DBUS_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
--
--$DBUS_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 DBUS_CFLAGS
--and DBUS_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
-+ as_fn_error "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
-
- $DBUS_PKG_ERRORS
-
-@@ -14949,22 +13729,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.
--" >&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 DBUS_CFLAGS
--and DBUS_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -14973,21 +13742,20 @@
- See the pkg-config man page for more details.
-
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
- else
- DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
- DBUS_LIBS=$pkg_cv_DBUS_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- :
- fi
-
- # Extract the first word of "dbus-binding-tool", so it can be a program name with args.
- set dummy dbus-binding-tool; 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_DBUS_BINDING_TOOL+set}" = set; then
-+if test "${ac_cv_path_DBUS_BINDING_TOOL+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $DBUS_BINDING_TOOL in
-@@ -15000,14 +13768,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_DBUS_BINDING_TOOL="$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_DBUS_BINDING_TOOL" && ac_cv_path_DBUS_BINDING_TOOL="no"
-@@ -15016,19 +13784,17 @@
- fi
- DBUS_BINDING_TOOL=$ac_cv_path_DBUS_BINDING_TOOL
- if test -n "$DBUS_BINDING_TOOL"; then
-- { $as_echo "$as_me:$LINENO: result: $DBUS_BINDING_TOOL" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_BINDING_TOOL" >&5
- $as_echo "$DBUS_BINDING_TOOL" >&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 "$DBUS_BINDING_TOOL" = "no"; then
-- { { $as_echo "$as_me:$LINENO: error: dbus-binding-tool not found" >&5
--$as_echo "$as_me: error: dbus-binding-tool not found" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "dbus-binding-tool not found" "$LINENO" 5
- fi
-
- # *****
-@@ -15044,13 +13810,13 @@
-
-
- # Check whether --with-gconf-source was given.
--if test "${with_gconf_source+set}" = set; then
-+if test "${with_gconf_source+set}" = set; then :
- withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
- fi
-
-
-
-- { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
- $as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
-
- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -15059,22 +13825,20 @@
-
-
- # Check whether --with-gconf-schema-file-dir was given.
--if test "${with_gconf_schema_file_dir+set}" = set; then
-+if test "${with_gconf_schema_file_dir+set}" = set; then :
- withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
- fi
-
-
-
-- { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
- $as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
-
- # Check whether --enable-schemas-install was given.
--if test "${enable_schemas_install+set}" = set; then
-+if test "${enable_schemas_install+set}" = set; then :
- enableval=$enable_schemas_install; case ${enableval} in
- yes|no) ;;
-- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
--$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
-- { (exit 1); exit 1; }; } ;;
-+ *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
- esac
- fi
-
-@@ -15090,9 +13854,9 @@
-
- # Extract the first word of "gconftool-2", so it can be a program name with args.
- set dummy gconftool-2; 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_GCONFTOOL+set}" = set; then
-+if test "${ac_cv_path_GCONFTOOL+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $GCONFTOOL in
-@@ -15105,14 +13869,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"
-- $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_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-@@ -15121,134 +13885,160 @@
- fi
- GCONFTOOL=$ac_cv_path_GCONFTOOL
- if test -n "$GCONFTOOL"; then
-- { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
-+ { $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 "$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; }; }
-+ 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`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-
-+fi
-+done
-
-
-+# for backtrace()
-+for ac_header in execinfo.h fcntl.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-
-+fi
-
-+done
-
--
--
--
--
--
--
--
--
--
--
--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
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-+$as_echo_n "checking for inline... " >&6; }
-+if test "${ac_cv_c_inline+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_cv_c_inline=no
-+for ac_kw in inline __inline__ __inline; do
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-/* 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 $ac_func innocuous_$ac_func
+-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
-
-/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
+- 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. */
-
@@ -9782,69 +9201,40 @@
-# include <limits.h>
-#else
-# include <assert.h>
-+#ifndef __cplusplus
-+typedef int foo_t;
-+static $ac_kw foo_t static_foo () {return 0; }
-+$ac_kw foo_t foo () {return 0; }
- #endif
-
--#undef $ac_func
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_c_inline=$ac_kw
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ test "$ac_cv_c_inline" != no && break
-+done
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-+$as_echo "$ac_cv_c_inline" >&6; }
-
+-#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 $ac_func ();
+-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_$ac_func || defined __stub___$ac_func
+-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
-choke me
-+case $ac_cv_c_inline in
-+ inline | yes) ;;
-+ *)
-+ case $ac_cv_c_inline in
-+ no) ac_val=;;
-+ *) ac_val=$ac_cv_c_inline;;
-+ esac
-+ cat >>confdefs.h <<_ACEOF
-+#ifndef __cplusplus
-+#define inline $ac_val
- #endif
-+_ACEOF
-+ ;;
-+esac
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-+if test "${ac_cv_header_time+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
+-#endif
++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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+#include <sys/types.h>
-+#include <sys/time.h>
-+#include <time.h>
int
main ()
{
--return $ac_func ();
-+if ((struct tm *) 0)
-+return 0;
+-return bind_textdomain_codeset ();
++extern int _nl_msg_cat_cntr;
++ return _nl_msg_cat_cntr
;
return 0;
}
@@ -9870,43 +9260,940 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_header_time=yes
+- 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
-+ ac_cv_header_time=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-+$as_echo "$ac_cv_header_time" >&6; }
-+if test $ac_cv_header_time = yes; then
-+
-+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
-
-- eval "$as_ac_var=no"
- fi
-
+-
+- ac_cv_func_bind_textdomain_codeset=no
+-fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+
-+
-+
-+ for ac_header in $ac_header_list
-+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
-+
- fi
+-fi
+-{ $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
+@@ -14222,10 +13165,8 @@
+ ;;
+ esac
+ 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
+
+
+@@ -14239,9 +13180,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
+-{ $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_PKG_CONFIG+set}" = set; then
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $PKG_CONFIG in
+@@ -14254,14 +13195,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_PKG_CONFIG="$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
+
+ ;;
+@@ -14269,10 +13210,10 @@
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+ $as_echo "$PKG_CONFIG" >&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
+
+@@ -14282,9 +13223,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
+-{ $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_ac_pt_PKG_CONFIG+set}" = set; then
++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $ac_pt_PKG_CONFIG in
+@@ -14297,14 +13238,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_ac_pt_PKG_CONFIG="$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
+
+ ;;
+@@ -14312,10 +13253,10 @@
+ fi
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ if test -n "$ac_pt_PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+ $as_echo "$ac_pt_PKG_CONFIG" >&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
+
+@@ -14324,7 +13265,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
+@@ -14337,13 +13278,13 @@
+ fi
+ if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+ $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $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; }
+ PKG_CONFIG=""
+ fi
+@@ -14352,7 +13293,7 @@
+
+
+ # Check whether --enable-debug was given.
+-if test "${enable_debug+set}" = set; then
++if test "${enable_debug+set}" = set; then :
+ enableval=$enable_debug;
+ else
+ enable_debug=no
+@@ -14361,16 +13302,14 @@
+
+ if test x$enable_debug = xyes ; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define GNOME_ENABLE_DEBUG 1
+-_ACEOF
++$as_echo "#define GNOME_ENABLE_DEBUG 1" >>confdefs.h
+
+ fi
+
+
+
+ # Check whether --enable-compile-warnings was given.
+-if test "${enable_compile_warnings+set}" = set; then
++if test "${enable_compile_warnings+set}" = set; then :
+ enableval=$enable_compile_warnings;
+ else
+ enable_compile_warnings="maximum"
+@@ -14401,13 +13340,9 @@
+ for option in -Wno-sign-compare; do
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $option"
+- { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5
+ $as_echo_n "checking whether gcc understands $option... " >&6; }
+- 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
+@@ -14418,35 +13353,14 @@
+ 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 :
+ has_option=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- has_option=no
++ has_option=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$SAVE_CFLAGS"
+- { $as_echo "$as_me:$LINENO: result: $has_option" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5
+ $as_echo "$has_option" >&6; }
+ if test $has_option = yes; then
+ warning_flags="$warning_flags $option"
+@@ -14460,26 +13374,24 @@
+ fi
+ ;;
+ *)
+- { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
+-$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
+ ;;
+ esac
+ CFLAGS="$realsave_CFLAGS"
+- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
+ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
+- { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5
+ $as_echo "$warning_flags" >&6; }
+
+ # Check whether --enable-iso-c was given.
+-if test "${enable_iso_c+set}" = set; then
++if test "${enable_iso_c+set}" = set; then :
+ enableval=$enable_iso_c;
+ else
+ enable_iso_c=no
+ fi
+
+
+- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5
+ $as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
+ complCFLAGS=
+ if test "x$enable_iso_c" != "xno"; then
+@@ -14494,7 +13406,7 @@
+ esac
+ fi
+ fi
+- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5
+ $as_echo "$complCFLAGS" >&6; }
+
+ WARN_CFLAGS="$warning_flags $complCFLAGS"
+@@ -14503,22 +13415,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=
+
+ if test "$enable_maintainer_mode" = "yes"; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define MAINTAINER_MODE 1
+-_ACEOF
++$as_echo "#define MAINTAINER_MODE 1" >>confdefs.h
+
+ 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"
+@@ -14536,11 +13449,11 @@
+ GNOME_KEYRING_REQUIRED=2.26.0
+
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\"") >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 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
+ have_libnotify=yes
+ else
+ have_libnotify=no
+@@ -14550,24 +13463,22 @@
+ if test "$have_libnotify" = "yes"; then
+ LIBNOTIFY_PACKAGE="libnotify >= $LIBNOTIFY_REQUIRED"
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBNOTIFY 1
+-_ACEOF
++$as_echo "#define HAVE_LIBNOTIFY 1" >>confdefs.h
+
+ fi
+
+ # Tests
+
+-{ $as_echo "$as_me:$LINENO: checking whether to build tests" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build tests" >&5
+ $as_echo_n "checking whether to build tests... " >&6; }
+ # Check whether --enable-tests was given.
+-if test "${enable_tests+set}" = set; then
++if test "${enable_tests+set}" = set; then :
+ enableval=$enable_tests;
+ else
+ enable_tests=yes
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $enable_tests" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_tests" >&5
+ $as_echo "$enable_tests" >&6; }
+
+ if test "$enable_tests" = "yes"; then
+@@ -14581,14 +13492,15 @@
+
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for DEPENDENCIES" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPENDENCIES" >&5
+ $as_echo_n "checking for DEPENDENCIES... " >&6; }
+
+-if test -n "$DEPENDENCIES_CFLAGS"; then
+- pkg_cv_DEPENDENCIES_CFLAGS="$DEPENDENCIES_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DEPENDENCIES_CFLAGS"; then
++ pkg_cv_DEPENDENCIES_CFLAGS="$DEPENDENCIES_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+ glib-2.0 >= \$GLIB_REQUIRED
+ gmodule-2.0
+ gthread-2.0
+@@ -14606,7 +13518,7 @@
+ webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
+ libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
+ gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
+- \"") >&5
++ \""; } >&5
+ ($PKG_CONFIG --exists --print-errors "
+ glib-2.0 >= $GLIB_REQUIRED
+ gmodule-2.0
+@@ -14627,8 +13539,8 @@
+ gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
+ ") 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_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "
+ glib-2.0 >= $GLIB_REQUIRED
+ gmodule-2.0
+@@ -14651,14 +13563,16 @@
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$DEPENDENCIES_LIBS"; then
+- pkg_cv_DEPENDENCIES_LIBS="$DEPENDENCIES_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DEPENDENCIES_LIBS"; then
++ pkg_cv_DEPENDENCIES_LIBS="$DEPENDENCIES_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+ glib-2.0 >= \$GLIB_REQUIRED
+ gmodule-2.0
+ gthread-2.0
+@@ -14676,7 +13590,7 @@
+ webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
+ libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
+ gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
+- \"") >&5
++ \""; } >&5
+ ($PKG_CONFIG --exists --print-errors "
+ glib-2.0 >= $GLIB_REQUIRED
+ gmodule-2.0
+@@ -14697,8 +13611,8 @@
+ gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
+ ") 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_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "
+ glib-2.0 >= $GLIB_REQUIRED
+ gmodule-2.0
+@@ -14721,8 +13635,9 @@
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -14735,7 +13650,7 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
++ DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
+ glib-2.0 >= $GLIB_REQUIRED
+ gmodule-2.0
+ gthread-2.0
+@@ -14753,9 +13668,9 @@
+ webkit-1.0 >= $WEBKIT_GTK_REQUIRED
+ libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
+ gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
+- " 2>&1`
++ "`
+ else
+- DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "
++ DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+ glib-2.0 >= $GLIB_REQUIRED
+ gmodule-2.0
+ gthread-2.0
+@@ -14773,41 +13688,12 @@
+ webkit-1.0 >= $WEBKIT_GTK_REQUIRED
+ libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
+ gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
+- " 2>&1`
++ "`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DEPENDENCIES_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (
+- glib-2.0 >= $GLIB_REQUIRED
+- gmodule-2.0
+- gthread-2.0
+- gio-unix-2.0 >= $GLIB_REQUIRED
+- gtk+-2.0 >= $GTK_REQUIRED
+- gtk+-unix-print-2.0 >= $GTK_REQUIRED
+- ice
+- x11
+- sm
+- libxml-2.0 >= $LIBXML_REQUIRED
+- libxslt >= $LIBXSLT_REQUIRED
+- gconf-2.0
+- libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
+- $LIBNOTIFY_PACKAGE
+- webkit-1.0 >= $WEBKIT_GTK_REQUIRED
+- libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
+- gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
+- ) were not met:
+-
+-$DEPENDENCIES_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 DEPENDENCIES_CFLAGS
+-and DEPENDENCIES_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (
++ as_fn_error "Package requirements (
+ glib-2.0 >= $GLIB_REQUIRED
+ gmodule-2.0
+ gthread-2.0
+@@ -14835,22 +13721,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.
+-" >&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 DEPENDENCIES_CFLAGS
+-and DEPENDENCIES_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.
+
+@@ -14859,12 +13734,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
+ DEPENDENCIES_CFLAGS=$pkg_cv_DEPENDENCIES_CFLAGS
+ DEPENDENCIES_LIBS=$pkg_cv_DEPENDENCIES_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ :
+ fi
+@@ -14875,40 +13749,44 @@
+
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
+ $as_echo_n "checking for DBUS... " >&6; }
+
+-if test -n "$DBUS_CFLAGS"; then
+- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DBUS_CFLAGS"; then
++ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
+ ac_status=$?
+- $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_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$DBUS_LIBS"; then
+- pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DBUS_LIBS"; then
++ pkg_cv_DBUS_LIBS="$DBUS_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
+ ac_status=$?
+- $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_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -14921,25 +13799,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
++ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
+ else
+- DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
++ DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DBUS_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
+-
+-$DBUS_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 DBUS_CFLAGS
+-and DBUS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
++ as_fn_error "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
+
+ $DBUS_PKG_ERRORS
+
+@@ -14949,22 +13816,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.
+-" >&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 DBUS_CFLAGS
+-and DBUS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -14973,21 +13829,20 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
+ DBUS_LIBS=$pkg_cv_DBUS_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ :
+ fi
+
+ # Extract the first word of "dbus-binding-tool", so it can be a program name with args.
+ set dummy dbus-binding-tool; 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_DBUS_BINDING_TOOL+set}" = set; then
++if test "${ac_cv_path_DBUS_BINDING_TOOL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $DBUS_BINDING_TOOL in
+@@ -15000,14 +13855,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_DBUS_BINDING_TOOL="$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_DBUS_BINDING_TOOL" && ac_cv_path_DBUS_BINDING_TOOL="no"
+@@ -15016,19 +13871,17 @@
+ fi
+ DBUS_BINDING_TOOL=$ac_cv_path_DBUS_BINDING_TOOL
+ if test -n "$DBUS_BINDING_TOOL"; then
+- { $as_echo "$as_me:$LINENO: result: $DBUS_BINDING_TOOL" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_BINDING_TOOL" >&5
+ $as_echo "$DBUS_BINDING_TOOL" >&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 "$DBUS_BINDING_TOOL" = "no"; then
+- { { $as_echo "$as_me:$LINENO: error: dbus-binding-tool not found" >&5
+-$as_echo "$as_me: error: dbus-binding-tool not found" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "dbus-binding-tool not found" "$LINENO" 5
+ fi
+
+ # *****
+@@ -15044,13 +13897,13 @@
+
+
+ # Check whether --with-gconf-source was given.
+-if test "${with_gconf_source+set}" = set; then
++if test "${with_gconf_source+set}" = set; then :
+ withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
+ fi
+
+
+
+- { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
+ $as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
+
+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+@@ -15059,22 +13912,20 @@
+
+
+ # Check whether --with-gconf-schema-file-dir was given.
+-if test "${with_gconf_schema_file_dir+set}" = set; then
++if test "${with_gconf_schema_file_dir+set}" = set; then :
+ withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
+ fi
+
+
+
+- { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
+ $as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
+
+ # Check whether --enable-schemas-install was given.
+-if test "${enable_schemas_install+set}" = set; then
++if test "${enable_schemas_install+set}" = set; then :
+ enableval=$enable_schemas_install; case ${enableval} in
+ yes|no) ;;
+- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
+-$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
+- { (exit 1); exit 1; }; } ;;
++ *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
+ esac
+ fi
+
+@@ -15090,9 +13941,9 @@
+
+ # Extract the first word of "gconftool-2", so it can be a program name with args.
+ set dummy gconftool-2; 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_GCONFTOOL+set}" = set; then
++if test "${ac_cv_path_GCONFTOOL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GCONFTOOL in
+@@ -15105,303 +13956,60 @@
+ 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"
+- $as_echo "$as_me:$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
+-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:$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
+-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"
+-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
@@ -9914,32 +10201,17 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+
-+done
-+
-+
-+
-+
-+
-+
-+
-+
-+ for ac_func in $ac_func_list
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -15257,582 +14047,18 @@
- done
-
-
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-
-# for backtrace()
-
-
+-
+-
-for ac_header in execinfo.h fcntl.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -9971,7 +10243,16 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
--esac
++ $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
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -9985,17 +10266,24 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
--else
++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
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
--fi
--
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 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; }
@@ -10028,14 +10316,19 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_header_preproc=no
--fi
--
++if test "$GCONFTOOL" = "no"; then
++ as_fn_error "gconftool-2 not found" "$LINENO" 5
+ 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: )
@@ -10077,39 +10370,59 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--
--fi
++for ac_func in localtime_r memchr memmove memset mkdir mkdtemp realpath sqrt strchr strcspn strdup strerror strrchr strtol strtoul strstr
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++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
-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
--
++done
++
++
++# for backtrace()
++for ac_header in execinfo.h fcntl.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -15410,18 +14018,14 @@
+
+ done
+
-{ $as_echo "$as_me:$LINENO: checking for inline" >&5
--$as_echo_n "checking for inline... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+ $as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_cv_c_inline=no
--for ac_kw in inline __inline__ __inline; do
++if test "${ac_cv_c_inline+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#ifndef __cplusplus
--typedef int foo_t;
--static $ac_kw foo_t static_foo () {return 0; }
--$ac_kw foo_t foo () {return 0; }
--#endif
--
--_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #ifndef __cplusplus
+ typedef int foo_t;
+@@ -15430,41 +14034,17 @@
+ #endif
+
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -10128,62 +10441,52 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ac_cv_c_inline=$ac_kw
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_inline=$ac_kw
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- test "$ac_cv_c_inline" != no && break
--done
--
--fi
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ test "$ac_cv_c_inline" != no && break
+ done
+
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
--$as_echo "$ac_cv_c_inline" >&6; }
--
--
--case $ac_cv_c_inline in
-- inline | yes) ;;
-- *)
-- case $ac_cv_c_inline in
-- no) ac_val=;;
-- *) ac_val=$ac_cv_c_inline;;
-- esac
-- cat >>confdefs.h <<_ACEOF
--#ifndef __cplusplus
--#define inline $ac_val
--#endif
--_ACEOF
-- ;;
--esac
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+ $as_echo "$ac_cv_c_inline" >&6; }
+
+-
+ case $ac_cv_c_inline in
+ inline | yes) ;;
+ *)
+@@ -15480,16 +14060,12 @@
+ ;;
+ esac
+
-{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
--$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+ $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if test "${ac_cv_header_time+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++if test "${ac_cv_header_time+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. */
--#include <sys/types.h>
--#include <sys/time.h>
--#include <time.h>
--
--int
--main ()
--{
--if ((struct tm *) 0)
--return 0;
-- ;
-- return 0;
--}
--_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -15504,190 +14080,31 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -10202,20 +10505,23 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ac_cv_header_time=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_time=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_time=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++ ac_cv_header_time=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
--$as_echo "$ac_cv_header_time" >&6; }
--if test $ac_cv_header_time = yes; then
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
+ $as_echo "$ac_cv_header_time" >&6; }
+ if test $ac_cv_header_time = yes; then
+
-cat >>confdefs.h <<\_ACEOF
-#define TIME_WITH_SYS_TIME 1
-_ACEOF
@@ -10274,10 +10580,11 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+
- ac_header_compiler=no
--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; }
@@ -10317,11 +10624,11 @@
-
- ac_header_preproc=no
-fi
--
+
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
--
+
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -10363,26 +10670,25 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--
+
-fi
-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 $ac_header_list
++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
+@@ -15703,100 +14120,12 @@
+
+
+
-
-for ac_func in $ac_func_list
-do
@@ -10477,17 +10783,19 @@
-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 ac_func in $ac_func_list
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -15808,31 +14137,15 @@
+
+
+
-
-
-
@@ -10520,7 +10828,7 @@
/* end confdefs.h. */
/* Test program from Paul Eggert and Tony Leneis. */
#ifdef TIME_WITH_SYS_TIME
-@@ -16029,44 +14255,17 @@
+@@ -16029,44 +14342,17 @@
return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
}
_ACEOF
@@ -10546,15 +10854,17 @@
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_func_working_mktime=yes
- else
+- 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
++if ac_fn_c_try_run "$LINENO"; then :
++ ac_cv_func_working_mktime=yes
++else
+ ac_cv_func_working_mktime=no
fi
-rm -rf conftest.dSYM
@@ -10570,7 +10880,7 @@
$as_echo "$ac_cv_func_working_mktime" >&6; }
if test $ac_cv_func_working_mktime = no; then
case " $LIBOBJS " in
-@@ -16077,19 +14276,15 @@
+@@ -16077,19 +14363,15 @@
fi
@@ -10594,7 +10904,7 @@
/* end confdefs.h. */
$ac_includes_default
-@@ -16122,44 +14317,17 @@
+@@ -16122,44 +14404,17 @@
}
_ACEOF
@@ -10644,7 +10954,7 @@
$as_echo "$ac_cv_func_strtod" >&6; }
if test $ac_cv_func_strtod = no; then
case " $LIBOBJS " in
-@@ -16168,105 +14336,20 @@
+@@ -16168,105 +14423,20 @@
;;
esac
@@ -10662,9 +10972,7 @@
-/* Define pow to an innocuous variant, in case <limits.h> declares pow.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define pow innocuous_pow
-+ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
-+if test "x$ac_cv_func_pow" = x""yes; then :
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char pow (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
@@ -10727,15 +11035,17 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_pow=no
- fi
+-fi
++ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
++if test "x$ac_cv_func_pow" = x""yes; then :
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_pow" >&5
-$as_echo "$ac_cv_func_pow" >&6; }
--
+
if test $ac_cv_func_pow = no; then
- { $as_echo "$as_me:$LINENO: checking for pow in -lm" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
@@ -10755,7 +11065,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16284,149 +14367,31 @@
+@@ -16284,46 +14454,21 @@
return 0;
}
_ACEOF
@@ -10801,16 +11111,18 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
$as_echo "$ac_cv_lib_m_pow" >&6; }
-if test "x$ac_cv_lib_m_pow" = x""yes; then
-- POW_LIB=-lm
--else
++if test "x$ac_cv_lib_m_pow" = x""yes; then :
+ POW_LIB=-lm
+ else
- { $as_echo "$as_me:$LINENO: WARNING: cannot find library containing definition of pow" >&5
--$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
--fi
--
--fi
--
--fi
--
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
+ $as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
+ fi
+
+@@ -16331,102 +14476,9 @@
+
+ fi
+
-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
-$as_echo_n "checking for size_t... " >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
@@ -10897,30 +11209,22 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-+if test "x$ac_cv_lib_m_pow" = x""yes; then :
-+ POW_LIB=-lm
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
-+$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
-+fi
-
- fi
-
++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
++if test "x$ac_cv_type_size_t" = x""yes; then :
+
+-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-$as_echo "$ac_cv_type_size_t" >&6; }
-if test "x$ac_cv_type_size_t" = x""yes; then
- :
-+
-+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 :
-+
else
cat >>confdefs.h <<_ACEOF
-@@ -16450,48 +14415,23 @@
+@@ -16450,48 +14502,23 @@
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $_FLAGS"
@@ -10975,7 +11279,7 @@
$as_echo "$ac_cv_have_declaration_after_statement" >&6; }
if test "$ac_cv_have_declaration_after_statement" = "yes"; then
-@@ -16510,151 +14450,12 @@
+@@ -16510,151 +14537,12 @@
# Multimedia keys
# ***************
@@ -11131,7 +11435,7 @@
_ACEOF
fi
-@@ -16668,16 +14469,16 @@
+@@ -16668,16 +14556,16 @@
# GObject Introspection
# *********************
@@ -11151,7 +11455,7 @@
$as_echo "$enable_introspection" >&6; }
G_IR_SCANNER=
-@@ -16692,40 +14493,44 @@
+@@ -16692,40 +14580,44 @@
GOBJECT_INTROSPECTION_REQUIRED=0.6.2
pkg_failed=no
@@ -11215,7 +11519,7 @@
fi
-@@ -16738,25 +14543,14 @@
+@@ -16738,25 +14630,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11244,17 +11548,15 @@
$INTROSPECTION_PKG_ERRORS
-@@ -16766,22 +14560,11 @@
+@@ -16766,22 +14647,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;}
- { (exit 1); exit 1; }; }
-+" "$LINENO" 5
- elif test $pkg_failed = untried; then
+-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: 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.
@@ -11266,11 +11568,15 @@
-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
++" "$LINENO" 5
++elif test $pkg_failed = untried; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+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.
-@@ -16790,12 +14573,11 @@
+@@ -16790,12 +14660,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11285,7 +11591,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -16807,9 +14589,7 @@
+@@ -16807,9 +14676,7 @@
GIRTYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
@@ -11296,7 +11602,7 @@
fi
-@@ -16832,22 +14612,20 @@
+@@ -16832,22 +14699,20 @@
# Seed
# ****
@@ -11323,7 +11629,7 @@
fi
if test "$enable_seed" = "yes"; then
-@@ -16856,40 +14634,44 @@
+@@ -16856,40 +14721,44 @@
SEED_REQUIRED=2.27.91
pkg_failed=no
@@ -11387,7 +11693,7 @@
fi
-@@ -16902,25 +14684,14 @@
+@@ -16902,25 +14771,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11416,7 +11722,7 @@
$SEED_PKG_ERRORS
-@@ -16930,22 +14701,11 @@
+@@ -16930,22 +14788,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.
@@ -11442,7 +11748,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -16954,20 +14714,17 @@
+@@ -16954,20 +14801,17 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11466,7 +11772,7 @@
fi
-@@ -16986,56 +14743,60 @@
+@@ -16986,56 +14830,60 @@
# NSS
# ***
@@ -11549,7 +11855,7 @@
fi
-@@ -17048,25 +14809,14 @@
+@@ -17048,25 +14896,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11578,7 +11884,7 @@
$NSS_PKG_ERRORS
-@@ -17076,22 +14826,11 @@
+@@ -17076,22 +14913,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.
@@ -11604,7 +11910,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -17100,20 +14839,17 @@
+@@ -17100,20 +14926,17 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11628,7 +11934,7 @@
fi
-@@ -17133,16 +14869,16 @@
+@@ -17133,16 +14956,16 @@
# Zeroconf bookmarks sites
@@ -11648,7 +11954,7 @@
$as_echo "$enable_zeroconf" >&6; }
if test "$enable_zeroconf" != "no"; then
-@@ -17150,52 +14886,56 @@
+@@ -17150,52 +14973,56 @@
pkg_failed=no
@@ -11726,7 +12032,7 @@
fi
-@@ -17208,18 +14948,18 @@
+@@ -17208,18 +15035,18 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11750,7 +12056,7 @@
$as_echo "no" >&6; }
have_avahi=no
elif test $pkg_failed = untried; then
-@@ -17227,15 +14967,13 @@
+@@ -17227,15 +15054,13 @@
else
AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS
AVAHI_LIBS=$pkg_cv_AVAHI_LIBS
@@ -11768,7 +12074,7 @@
elif test "$have_avahi" = "yes"; then
enable_zeroconf=yes
else
-@@ -17245,9 +14983,7 @@
+@@ -17245,9 +15070,7 @@
if test "$enable_zeroconf" = "yes"; then
@@ -11779,7 +12085,7 @@
fi
-@@ -17262,55 +14998,59 @@
+@@ -17262,55 +15085,59 @@
# NetworkManager
@@ -11861,7 +12167,7 @@
fi
-@@ -17323,14 +15063,14 @@
+@@ -17323,14 +15150,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11879,7 +12185,7 @@
$as_echo "no" >&6; }
have_network_manager=no
elif test $pkg_failed = untried; then
-@@ -17338,26 +15078,22 @@
+@@ -17338,26 +15165,22 @@
else
NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS
NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS
@@ -11910,59 +12216,59 @@
fi
-@@ -17398,200 +15134,57 @@
+@@ -17398,18 +15221,18 @@
ISO_CODES_REQUIRED=0.35
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"iso-codes >= \$ISO_CODES_REQUIRED\"") >&5
-- ($PKG_CONFIG --exists --print-errors "iso-codes >= $ISO_CODES_REQUIRED") 2>&5
-- ac_status=$?
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"iso-codes >= \$ISO_CODES_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "iso-codes >= $ISO_CODES_REQUIRED") 2>&5
+ ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- have_iso_codes=yes
--else
-- have_iso_codes=no
--fi
--
--if test "$have_iso_codes" = "yes"; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ have_iso_codes=yes
+ else
+ have_iso_codes=no
+ fi
+
+ if test "$have_iso_codes" = "yes"; then
- { $as_echo "$as_me:$LINENO: checking whether iso-codes has iso-639 and iso-3166 domains" >&5
--$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
-- result=yes
-- else
-- result=no
-- have_iso_codes=no
-- fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iso-codes has iso-639 and iso-3166 domains" >&5
+ $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
+@@ -17418,7 +15241,7 @@
+ result=no
+ have_iso_codes=no
+ fi
- { $as_echo "$as_me:$LINENO: result: $result" >&5
--$as_echo "$result" >&6; }
--fi
--
--if test "$have_iso_codes" = "yes"; then
--
--cat >>confdefs.h <<_ACEOF
--#define ISO_CODES_PREFIX "`$PKG_CONFIG --variable=prefix iso-codes`"
--_ACEOF
--
--
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+ $as_echo "$result" >&6; }
+ fi
+
+@@ -17429,14 +15252,10 @@
+ _ACEOF
+
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ISO_CODES 1
-_ACEOF
--
--else
++$as_echo "#define HAVE_ISO_CODES 1" >>confdefs.h
+
+ else
- { { $as_echo "$as_me:$LINENO: error: iso-codes is required" >&5
-$as_echo "$as_me: error: iso-codes is required" >&2;}
- { (exit 1); exit 1; }; }
--fi
--
--GETTEXT_PACKAGE=epiphany
--
--
--cat >>confdefs.h <<_ACEOF
--#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
--_ACEOF
--
--
++ as_fn_error "iso-codes is required" "$LINENO" 5
+ fi
+
+ GETTEXT_PACKAGE=epiphany
+@@ -17447,151 +15266,12 @@
+ _ACEOF
+
+
-
-for ac_header in locale.h
-do
@@ -12009,38 +12315,17 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"iso-codes >= \$ISO_CODES_REQUIRED\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "iso-codes >= $ISO_CODES_REQUIRED") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ have_iso_codes=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ have_iso_codes=no
-+fi
-
+-
- ac_header_compiler=no
-+if test "$have_iso_codes" = "yes"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iso-codes has iso-639 and iso-3166 domains" >&5
-+$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
-+ result=yes
-+ else
-+ result=no
-+ have_iso_codes=no
-+ fi
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
-+$as_echo "$result" >&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; }
-+if test "$have_iso_codes" = "yes"; then
-
+-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -12051,9 +12336,7 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-+cat >>confdefs.h <<_ACEOF
-+#define ISO_CODES_PREFIX "`$PKG_CONFIG --variable=prefix iso-codes`"
- _ACEOF
+-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -12075,15 +12358,14 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_header_preproc=no
-fi
-
+-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-+$as_echo "#define HAVE_ISO_CODES 1" >>confdefs.h
-
+-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -12118,27 +12400,18 @@
-$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
+-else
- eval "$as_ac_Header=\$ac_header_preproc"
-+ as_fn_error "iso-codes is required" "$LINENO" 5
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
+-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+GETTEXT_PACKAGE=epiphany
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
-+_ACEOF
-+
-+
+ for ac_header in locale.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
@@ -12149,7 +12422,7 @@
_ACEOF
fi
-@@ -17599,16 +15192,12 @@
+@@ -17599,16 +15279,12 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -12169,10 +12442,13 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -17619,46 +15208,19 @@
- return 0;
- }
- _ACEOF
+@@ -17616,210 +15292,48 @@
+ {
+ return LC_MESSAGES
+ ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -12194,38 +12470,37 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- am_cv_val_LC_MESSAGES=yes
- else
+- am_cv_val_LC_MESSAGES=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- am_cv_val_LC_MESSAGES=no
-+ am_cv_val_LC_MESSAGES=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: $am_cv_val_LC_MESSAGES" >&5
-+{ $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
-
+-$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
-+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
-
- fi
- fi
-@@ -17671,155 +15233,20 @@
- XGETTEXT=:
- INTLLIBS=
-
+-
+- fi
+- fi
+- USE_NLS=yes
+-
+-
+- gt_cv_have_gettext=no
+-
+- CATOBJEXT=NONE
+- 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; }
@@ -12351,14 +12626,39 @@
-$as_echo_n "checking for libintl.h... " >&6; }
-if test "${ac_cv_header_libintl_h+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++ am_cv_val_LC_MESSAGES=yes
+ else
- ac_cv_header_libintl_h=$ac_header_preproc
--fi
++ am_cv_val_LC_MESSAGES=no
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-$as_echo "$ac_cv_header_libintl_h" >&6; }
-
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
-if test "x$ac_cv_header_libintl_h" = x""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
++
++$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"
@@ -12383,7 +12683,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -17832,54 +15259,25 @@
+@@ -17832,54 +15346,25 @@
return 0;
}
_ACEOF
@@ -12446,7 +12746,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -17892,141 +15290,26 @@
+@@ -17892,141 +15377,26 @@
return 0;
}
_ACEOF
@@ -12598,7 +12898,7 @@
_ACEOF
fi
-@@ -18041,18 +15324,14 @@
+@@ -18041,18 +15411,14 @@
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -12620,16 +12920,10 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18064,61 +15343,32 @@
- char bindtextdomain ();
- int
- main ()
--{
--return bindtextdomain ();
-- ;
-- return 0;
--}
--_ACEOF
+@@ -18070,55 +15436,26 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -12651,12 +12945,6 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+{
-+return bindtextdomain ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_intl_bindtextdomain=yes
else
@@ -12697,7 +12985,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18136,55 +15386,26 @@
+@@ -18136,55 +15473,26 @@
return 0;
}
_ACEOF
@@ -12762,7 +13050,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18202,43 +15423,18 @@
+@@ -18202,43 +15510,18 @@
return 0;
}
_ACEOF
@@ -12812,7 +13100,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -18248,22 +15444,18 @@
+@@ -18248,22 +15531,18 @@
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -12840,7 +13128,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18281,55 +15473,26 @@
+@@ -18281,55 +15560,26 @@
return 0;
}
_ACEOF
@@ -12905,7 +13193,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18347,43 +15510,18 @@
+@@ -18347,43 +15597,18 @@
return 0;
}
_ACEOF
@@ -12955,10 +13243,21 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -18405,102 +15543,12 @@
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS -lintl $libintl_extra_libs"
- unset ac_cv_func_bind_textdomain_codeset
+@@ -18394,113 +15619,23 @@
+ :
+ 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
-
-for ac_func in bind_textdomain_codeset
-do
@@ -13053,6 +13352,17 @@
-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"
@@ -13063,7 +13373,7 @@
_ACEOF
fi
-@@ -18530,15 +15578,13 @@
+@@ -18530,15 +15665,13 @@
if test "$gt_cv_have_gettext" = "yes"; then
@@ -13082,7 +13392,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -18563,118 +15609,28 @@
+@@ -18563,118 +15696,28 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -13209,7 +13519,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -18689,14 +15645,14 @@
+@@ -18689,14 +15732,14 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -13229,7 +13539,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -18704,9 +15660,9 @@
+@@ -18704,9 +15747,9 @@
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -13241,7 +13551,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -18719,14 +15675,14 @@
+@@ -18719,14 +15762,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13259,7 +13569,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -18735,19 +15691,19 @@
+@@ -18735,19 +15778,19 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -13283,7 +13593,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -18772,144 +15728,33 @@
+@@ -18772,18 +15815,14 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -13292,21 +13602,100 @@
$as_echo "$XGETTEXT" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
++ { $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
+@@ -18795,121 +15834,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
+- $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;
-}
@@ -13332,98 +13721,8 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- CATOBJEXT=.gmo
-- 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
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+ 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 :
-+ CATOBJEXT=.gmo
-+ DATADIRNAME=share
- else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -13437,14 +13736,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 :
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -18924,10 +15769,8 @@
+@@ -18924,10 +15856,8 @@
;;
esac
fi
@@ -13457,7 +13754,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -18941,9 +15784,7 @@
+@@ -18941,9 +15871,7 @@
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -13468,7 +13765,7 @@
fi
-@@ -18951,7 +15792,7 @@
+@@ -18951,7 +15879,7 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -13477,7 +13774,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -18984,7 +15825,7 @@
+@@ -18984,7 +15912,7 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -13486,7 +13783,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -19009,7 +15850,7 @@
+@@ -19009,7 +15937,7 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -13495,7 +13792,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -19057,7 +15898,7 @@
+@@ -19057,7 +15985,7 @@
# Check whether --with-distributor-name was given.
@@ -13504,7 +13801,7 @@
withval=$with_distributor_name; LSB_DISTRIBUTOR="$withval"
fi
-@@ -19067,9 +15908,9 @@
+@@ -19067,9 +15995,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
@@ -13516,7 +13813,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LSB_RELEASE"; then
-@@ -19080,24 +15921,24 @@
+@@ -19080,24 +16008,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13546,9 +13843,12 @@
$as_echo "no" >&6; }
fi
-@@ -19128,11 +15969,11 @@
+@@ -19127,29 +16055,33 @@
+
gdu_cv_version_required=0.3.2
++{ $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; }
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
@@ -13561,13 +13861,18 @@
gdu_cv_have_gdu=yes
else
gdu_cv_have_gdu=no
-@@ -19141,15 +15982,13 @@
+ fi
+
if test "$gdu_cv_have_gdu" = "yes"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
:
else
- { { $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
@@ -13579,7 +13884,7 @@
withval=$with_help_dir;
else
with_help_dir='${datadir}/gnome/help'
-@@ -19160,7 +15999,7 @@
+@@ -19160,7 +16092,7 @@
# Check whether --with-omf-dir was given.
@@ -13588,7 +13893,7 @@
withval=$with_omf_dir;
else
with_omf_dir='${datadir}/omf'
-@@ -19171,7 +16010,7 @@
+@@ -19171,7 +16103,7 @@
# Check whether --with-help-formats was given.
@@ -13597,7 +13902,7 @@
withval=$with_help_formats;
else
with_help_formats=''
-@@ -19181,7 +16020,7 @@
+@@ -19181,7 +16113,7 @@
# Check whether --enable-scrollkeeper was given.
@@ -13606,145 +13911,145 @@
enableval=$enable_scrollkeeper;
else
enable_scrollkeeper=yes
-@@ -19213,9 +16052,9 @@
-
- # Extract the first word of "gtkdoc-check", so it can be a program name with args.
- set dummy gtkdoc-check; ac_word=$2
+@@ -19211,136 +16143,8 @@
+
+
+
+- # 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 "$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
- case $GTKDOC_CHECK in
-@@ -19228,14 +16067,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+- $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
-+ 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
- IFS=$as_save_IFS
-
- ;;
-@@ -19243,10 +16082,10 @@
- fi
- GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
- if test -n "$GTKDOC_CHECK"; then
+-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 "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
- $as_echo "$GTKDOC_CHECK" >&6; }
- else
+-$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
-
-@@ -19255,9 +16094,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 "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 "$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_REBASE+set}" = set; then
-+if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $GTKDOC_REBASE in
-@@ -19270,14 +16109,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+- $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
-+ 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"
+- 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
-+ $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
- IFS=$as_save_IFS
-
- ;;
-@@ -19285,10 +16124,10 @@
- fi
- GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
- if test -n "$GTKDOC_REBASE"; then
+-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 "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5
- $as_echo "$GTKDOC_REBASE" >&6; }
- else
+-$as_echo "$GTKDOC_REBASE" >&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
-
-@@ -19299,9 +16138,9 @@
-
- # 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 "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 "$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_MKPDF+set}" = set; then
-+if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $GTKDOC_MKPDF in
-@@ -19314,14 +16153,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+- $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
-+ 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"
+- 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
-+ $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
- IFS=$as_save_IFS
-
- ;;
-@@ -19329,10 +16168,10 @@
- fi
- GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
- if test -n "$GTKDOC_MKPDF"; then
+-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 "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5
- $as_echo "$GTKDOC_MKPDF" >&6; }
- else
+-$as_echo "$GTKDOC_MKPDF" >&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
-
-@@ -19340,7 +16179,7 @@
-
-
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-
+-
# 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'
-@@ -19350,7 +16189,7 @@
+@@ -19350,7 +16154,7 @@
# Check whether --enable-gtk-doc was given.
@@ -13753,7 +14058,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -19359,33 +16198,31 @@
+@@ -19359,42 +16163,66 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -13770,32 +14075,120 @@
- { { $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;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" "$LINENO" 5
- fi
+-fi
++ as_fn_error "You need to have gtk-doc >= 1.0 installed to build gtk-doc" "$LINENO" 5
++fi
++ fi
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
++$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
++$as_echo "$enable_gtk_doc" >&6; }
++
++ 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:${as_lineno-$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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
fi
++done
++ done
++IFS=$as_save_IFS
- { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
- $as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
+-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5
-+ { $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.
+-$as_echo "$enable_gtk_doc" >&6; }
+-
+- # Check whether --enable-gtk-doc-html was given.
-if test "${enable_gtk_doc_html+set}" = set; then
-+if test "${enable_gtk_doc_html+set}" = set; then :
- enableval=$enable_gtk_doc_html;
- else
- enable_gtk_doc_html=yes
- fi
-
- # Check whether --enable-gtk-doc-pdf was given.
+- enableval=$enable_gtk_doc_html;
+-else
+- enable_gtk_doc_html=yes
++ ;;
++esac
+ fi
+-
+- # Check whether --enable-gtk-doc-pdf was given.
-if test "${enable_gtk_doc_pdf+set}" = set; then
-+if test "${enable_gtk_doc_pdf+set}" = set; then :
- enableval=$enable_gtk_doc_pdf;
- else
- enable_gtk_doc_pdf=no
-@@ -19456,9 +16293,9 @@
+- enableval=$enable_gtk_doc_pdf;
++GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
++if test -n "$GTKDOC_CHECK"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
++$as_echo "$GTKDOC_CHECK" >&6; }
+ else
+- enable_gtk_doc_pdf=no
++ { $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
+@@ -19405,22 +16233,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='#'
+@@ -19429,14 +16241,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
+-
+
+
+ # ****************************
+@@ -19456,9 +16260,9 @@
# Extract the first word of "gtk-builder-convert", so it can be a program name with args.
set dummy gtk-builder-convert; ac_word=$2
@@ -13807,7 +14200,7 @@
$as_echo_n "(cached) " >&6
else
case $GTK_BUILDER_CONVERT in
-@@ -19471,14 +16308,14 @@
+@@ -19471,14 +16275,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13825,7 +14218,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GTK_BUILDER_CONVERT" && ac_cv_path_GTK_BUILDER_CONVERT="false"
-@@ -19487,18 +16324,16 @@
+@@ -19487,18 +16291,16 @@
fi
GTK_BUILDER_CONVERT=$ac_cv_path_GTK_BUILDER_CONVERT
if test -n "$GTK_BUILDER_CONVERT"; then
@@ -13847,7 +14240,7 @@
fi
# ************
-@@ -19506,9 +16341,7 @@
+@@ -19506,9 +16308,7 @@
# ************
@@ -13858,7 +14251,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"
-@@ -19541,13 +16374,13 @@
+@@ -19541,13 +16341,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -13874,7 +14267,7 @@
esac ;;
esac
done
-@@ -19555,8 +16388,8 @@
+@@ -19555,8 +16355,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -13885,7 +14278,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -19579,11 +16412,11 @@
+@@ -19579,11 +16379,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" &&
@@ -13899,7 +14292,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -19603,8 +16436,8 @@
+@@ -19603,8 +16403,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.
@@ -13910,7 +14303,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -19620,157 +16453,98 @@
+@@ -19620,157 +16420,86 @@
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -14058,25 +14451,21 @@
-$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; }; }
-+ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
+-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; }; }
-+ as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
+-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 \"GTK_DOC_BUILD_PDF\" was never defined.
++ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
@@ -14085,16 +14474,14 @@
-$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; }; }
-+ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
+-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_REBASE\" was never defined.
++ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -14111,7 +14498,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -19780,17 +16554,18 @@
+@@ -19780,17 +16509,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -14137,7 +14524,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -19798,23 +16573,15 @@
+@@ -19798,23 +16528,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -14166,7 +14553,7 @@
as_nl='
'
export as_nl
-@@ -19822,7 +16589,13 @@
+@@ -19822,7 +16544,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
@@ -14181,7 +14568,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -19833,7 +16606,7 @@
+@@ -19833,7 +16561,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -14190,7 +14577,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -19856,13 +16629,6 @@
+@@ -19856,13 +16584,6 @@
}
fi
@@ -14204,7 +14591,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -19872,15 +16638,15 @@
+@@ -19872,15 +16593,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -14223,7 +14610,7 @@
IFS=$as_save_IFS
;;
-@@ -19892,12 +16658,16 @@
+@@ -19892,12 +16613,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -14244,7 +14631,7 @@
done
PS1='$ '
PS2='> '
-@@ -19909,7 +16679,89 @@
+@@ -19909,7 +16634,89 @@
LANGUAGE=C
export LANGUAGE
@@ -14335,7 +14722,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -19923,8 +16775,12 @@
+@@ -19923,8 +16730,12 @@
as_basename=false
fi
@@ -14349,7 +14736,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -19944,76 +16800,25 @@
+@@ -19944,76 +16755,25 @@
}
s/.*/./; q'`
@@ -14437,7 +14824,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -20042,8 +16847,56 @@
+@@ -20042,8 +16802,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -14495,7 +14882,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -20062,10 +16915,10 @@
+@@ -20062,10 +16870,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -14508,7 +14895,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -20080,13 +16933,19 @@
+@@ -20080,13 +16888,19 @@
exec 6>&1
@@ -14524,13 +14911,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.28.0, which was
+ This file was extended by GNOME Web Browser $as_me 2.28.1, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -20118,10 +16977,11 @@
+@@ -20118,10 +16932,11 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -14545,7 +14932,7 @@
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
-@@ -20143,16 +17003,16 @@
+@@ -20143,16 +16958,16 @@
Configuration commands:
$config_commands
@@ -14555,7 +14942,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
- GNOME Web Browser config.status 2.28.0
+ GNOME Web Browser config.status 2.28.1
-configured by $0, generated by GNU Autoconf 2.63,
+configured by $0, generated by GNU Autoconf 2.64,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -14565,7 +14952,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -20195,20 +17055,19 @@
+@@ -20195,20 +17010,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -14590,7 +14977,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -20216,11 +17075,10 @@
+@@ -20216,11 +17030,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -14605,7 +14992,7 @@
ac_need_defaults=false ;;
esac
-@@ -20555,9 +17413,7 @@
+@@ -20555,9 +17368,7 @@
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -14616,7 +15003,7 @@
esac
done
-@@ -20584,7 +17440,7 @@
+@@ -20584,7 +17395,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -14625,7 +15012,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -20595,11 +17451,7 @@
+@@ -20595,11 +17406,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -14638,7 +15025,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -20607,10 +17459,16 @@
+@@ -20607,10 +17414,16 @@
if test -n "$CONFIG_FILES"; then
@@ -14657,7 +15044,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -20624,24 +17482,18 @@
+@@ -20624,24 +17437,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -14685,7 +15072,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -20730,9 +17582,7 @@
+@@ -20730,9 +17537,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -14696,7 +15083,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -20773,9 +17623,7 @@
+@@ -20773,9 +17578,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -14707,7 +15094,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -20860,9 +17708,7 @@
+@@ -20860,9 +17663,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -14718,7 +15105,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -20875,9 +17721,7 @@
+@@ -20875,9 +17676,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -14729,7 +15116,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -20905,12 +17749,10 @@
+@@ -20905,12 +17704,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -14744,7 +15131,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -20921,7 +17763,7 @@
+@@ -20921,7 +17718,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -14753,7 +15140,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -20934,9 +17776,7 @@
+@@ -20934,9 +17731,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -14764,7 +15151,7 @@
esac
;;
esac
-@@ -20964,47 +17804,7 @@
+@@ -20964,47 +17759,7 @@
q
}
s/.*/./; q'`
@@ -14813,7 +15200,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -21061,7 +17861,6 @@
+@@ -21061,7 +17816,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=
@@ -14821,7 +15208,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -21071,12 +17870,11 @@
+@@ -21071,12 +17825,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -14836,7 +15223,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
-@@ -21086,7 +17884,7 @@
+@@ -21086,7 +17839,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -14845,7 +15232,7 @@
esac
_ACEOF
-@@ -21115,14 +17913,12 @@
+@@ -21115,14 +17868,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -14862,7 +15249,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;}
-@@ -21132,9 +17928,7 @@
+@@ -21132,9 +17883,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -14873,7 +15260,7 @@
;;
:H)
#
-@@ -21145,25 +17939,19 @@
+@@ -21145,25 +17894,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -14903,7 +15290,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -21201,7 +17989,7 @@
+@@ -21201,7 +17944,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -14912,7 +15299,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -21296,47 +18084,7 @@
+@@ -21296,47 +18039,7 @@
q
}
s/.*/./; q'`
@@ -14961,18 +15348,20 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -21983,9 +18731,7 @@
+@@ -21982,10 +18685,8 @@
+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
esac ;;
"po/stamp-it":C)
- if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then
+- if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; 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"
-@@ -22008,15 +18754,12 @@
+@@ -22008,15 +18709,12 @@
done # for ac_tag
@@ -14990,7 +15379,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -22037,10 +18780,10 @@
+@@ -22037,10 +18735,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.
@@ -15003,11 +15392,49 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-Index: epiphany-browser-2.28.0/lib/Makefile.in
-===================================================================
---- epiphany-browser-2.28.0.orig/lib/Makefile.in 2009-09-24 18:15:07.380440552 -0300
-+++ epiphany-browser-2.28.0/lib/Makefile.in 2009-09-24 18:20:09.016939583 -0300
-@@ -336,6 +336,7 @@
+diff -Naur epiphany-browser-2.28.1.old/data/art/Makefile.in epiphany-browser-2.28.1/data/art/Makefile.in
+--- epiphany-browser-2.28.1.old/data/art/Makefile.in 2009-10-18 17:25:10.000000000 +0200
++++ epiphany-browser-2.28.1/data/art/Makefile.in 2009-10-20 08:13:23.000000000 +0200
+@@ -144,8 +144,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -159,29 +157,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@
+@@ -218,6 +197,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15015,36 +15442,49 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -467,7 +468,7 @@
- -I$(top_srcdir)/lib/egg \
- -DDATADIR="\"$(datadir)\"" \
- -DSHARE_DIR=\"$(pkgdatadir)\" \
-- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
-+ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \
- $(AM_CPPFLAGS)
-
- libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-Index: epiphany-browser-2.28.0/ltmain.sh
-===================================================================
---- epiphany-browser-2.28.0.orig/ltmain.sh 2009-09-24 18:15:07.332439994 -0300
-+++ epiphany-browser-2.28.0/ltmain.sh 2009-09-24 18:19:47.344440568 -0300
-@@ -4202,6 +4202,11 @@
- prev=
- continue
- ;;
-+ *)
-+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
-+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
-+ exit $EXIT_FAILURE
-+ ;;
- esac
- ;;
- expsyms)
-Index: epiphany-browser-2.28.0/src/Makefile.in
-===================================================================
---- epiphany-browser-2.28.0.orig/src/Makefile.in 2009-09-24 18:15:07.368448392 -0300
-+++ epiphany-browser-2.28.0/src/Makefile.in 2009-09-24 18:20:09.744940497 -0300
-@@ -418,6 +418,7 @@
+diff -Naur epiphany-browser-2.28.1.old/data/glade/Makefile.in epiphany-browser-2.28.1/data/glade/Makefile.in
+--- epiphany-browser-2.28.1.old/data/glade/Makefile.in 2009-10-18 17:25:10.000000000 +0200
++++ epiphany-browser-2.28.1/data/glade/Makefile.in 2009-10-20 08:13:23.000000000 +0200
+@@ -144,8 +144,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -159,29 +157,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@
+@@ -218,6 +197,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15052,7 +15492,1933 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -551,8 +552,8 @@
+diff -Naur epiphany-browser-2.28.1.old/data/icons/Makefile.in epiphany-browser-2.28.1/data/icons/Makefile.in
+--- epiphany-browser-2.28.1.old/data/icons/Makefile.in 2009-10-18 17:25:10.000000000 +0200
++++ epiphany-browser-2.28.1/data/icons/Makefile.in 2009-10-20 08:13:23.000000000 +0200
+@@ -122,8 +122,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -137,29 +135,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@
+@@ -196,6 +175,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+diff -Naur epiphany-browser-2.28.1.old/data/Makefile.in epiphany-browser-2.28.1/data/Makefile.in
+--- epiphany-browser-2.28.1.old/data/Makefile.in 2009-10-18 17:25:10.000000000 +0200
++++ epiphany-browser-2.28.1/data/Makefile.in 2009-10-20 08:13:23.000000000 +0200
+@@ -194,8 +194,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -209,29 +207,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 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+diff -Naur epiphany-browser-2.28.1.old/data/ui/Makefile.in epiphany-browser-2.28.1/data/ui/Makefile.in
+--- epiphany-browser-2.28.1.old/data/ui/Makefile.in 2009-10-18 17:25:10.000000000 +0200
++++ epiphany-browser-2.28.1/data/ui/Makefile.in 2009-10-20 08:13:23.000000000 +0200
+@@ -144,8 +144,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -159,29 +157,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@
+@@ -218,6 +197,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+diff -Naur epiphany-browser-2.28.1.old/doc/Makefile.in epiphany-browser-2.28.1/doc/Makefile.in
+--- epiphany-browser-2.28.1.old/doc/Makefile.in 2009-10-18 17:25:10.000000000 +0200
++++ epiphany-browser-2.28.1/doc/Makefile.in 2009-10-20 08:13:24.000000000 +0200
+@@ -185,8 +185,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -200,29 +198,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@
+@@ -259,6 +238,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+diff -Naur epiphany-browser-2.28.1.old/doc/reference/Makefile.in epiphany-browser-2.28.1/doc/reference/Makefile.in
+--- epiphany-browser-2.28.1.old/doc/reference/Makefile.in 2009-10-18 17:25:10.000000000 +0200
++++ epiphany-browser-2.28.1/doc/reference/Makefile.in 2009-10-20 08:13:24.000000000 +0200
+@@ -123,8 +123,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -138,29 +136,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@
+@@ -197,6 +176,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+diff -Naur epiphany-browser-2.28.1.old/embed/Makefile.in epiphany-browser-2.28.1/embed/Makefile.in
+--- epiphany-browser-2.28.1.old/embed/Makefile.in 2009-10-18 17:25:11.000000000 +0200
++++ epiphany-browser-2.28.1/embed/Makefile.in 2009-10-20 08:13:24.000000000 +0200
+@@ -195,8 +195,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -210,29 +208,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@
+@@ -269,6 +248,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+diff -Naur epiphany-browser-2.28.1.old/gnome-doc-utils.make epiphany-browser-2.28.1/gnome-doc-utils.make
+--- epiphany-browser-2.28.1.old/gnome-doc-utils.make 2009-10-02 09:01:27.000000000 +0200
++++ epiphany-browser-2.28.1/gnome-doc-utils.make 2009-10-20 08:13:16.000000000 +0200
+@@ -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.28.1.old/gtk-doc.make epiphany-browser-2.28.1/gtk-doc.make
+--- epiphany-browser-2.28.1.old/gtk-doc.make 1970-01-01 01:00:00.000000000 +0100
++++ epiphany-browser-2.28.1/gtk-doc.make 2009-10-20 08:13:16.000000000 +0200
+@@ -0,0 +1,196 @@
++# -*- mode: makefile -*-
++
++####################################
++# Everything below here is generic #
++####################################
++
++if GTK_DOC_USE_LIBTOOL
++GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
++GTKDOC_RUN = $(LIBTOOL) --mode=execute
++else
++GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
++GTKDOC_RUN = sh -c
++endif
++
++# We set GPATH here; this gives us semantics for GNU make
++# which are more like other make's VPATH, when it comes to
++# whether a source that is a target of one rule is then
++# searched for in VPATH/GPATH.
++#
++GPATH = $(srcdir)
++
++TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
++
++EXTRA_DIST = \
++ $(content_files) \
++ $(HTML_IMAGES) \
++ $(DOC_MAIN_SGML_FILE) \
++ $(DOC_MODULE)-sections.txt \
++ $(DOC_MODULE)-overrides.txt
++
++DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
++
++SCANOBJ_FILES = \
++ $(DOC_MODULE).args \
++ $(DOC_MODULE).hierarchy \
++ $(DOC_MODULE).interfaces \
++ $(DOC_MODULE).prerequisites \
++ $(DOC_MODULE).signals
++
++REPORT_FILES = \
++ $(DOC_MODULE)-undocumented.txt \
++ $(DOC_MODULE)-undeclared.txt \
++ $(DOC_MODULE)-unused.txt
++
++CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
++
++if ENABLE_GTK_DOC
++all-local: html-build.stamp
++else
++all-local:
++endif
++
++docs: html-build.stamp
++
++$(REPORT_FILES): sgml-build.stamp
++
++#### scan ####
++
++scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
++ @echo 'gtk-doc: Scanning header files'
++ @-chmod -R u+w $(srcdir)
++ cd $(srcdir) && \
++ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
++ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
++ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
++ else \
++ cd $(srcdir) ; \
++ for i in $(SCANOBJ_FILES) ; do \
++ test -f $$i || touch $$i ; \
++ done \
++ fi
++ touch scan-build.stamp
++
++$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
++ @true
++
++#### templates ####
++
++tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
++ @echo 'gtk-doc: Rebuilding template files'
++ @-chmod -R u+w $(srcdir)
++ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
++ touch tmpl-build.stamp
++
++tmpl.stamp: tmpl-build.stamp
++ @true
++
++tmpl/*.sgml:
++ @true
++
++
++#### xml ####
++
++sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
++ @echo 'gtk-doc: Building XML'
++ @-chmod -R u+w $(srcdir)
++ cd $(srcdir) && \
++ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
++ touch sgml-build.stamp
++
++sgml.stamp: sgml-build.stamp
++ @true
++
++#### html ####
++
++html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
++ @echo 'gtk-doc: Building HTML'
++ @-chmod -R u+w $(srcdir)
++ rm -rf $(srcdir)/html
++ mkdir $(srcdir)/html
++ mkhtml_options=""; \
++ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
++ if test "$(?)" = "0"; then \
++ mkhtml_options=--path="$(srcdir)"; \
++ fi
++ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
++ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
++ @echo 'gtk-doc: Fixing cross-references'
++ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
++ touch html-build.stamp
++
++##############
++
++clean-local:
++ rm -f *~ *.bak
++ rm -rf .libs
++
++distclean-local:
++ cd $(srcdir) && \
++ rm -rf xml $(REPORT_FILES) \
++ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
++
++maintainer-clean-local: clean
++ cd $(srcdir) && rm -rf xml html
++
++install-data-local:
++ installfiles=`echo $(srcdir)/html/*`; \
++ if test "$$installfiles" = '$(srcdir)/html/*'; \
++ then echo '-- Nothing to install' ; \
++ else \
++ if test -n "$(DOC_MODULE_VERSION)"; then \
++ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
++ else \
++ installdir="$(DESTDIR)$(TARGET_DIR)"; \
++ fi; \
++ $(mkinstalldirs) $${installdir} ; \
++ for i in $$installfiles; do \
++ echo '-- Installing '$$i ; \
++ $(INSTALL_DATA) $$i $${installdir}; \
++ done; \
++ if test -n "$(DOC_MODULE_VERSION)"; then \
++ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
++ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
++ mv -f $${installdir}/$(DOC_MODULE).devhelp \
++ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
++ fi; \
++ ! which gtkdoc-rebase >/dev/null 2>&1 || \
++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
++ fi
++
++uninstall-local:
++ if test -n "$(DOC_MODULE_VERSION)"; then \
++ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
++ else \
++ installdir="$(DESTDIR)$(TARGET_DIR)"; \
++ fi; \
++ rm -rf $${installdir}
++
++#
++# Require gtk-doc when making dist
++#
++if ENABLE_GTK_DOC
++dist-check-gtkdoc:
++else
++dist-check-gtkdoc:
++ @echo "*** gtk-doc must be installed and enabled in order to make dist"
++ @false
++endif
++
++dist-hook: dist-check-gtkdoc dist-hook-local
++ mkdir $(distdir)/tmpl
++ mkdir $(distdir)/xml
++ mkdir $(distdir)/html
++ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
++ -cp $(srcdir)/xml/*.xml $(distdir)/xml
++ cp $(srcdir)/html/* $(distdir)/html
++ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
++ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
++ cd $(distdir) && rm -f $(DISTCLEANFILES)
++ ! which gtkdoc-rebase >/dev/null 2>&1 || \
++ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++
++.PHONY : dist-hook-local docs
+diff -Naur epiphany-browser-2.28.1.old/help/Makefile.in epiphany-browser-2.28.1/help/Makefile.in
+--- epiphany-browser-2.28.1.old/help/Makefile.in 2009-10-18 17:25:11.000000000 +0200
++++ epiphany-browser-2.28.1/help/Makefile.in 2009-10-20 08:13:24.000000000 +0200
+@@ -145,8 +145,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -160,29 +158,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@
+@@ -219,6 +198,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+@@ -300,6 +280,7 @@
+ $(DOC_LINGUAS))
+
+ _DOC_ABS_SRCDIR = @abs_srcdir@
++_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
+ @ENABLE_SK_TRUE at _ENABLE_SK = true
+
+ ################################################################################
+@@ -333,14 +314,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)), \
+@@ -356,12 +339,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)) ))
+@@ -373,7 +360,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), \
+@@ -393,7 +380,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
+@@ -653,6 +641,10 @@
+
+ DOC_MODULE ?=
+
++DOC_ID ?=
++
++DOC_PAGES ?=
++
+ DOC_ENTITIES ?=
+
+ DOC_INCLUDES ?=
+@@ -669,6 +661,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
+@@ -713,16 +706,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
+@@ -731,15 +724,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,$@)
+@@ -751,6 +745,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)
+@@ -769,7 +765,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 \
+@@ -792,10 +788,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)
+
+@@ -841,9 +839,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)
+@@ -859,15 +860,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)
+@@ -875,42 +894,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
+
+@@ -918,22 +941,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)
+@@ -941,24 +966,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.28.1.old/lib/egg/Makefile.in epiphany-browser-2.28.1/lib/egg/Makefile.in
+--- epiphany-browser-2.28.1.old/lib/egg/Makefile.in 2009-10-18 17:25:11.000000000 +0200
++++ epiphany-browser-2.28.1/lib/egg/Makefile.in 2009-10-20 08:13:24.000000000 +0200
+@@ -164,8 +164,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -179,29 +177,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@
+@@ -238,6 +217,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+diff -Naur epiphany-browser-2.28.1.old/lib/Makefile.in epiphany-browser-2.28.1/lib/Makefile.in
+--- epiphany-browser-2.28.1.old/lib/Makefile.in 2009-10-18 17:25:11.000000000 +0200
++++ epiphany-browser-2.28.1/lib/Makefile.in 2009-10-20 08:13:24.000000000 +0200
+@@ -262,8 +262,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -277,29 +275,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@
+@@ -336,6 +315,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+@@ -467,7 +447,7 @@
+ -I$(top_srcdir)/lib/egg \
+ -DDATADIR="\"$(datadir)\"" \
+ -DSHARE_DIR=\"$(pkgdatadir)\" \
+- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \
+ $(AM_CPPFLAGS)
+
+ libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
+diff -Naur epiphany-browser-2.28.1.old/lib/widgets/Makefile.in epiphany-browser-2.28.1/lib/widgets/Makefile.in
+--- epiphany-browser-2.28.1.old/lib/widgets/Makefile.in 2009-10-18 17:25:12.000000000 +0200
++++ epiphany-browser-2.28.1/lib/widgets/Makefile.in 2009-10-20 08:13:24.000000000 +0200
+@@ -159,8 +159,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -174,29 +172,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@
+@@ -233,6 +212,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+diff -Naur epiphany-browser-2.28.1.old/ltmain.sh epiphany-browser-2.28.1/ltmain.sh
+--- epiphany-browser-2.28.1.old/ltmain.sh 2009-10-02 09:01:26.000000000 +0200
++++ epiphany-browser-2.28.1/ltmain.sh 2009-10-20 08:13:15.000000000 +0200
+@@ -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
+ # automake: $automake_version
+ # autoconf: $autoconf_version
+ #
+@@ -73,7 +73,7 @@
+
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION=2.2.6
++VERSION="2.2.6 Debian-2.2.6a-4"
+ TIMESTAMP=""
+ package_revision=1.3012
+
+@@ -5033,7 +5033,10 @@
+ case $pass in
+ dlopen) libs="$dlfiles" ;;
+ dlpreopen) libs="$dlprefiles" ;;
+- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++ link)
++ libs="$deplibs %DEPLIBS%"
++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++ ;;
+ esac
+ fi
+ if test "$linkmode,$pass" = "lib,dlpreopen"; then
+@@ -5344,19 +5347,19 @@
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $ladir/$objdir/$old_library"
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
++ tmp_libs=
++ for deplib in $dependency_libs; do
++ deplibs="$deplib $deplibs"
++ if $opt_duplicate_deps ; then
++ case "$tmp_libs " in
++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++ esac
++ fi
++ tmp_libs="$tmp_libs $deplib"
++ done
+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ func_fatal_error "\`$lib' is not a convenience library"
+ fi
+- tmp_libs=
+- for deplib in $dependency_libs; do
+- deplibs="$deplib $deplibs"
+- if $opt_duplicate_deps ; then
+- case "$tmp_libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+- esac
+- fi
+- tmp_libs="$tmp_libs $deplib"
+- done
+ continue
+ fi # $pass = conv
+
+@@ -5893,6 +5896,7 @@
+ if test "$link_all_deplibs" != no; then
+ # Add the search paths of all dependency libraries
+ for deplib in $dependency_libs; do
++ path=
+ case $deplib in
+ -L*) path="$deplib" ;;
+ *.la)
+@@ -6206,6 +6210,9 @@
+ revision="$number_minor"
+ lt_irix_increment=no
+ ;;
++ *)
++ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
++ ;;
+ esac
+ ;;
+ no)
+diff -Naur epiphany-browser-2.28.1.old/m4/gnome-doc-utils.m4 epiphany-browser-2.28.1/m4/gnome-doc-utils.m4
+--- epiphany-browser-2.28.1.old/m4/gnome-doc-utils.m4 2009-10-02 09:01:27.000000000 +0200
++++ epiphany-browser-2.28.1/m4/gnome-doc-utils.m4 2009-10-20 08:13:16.000000000 +0200
+@@ -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.28.1.old/m4/gtk-doc.m4 epiphany-browser-2.28.1/m4/gtk-doc.m4
+--- epiphany-browser-2.28.1.old/m4/gtk-doc.m4 2009-10-02 09:01:27.000000000 +0200
++++ epiphany-browser-2.28.1/m4/gtk-doc.m4 2009-10-20 08:13:16.000000000 +0200
+@@ -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.28.1.old/m4/intltool.m4 epiphany-browser-2.28.1/m4/intltool.m4
+--- epiphany-browser-2.28.1.old/m4/intltool.m4 2009-10-02 09:01:27.000000000 +0200
++++ epiphany-browser-2.28.1/m4/intltool.m4 2009-10-20 08:13:16.000000000 +0200
+@@ -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.28.1.old/m4/libtool.m4 epiphany-browser-2.28.1/m4/libtool.m4
+--- epiphany-browser-2.28.1.old/m4/libtool.m4 2009-10-02 09:01:26.000000000 +0200
++++ epiphany-browser-2.28.1/m4/libtool.m4 2009-10-20 08:13:15.000000000 +0200
+@@ -2470,13 +2470,10 @@
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # Add ABI-specific directories to the system library path.
+- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -2488,6 +2485,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -3079,7 +3088,7 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ 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
+@@ -3760,7 +3769,7 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -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'
+ ;;
++ linux* | k*bsd*-gnu)
++ _LT_TAGVAR(link_all_deplibs, $1)=no
++ ;;
+ *)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+@@ -4249,6 +4261,9 @@
+ openbsd*)
+ with_gnu_ld=no
+ ;;
++ linux* | k*bsd*-gnu)
++ _LT_TAGVAR(link_all_deplibs, $1)=no
++ ;;
+ esac
+
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+@@ -4431,7 +4446,7 @@
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ 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 @@
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
++ _LT_TAGVAR(link_all_deplibs, $1)=no
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -4844,7 +4860,7 @@
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ 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.28.1.old/Makefile.in epiphany-browser-2.28.1/Makefile.in
+--- epiphany-browser-2.28.1.old/Makefile.in 2009-10-18 17:25:13.000000000 +0200
++++ epiphany-browser-2.28.1/Makefile.in 2009-10-20 08:13:25.000000000 +0200
+@@ -181,8 +181,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -196,29 +194,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@
+@@ -255,6 +234,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+diff -Naur epiphany-browser-2.28.1.old/po/Makefile.in.in epiphany-browser-2.28.1/po/Makefile.in.in
+--- epiphany-browser-2.28.1.old/po/Makefile.in.in 2009-10-02 09:01:27.000000000 +0200
++++ epiphany-browser-2.28.1/po/Makefile.in.in 2009-10-20 08:13:16.000000000 +0200
+@@ -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.28.1.old/src/bookmarks/Makefile.in epiphany-browser-2.28.1/src/bookmarks/Makefile.in
+--- epiphany-browser-2.28.1.old/src/bookmarks/Makefile.in 2009-10-18 17:25:12.000000000 +0200
++++ epiphany-browser-2.28.1/src/bookmarks/Makefile.in 2009-10-20 08:13:25.000000000 +0200
+@@ -207,8 +207,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -222,29 +220,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@
+@@ -281,6 +260,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+diff -Naur epiphany-browser-2.28.1.old/src/Makefile.in epiphany-browser-2.28.1/src/Makefile.in
+--- epiphany-browser-2.28.1.old/src/Makefile.in 2009-10-18 17:25:12.000000000 +0200
++++ epiphany-browser-2.28.1/src/Makefile.in 2009-10-20 08:13:25.000000000 +0200
+@@ -344,8 +344,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -359,29 +357,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@
+@@ -418,6 +397,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+@@ -551,8 +531,8 @@
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
@@ -15063,3 +17429,53 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
+diff -Naur epiphany-browser-2.28.1.old/tests/Makefile.in epiphany-browser-2.28.1/tests/Makefile.in
+--- epiphany-browser-2.28.1.old/tests/Makefile.in 2009-10-18 17:25:13.000000000 +0200
++++ epiphany-browser-2.28.1/tests/Makefile.in 2009-10-20 08:13:25.000000000 +0200
+@@ -168,8 +168,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -183,29 +181,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@
+@@ -242,6 +221,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
More information about the pkg-gnome-commits
mailing list