r23141 - in /desktop/unstable/epiphany-browser/debian: changelog control control.in patches/13_enable_page_cache.patch patches/99_autoreconf.patch patches/series
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Sat Feb 27 11:53:18 UTC 2010
Author: slomo
Date: Sat Feb 27 11:53:11 2010
New Revision: 23141
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23141
Log:
* New upstream development release:
+ debian/control.in:
- Update libsoup and WebKit build dependencies.
+ debian/patches/13_enable_page_cache.patch:
- Dropped, merged upstream.
+ debian/patches/99_autoreconf.patch:
- Regenerated for the new version.
Removed:
desktop/unstable/epiphany-browser/debian/patches/13_enable_page_cache.patch
Modified:
desktop/unstable/epiphany-browser/debian/changelog
desktop/unstable/epiphany-browser/debian/control
desktop/unstable/epiphany-browser/debian/control.in
desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch
desktop/unstable/epiphany-browser/debian/patches/series
Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=23141&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Sat Feb 27 11:53:11 2010
@@ -1,8 +1,18 @@
-epiphany-browser (2.29.90.1-3) UNRELEASED; urgency=low
-
+epiphany-browser (2.29.91-1) unstable; urgency=low
+
+ [ Josselin Mouette ]
* Recommend evince for print preview. Closes: #569968.
- -- Josselin Mouette <joss at debian.org> Mon, 15 Feb 2010 22:00:23 +0100
+ [ Sebastian Dröge ]
+ * New upstream development release:
+ + debian/control.in:
+ - Update libsoup and WebKit build dependencies.
+ + debian/patches/13_enable_page_cache.patch:
+ - Dropped, merged upstream.
+ + debian/patches/99_autoreconf.patch:
+ - Regenerated for the new version.
+
+ -- Sebastian Dröge <slomo at debian.org> Sat, 27 Feb 2010 12:47:10 +0100
epiphany-browser (2.29.90.1-2) unstable; urgency=low
Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=23141&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control [utf-8] Sat Feb 27 11:53:11 2010
@@ -24,12 +24,12 @@
libcanberra-gtk-dev (>= 0.3),
libnotify-dev (>= 0.4),
libdbus-glib-1-dev (>= 0.60),
- libsoup-gnome2.4-dev (>= 2.29.6),
+ libsoup-gnome2.4-dev (>= 2.29.91),
libnss3-dev,
scrollkeeper,
gnome-pkg-tools (>= 0.10),
libxml-parser-perl,
- libwebkit-dev (>= 1.1.21),
+ libwebkit-dev (>= 1.1.22),
gobject-introspection (>= 0.6.7),
libgirepository1.0-dev (>= 0.6.7),
gir-repository-dev,
Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=23141&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control.in [utf-8] Sat Feb 27 11:53:11 2010
@@ -19,12 +19,12 @@
libcanberra-gtk-dev (>= 0.3),
libnotify-dev (>= 0.4),
libdbus-glib-1-dev (>= 0.60),
- libsoup-gnome2.4-dev (>= 2.29.6),
+ libsoup-gnome2.4-dev (>= 2.29.91),
libnss3-dev,
scrollkeeper,
gnome-pkg-tools (>= 0.10),
libxml-parser-perl,
- libwebkit-dev (>= 1.1.21),
+ libwebkit-dev (>= 1.1.22),
gobject-introspection (>= 0.6.7),
libgirepository1.0-dev (>= 0.6.7),
gir-repository-dev,
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=23141&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] Sat Feb 27 11:53:11 2010
@@ -1,6 +1,6 @@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/aclocal.m4 epiphany-browser-2.29.90.1/aclocal.m4
---- epiphany-browser-2.29.90.1.old/aclocal.m4 2010-02-10 14:41:07.000000000 +0100
-+++ epiphany-browser-2.29.90.1/aclocal.m4 2010-02-12 07:40:57.087391218 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/aclocal.m4 epiphany-browser-2.29.91/aclocal.m4
+--- epiphany-browser-2.29.91.old/aclocal.m4 2010-02-22 21:18:35.000000000 +0100
++++ epiphany-browser-2.29.91/aclocal.m4 2010-02-27 12:51:51.776728409 +0100
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -49,10 +49,10 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/config.h.in epiphany-browser-2.29.90.1/config.h.in
---- epiphany-browser-2.29.90.1.old/config.h.in 2010-02-10 14:41:22.000000000 +0100
-+++ epiphany-browser-2.29.90.1/config.h.in 2010-02-12 07:40:58.531391229 +0100
-@@ -169,6 +169,9 @@
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/config.h.in epiphany-browser-2.29.91/config.h.in
+--- epiphany-browser-2.29.91.old/config.h.in 2010-02-22 21:18:54.000000000 +0100
++++ epiphany-browser-2.29.91/config.h.in 2010-02-27 12:51:53.064728639 +0100
+@@ -172,6 +172,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -62,14 +62,14 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/configure epiphany-browser-2.29.90.1/configure
---- epiphany-browser-2.29.90.1.old/configure 2010-02-10 14:41:13.000000000 +0100
-+++ epiphany-browser-2.29.90.1/configure 2010-02-12 07:40:58.219391020 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/configure epiphany-browser-2.29.91/configure
+--- epiphany-browser-2.29.91.old/configure 2010-02-22 21:18:41.000000000 +0100
++++ epiphany-browser-2.29.91/configure 2010-02-27 12:51:52.800726500 +0100
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for GNOME Web Browser 2.29.90.1.
-+# Generated by GNU Autoconf 2.65 for GNOME Web Browser 2.29.90.1.
+-# Generated by GNU Autoconf 2.63 for GNOME Web Browser 2.29.91.
++# Generated by GNU Autoconf 2.65 for GNOME Web Browser 2.29.91.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany>.
#
@@ -876,8 +876,8 @@
PACKAGE_NAME='GNOME Web Browser'
-PACKAGE_TARNAME='epiphany'
+PACKAGE_TARNAME='epiphany-browser'
- PACKAGE_VERSION='2.29.90.1'
- PACKAGE_STRING='GNOME Web Browser 2.29.90.1'
+ PACKAGE_VERSION='2.29.91'
+ PACKAGE_STRING='GNOME Web Browser 2.29.91'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
+PACKAGE_URL=''
@@ -913,7 +913,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1048,6 +1015,8 @@
+@@ -1049,6 +1016,8 @@
enable_scrollkeeper
with_html_dir
enable_gtk_doc
@@ -922,7 +922,7 @@
'
ac_precious_vars='build_alias
host_alias
-@@ -1179,8 +1148,7 @@
+@@ -1180,8 +1149,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -932,7 +932,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1206,8 +1174,7 @@
+@@ -1207,8 +1175,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -942,7 +942,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1411,8 +1378,7 @@
+@@ -1412,8 +1379,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -952,7 +952,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1428,8 +1394,7 @@
+@@ -1429,8 +1395,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -962,7 +962,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1459,17 +1424,17 @@
+@@ -1460,17 +1425,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -986,7 +986,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1486,15 +1451,13 @@
+@@ -1487,15 +1452,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -1004,7 +1004,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1517,8 +1480,7 @@
+@@ -1518,8 +1481,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -1014,7 +1014,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1548,11 +1510,9 @@
+@@ -1549,11 +1511,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -1028,7 +1028,7 @@
# Find the source files, if location was not specified.
-@@ -1591,13 +1551,11 @@
+@@ -1592,13 +1552,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -1044,7 +1044,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1671,7 +1629,8 @@
+@@ -1672,7 +1630,8 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
@@ -1054,7 +1054,7 @@
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
-@@ -1730,7 +1689,9 @@
+@@ -1731,7 +1690,9 @@
Whether to enable automatic network status with
NetworkManager (default: disabled)
--disable-scrollkeeper do not make updates to the scrollkeeper database
@@ -1065,7 +1065,7 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-@@ -1756,7 +1717,7 @@
+@@ -1758,7 +1719,7 @@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
@@ -1074,10 +1074,10 @@
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
-@@ -1845,21 +1806,432 @@
+@@ -1847,21 +1808,432 @@
if $ac_init_version; then
cat <<\_ACEOF
- GNOME Web Browser configure 2.29.90.1
+ GNOME Web Browser configure 2.29.91
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.65
@@ -1505,13 +1505,13 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by GNOME Web Browser $as_me 2.29.90.1, which was
+ It was created by GNOME Web Browser $as_me 2.29.91, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
-@@ -1895,8 +2267,8 @@
+@@ -1897,8 +2269,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1522,7 +1522,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1933,9 +2305,9 @@
+@@ -1935,9 +2307,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1534,7 +1534,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1951,13 +2323,13 @@
+@@ -1953,13 +2325,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -1551,7 +1551,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -1982,13 +2354,13 @@
+@@ -1984,13 +2356,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -1567,7 +1567,7 @@
esac ;;
esac
done
-@@ -2060,39 +2432,41 @@
+@@ -2062,39 +2434,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -1614,7 +1614,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2110,8 +2484,8 @@
+@@ -2112,8 +2486,8 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -1625,7 +1625,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2119,10 +2493,10 @@
+@@ -2121,10 +2495,10 @@
done
if test -r "$cache_file"; then
@@ -1640,7 +1640,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2130,14 +2504,14 @@
+@@ -2132,14 +2506,14 @@
esac
fi
else
@@ -1659,7 +1659,7 @@
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
-@@ -2148,11 +2522,11 @@
+@@ -2150,11 +2524,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -1673,7 +1673,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2162,17 +2536,17 @@
+@@ -2164,17 +2538,17 @@
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -1695,7 +1695,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2184,43 +2558,20 @@
+@@ -2186,43 +2560,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -1746,7 +1746,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2274,24 +2625,16 @@
+@@ -2276,24 +2627,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -1779,7 +1779,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2317,10 +2660,10 @@
+@@ -2319,10 +2662,10 @@
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
@@ -1792,7 +1792,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2328,11 +2671,11 @@
+@@ -2330,11 +2673,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1808,7 +1808,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2369,7 +2712,7 @@
+@@ -2371,7 +2714,7 @@
;;
esac
@@ -1817,7 +1817,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2385,7 +2728,7 @@
+@@ -2387,7 +2730,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -1826,7 +1826,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2396,7 +2739,7 @@
+@@ -2398,7 +2741,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -1835,7 +1835,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2407,15 +2750,11 @@
+@@ -2409,15 +2752,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -1853,7 +1853,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2437,11 +2776,8 @@
+@@ -2439,11 +2778,8 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -1867,7 +1867,7 @@
fi
test "$2" = conftest.file
-@@ -2450,13 +2786,10 @@
+@@ -2452,13 +2788,10 @@
# Ok.
:
else
@@ -1884,7 +1884,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2484,7 +2817,7 @@
+@@ -2486,7 +2819,7 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -1893,7 +1893,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2505,9 +2838,9 @@
+@@ -2507,9 +2840,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -1905,7 +1905,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2518,24 +2851,24 @@
+@@ -2520,24 +2853,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1935,7 +1935,7 @@
$as_echo "no" >&6; }
fi
-@@ -2545,9 +2878,9 @@
+@@ -2547,9 +2880,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -1947,7 +1947,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2558,24 +2891,24 @@
+@@ -2560,24 +2893,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1977,7 +1977,7 @@
$as_echo "no" >&6; }
fi
-@@ -2584,7 +2917,7 @@
+@@ -2586,7 +2919,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -1986,7 +1986,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2597,10 +2930,10 @@
+@@ -2599,10 +2932,10 @@
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -1999,7 +1999,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2608,7 +2941,7 @@
+@@ -2610,7 +2943,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2008,7 +2008,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 #(
-@@ -2620,11 +2953,12 @@
+@@ -2622,11 +2955,12 @@
esac
done
done
@@ -2022,7 +2022,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2632,11 +2966,10 @@
+@@ -2634,11 +2968,10 @@
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
@@ -2035,7 +2035,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2649,9 +2982,9 @@
+@@ -2651,9 +2984,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2047,7 +2047,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2662,24 +2995,24 @@
+@@ -2664,24 +2997,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2077,7 +2077,7 @@
$as_echo "no" >&6; }
fi
-@@ -2687,11 +3020,11 @@
+@@ -2689,11 +3022,11 @@
test -n "$AWK" && break
done
@@ -2091,7 +2091,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2709,11 +3042,11 @@
+@@ -2711,11 +3044,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -2105,7 +2105,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2733,9 +3066,7 @@
+@@ -2735,9 +3068,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -2116,16 +2116,16 @@
fi
fi
-@@ -2750,7 +3081,7 @@
+@@ -2752,7 +3083,7 @@
# Define the identity of the package.
- PACKAGE='epiphany'
+ PACKAGE='epiphany-browser'
- VERSION='2.29.90.1'
-
-
-@@ -2786,7 +3117,7 @@
+ VERSION='2.29.91'
+
+
+@@ -2788,7 +3119,7 @@
AMTAR=${AMTAR-"${am_missing_run}tar"}
@@ -2134,7 +2134,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'
-@@ -2859,13 +3190,13 @@
+@@ -2861,13 +3192,13 @@
done
rm -rf conftest.dir
@@ -2150,7 +2150,7 @@
$as_echo "$am_cv_prog_tar_ustar" >&6; }
-@@ -2875,7 +3206,7 @@
+@@ -2877,7 +3208,7 @@
# Use AM_SILENT_RULES if present
# Check whether --enable-silent-rules was given.
@@ -2159,7 +2159,7 @@
enableval=$enable_silent_rules;
fi
-@@ -2891,16 +3222,16 @@
+@@ -2893,16 +3224,16 @@
enable_maintainer_mode=yes
fi
@@ -2179,7 +2179,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2915,7 +3246,7 @@
+@@ -2917,7 +3248,7 @@
# Check whether --enable-shared was given.
@@ -2188,7 +2188,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -2946,7 +3277,7 @@
+@@ -2948,7 +3279,7 @@
# Check whether --enable-static was given.
@@ -2197,7 +2197,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -2984,7 +3315,7 @@
+@@ -2986,7 +3317,7 @@
case `pwd` in
*\ * | *\ *)
@@ -2206,7 +2206,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -3009,35 +3340,27 @@
+@@ -3011,35 +3342,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -2249,7 +2249,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -3053,28 +3376,24 @@
+@@ -3055,28 +3378,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -2283,7 +2283,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -3102,7 +3421,7 @@
+@@ -3104,7 +3423,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -2292,7 +2292,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -3130,12 +3449,12 @@
+@@ -3132,12 +3451,12 @@
fi
@@ -2307,7 +2307,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -3160,9 +3479,9 @@
+@@ -3162,9 +3481,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -2319,7 +2319,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3173,24 +3492,24 @@
+@@ -3175,24 +3494,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2349,7 +2349,7 @@
$as_echo "no" >&6; }
fi
-@@ -3200,9 +3519,9 @@
+@@ -3202,9 +3521,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -2361,7 +2361,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3213,24 +3532,24 @@
+@@ -3215,24 +3534,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2391,7 +2391,7 @@
$as_echo "no" >&6; }
fi
-@@ -3239,7 +3558,7 @@
+@@ -3241,7 +3560,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2400,7 +2400,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3253,9 +3572,9 @@
+@@ -3255,9 +3574,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -2412,7 +2412,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3266,24 +3585,24 @@
+@@ -3268,24 +3587,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2442,7 +2442,7 @@
$as_echo "no" >&6; }
fi
-@@ -3293,9 +3612,9 @@
+@@ -3295,9 +3614,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -2454,7 +2454,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3307,18 +3626,18 @@
+@@ -3309,18 +3628,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2476,7 +2476,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3337,10 +3656,10 @@
+@@ -3339,10 +3658,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2489,7 +2489,7 @@
$as_echo "no" >&6; }
fi
-@@ -3352,9 +3671,9 @@
+@@ -3354,9 +3673,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -2501,7 +2501,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3365,24 +3684,24 @@
+@@ -3367,24 +3686,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2531,7 +2531,7 @@
$as_echo "no" >&6; }
fi
-@@ -3396,9 +3715,9 @@
+@@ -3398,9 +3717,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2543,7 +2543,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3409,24 +3728,24 @@
+@@ -3411,24 +3730,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2573,7 +2573,7 @@
$as_echo "no" >&6; }
fi
-@@ -3439,7 +3758,7 @@
+@@ -3441,7 +3760,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2582,7 +2582,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3450,57 +3769,37 @@
+@@ -3452,57 +3771,37 @@
fi
@@ -2660,7 +2660,7 @@
/* end confdefs.h. */
int
-@@ -3516,8 +3815,8 @@
+@@ -3518,8 +3817,8 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -2671,7 +2671,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3533,17 +3832,17 @@
+@@ -3535,17 +3834,17 @@
done
rm -f $ac_rmfiles
@@ -2694,7 +2694,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,
-@@ -3560,7 +3859,7 @@
+@@ -3562,7 +3861,7 @@
# certainly right.
break;;
*.* )
@@ -2703,7 +2703,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3579,84 +3878,42 @@
+@@ -3581,84 +3880,42 @@
else
ac_file=''
fi
@@ -2809,7 +2809,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
-@@ -3671,32 +3928,83 @@
+@@ -3673,32 +3930,83 @@
esac
done
else
@@ -2909,7 +2909,7 @@
/* end confdefs.h. */
int
-@@ -3708,17 +4016,17 @@
+@@ -3710,17 +4018,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -2932,7 +2932,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3731,31 +4039,23 @@
+@@ -3733,31 +4041,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2971,7 +2971,7 @@
/* end confdefs.h. */
int
-@@ -3769,37 +4069,16 @@
+@@ -3771,37 +4071,16 @@
return 0;
}
_ACEOF
@@ -3012,7 +3012,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3808,20 +4087,16 @@
+@@ -3810,20 +4089,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -3036,7 +3036,7 @@
/* end confdefs.h. */
int
-@@ -3832,35 +4107,11 @@
+@@ -3834,35 +4109,11 @@
return 0;
}
_ACEOF
@@ -3075,7 +3075,7 @@
/* end confdefs.h. */
int
-@@ -3871,36 +4122,12 @@
+@@ -3873,36 +4124,12 @@
return 0;
}
_ACEOF
@@ -3116,7 +3116,7 @@
/* end confdefs.h. */
int
-@@ -3911,42 +4138,17 @@
+@@ -3913,42 +4140,17 @@
return 0;
}
_ACEOF
@@ -3161,7 +3161,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3963,18 +4165,14 @@
+@@ -3965,18 +4167,14 @@
CFLAGS=
fi
fi
@@ -3183,7 +3183,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -4031,32 +4229,9 @@
+@@ -4033,32 +4231,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -3217,7 +3217,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -4067,17 +4242,19 @@
+@@ -4069,17 +4244,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -3240,7 +3240,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -4087,9 +4264,9 @@
+@@ -4089,9 +4266,9 @@
depcc="$CC" am_compiler_list=
@@ -3252,7 +3252,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4197,7 +4374,7 @@
+@@ -4199,7 +4376,7 @@
fi
fi
@@ -3261,7 +3261,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4212,9 +4389,9 @@
+@@ -4214,9 +4391,9 @@
fi
@@ -3273,7 +3273,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -4222,7 +4399,7 @@
+@@ -4224,7 +4401,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -3282,7 +3282,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -4231,7 +4408,7 @@
+@@ -4233,7 +4410,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3291,7 +3291,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
-@@ -4251,7 +4428,7 @@
+@@ -4253,7 +4430,7 @@
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3300,7 +3300,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"
-@@ -4266,19 +4443,17 @@
+@@ -4268,19 +4445,17 @@
$ac_path_SED_found && break 3
done
done
@@ -3323,7 +3323,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -4296,9 +4471,9 @@
+@@ -4298,9 +4473,9 @@
@@ -3335,7 +3335,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4309,7 +4484,7 @@
+@@ -4311,7 +4486,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3344,7 +3344,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
-@@ -4329,7 +4504,7 @@
+@@ -4331,7 +4506,7 @@
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3353,7 +3353,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"
-@@ -4344,26 +4519,24 @@
+@@ -4346,26 +4521,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -3385,7 +3385,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4377,7 +4550,7 @@
+@@ -4379,7 +4552,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3394,7 +3394,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
-@@ -4397,7 +4570,7 @@
+@@ -4399,7 +4572,7 @@
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3403,7 +3403,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"
-@@ -4412,12 +4585,10 @@
+@@ -4414,12 +4587,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -3418,7 +3418,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4425,14 +4596,14 @@
+@@ -4427,14 +4598,14 @@
fi
fi
@@ -3436,7 +3436,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -4446,7 +4617,7 @@
+@@ -4448,7 +4619,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3445,7 +3445,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
-@@ -4466,7 +4637,7 @@
+@@ -4468,7 +4639,7 @@
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3454,7 +3454,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"
-@@ -4481,12 +4652,10 @@
+@@ -4483,12 +4654,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -3469,7 +3469,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -4494,7 +4663,7 @@
+@@ -4496,7 +4665,7 @@
fi
fi
@@ -3478,7 +3478,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -4520,7 +4689,7 @@
+@@ -4522,7 +4691,7 @@
# Check whether --with-gnu-ld was given.
@@ -3487,7 +3487,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -4529,7 +4698,7 @@
+@@ -4531,7 +4700,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -3496,7 +3496,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -4559,13 +4728,13 @@
+@@ -4561,13 +4730,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -3513,7 +3513,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -4596,18 +4765,16 @@
+@@ -4598,18 +4767,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -3537,7 +3537,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -4620,7 +4787,7 @@
+@@ -4622,7 +4789,7 @@
;;
esac
fi
@@ -3546,7 +3546,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -4632,9 +4799,9 @@
+@@ -4634,9 +4801,9 @@
@@ -3558,7 +3558,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -4681,7 +4848,7 @@
+@@ -4683,7 +4850,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -3567,7 +3567,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -4692,9 +4859,9 @@
+@@ -4694,9 +4861,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -3579,7 +3579,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -4705,24 +4872,24 @@
+@@ -4707,24 +4874,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3609,7 +3609,7 @@
$as_echo "no" >&6; }
fi
-@@ -4736,9 +4903,9 @@
+@@ -4738,9 +4905,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -3621,7 +3621,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -4749,24 +4916,24 @@
+@@ -4751,24 +4918,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3651,7 +3651,7 @@
$as_echo "no" >&6; }
fi
-@@ -4779,7 +4946,7 @@
+@@ -4781,7 +4948,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3660,7 +3660,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4799,44 +4966,44 @@
+@@ -4801,44 +4968,44 @@
@@ -3673,16 +3673,16 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:4809: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:4976: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:4811: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:4978: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:4812: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:4979: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:4814: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:4981: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:4815: output\"" >&5)
-+ (eval echo "\"\$as_me:4982: output\"" >&5)
+- (eval echo "\"\$as_me:4817: output\"" >&5)
++ (eval echo "\"\$as_me:4984: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -3716,7 +3716,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -4954,10 +5121,10 @@
+@@ -4956,10 +5123,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -3729,7 +3729,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -4971,7 +5138,7 @@
+@@ -4973,7 +5140,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -3738,7 +3738,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -4981,17 +5148,17 @@
+@@ -4983,17 +5150,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -3759,7 +3759,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -5026,14 +5193,14 @@
+@@ -5028,14 +5195,14 @@
@@ -3777,7 +3777,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -5062,9 +5229,9 @@
+@@ -5064,9 +5231,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -3789,7 +3789,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -5075,24 +5242,24 @@
+@@ -5077,24 +5244,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3819,7 +3819,7 @@
$as_echo "no" >&6; }
fi
-@@ -5102,9 +5269,9 @@
+@@ -5104,9 +5271,9 @@
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -3831,7 +3831,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -5115,24 +5282,24 @@
+@@ -5117,24 +5284,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3861,7 +3861,7 @@
$as_echo "no" >&6; }
fi
-@@ -5141,7 +5308,7 @@
+@@ -5143,7 +5310,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3870,7 +3870,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5161,9 +5328,9 @@
+@@ -5163,9 +5330,9 @@
@@ -3882,7 +3882,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -5278,11 +5445,11 @@
+@@ -5280,11 +5447,11 @@
;;
# This must be Linux ELF.
@@ -3896,7 +3896,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -5357,7 +5524,7 @@
+@@ -5359,7 +5526,7 @@
esac
fi
@@ -3905,7 +3905,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
-@@ -5377,9 +5544,9 @@
+@@ -5379,9 +5546,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -3917,7 +3917,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -5390,24 +5557,24 @@
+@@ -5392,24 +5559,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3947,7 +3947,7 @@
$as_echo "no" >&6; }
fi
-@@ -5417,9 +5584,9 @@
+@@ -5419,9 +5586,9 @@
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -3959,7 +3959,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -5430,24 +5597,24 @@
+@@ -5432,24 +5599,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3989,7 +3989,7 @@
$as_echo "no" >&6; }
fi
-@@ -5456,7 +5623,7 @@
+@@ -5458,7 +5625,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3998,7 +3998,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5482,9 +5649,9 @@
+@@ -5484,9 +5651,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -4010,7 +4010,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -5495,24 +5662,24 @@
+@@ -5497,24 +5664,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4040,7 +4040,7 @@
$as_echo "no" >&6; }
fi
-@@ -5522,9 +5689,9 @@
+@@ -5524,9 +5691,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -4052,7 +4052,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -5535,24 +5702,24 @@
+@@ -5537,24 +5704,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4082,7 +4082,7 @@
$as_echo "no" >&6; }
fi
-@@ -5561,7 +5728,7 @@
+@@ -5563,7 +5730,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4091,7 +4091,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5581,9 +5748,9 @@
+@@ -5583,9 +5750,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -4103,7 +4103,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -5594,24 +5761,24 @@
+@@ -5596,24 +5763,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4133,7 +4133,7 @@
$as_echo "no" >&6; }
fi
-@@ -5621,9 +5788,9 @@
+@@ -5623,9 +5790,9 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -4145,7 +4145,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -5634,24 +5801,24 @@
+@@ -5636,24 +5803,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4175,7 +4175,7 @@
$as_echo "no" >&6; }
fi
-@@ -5660,7 +5827,7 @@
+@@ -5662,7 +5829,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4184,7 +4184,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5738,9 +5905,9 @@
+@@ -5740,9 +5907,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -4196,7 +4196,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -5856,18 +6023,18 @@
+@@ -5858,18 +6025,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -4221,7 +4221,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -5920,11 +6087,11 @@
+@@ -5922,11 +6089,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -4236,7 +4236,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -5958,10 +6125,10 @@
+@@ -5960,10 +6127,10 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -4249,7 +4249,7 @@
$as_echo "ok" >&6; }
fi
-@@ -5988,7 +6155,7 @@
+@@ -5990,7 +6157,7 @@
# Check whether --enable-libtool-lock was given.
@@ -4258,7 +4258,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -6000,11 +6167,11 @@
+@@ -6002,11 +6169,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4273,13 +4273,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -6018,12 +6185,12 @@
+@@ -6020,12 +6187,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6021 "configure"' > conftest.$ac_ext
+- echo '#line 6023 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 6188 "configure"' > conftest.$ac_ext
++ echo '#line 6190 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4290,7 +4290,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -6057,11 +6224,11 @@
+@@ -6059,11 +6226,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4305,7 +4305,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -6110,9 +6277,9 @@
+@@ -6112,9 +6279,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -4317,7 +4317,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -6121,11 +6288,7 @@
+@@ -6123,11 +6290,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4330,7 +4330,7 @@
/* end confdefs.h. */
int
-@@ -6136,38 +6299,13 @@
+@@ -6138,38 +6301,13 @@
return 0;
}
_ACEOF
@@ -4373,7 +4373,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -6175,7 +6313,7 @@
+@@ -6177,7 +6315,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -4382,7 +4382,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
-@@ -6185,11 +6323,11 @@
+@@ -6187,11 +6325,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4397,7 +4397,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -6215,9 +6353,9 @@
+@@ -6217,9 +6355,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -4409,7 +4409,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -6228,24 +6366,24 @@
+@@ -6230,24 +6368,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4439,7 +4439,7 @@
$as_echo "no" >&6; }
fi
-@@ -6255,9 +6393,9 @@
+@@ -6257,9 +6395,9 @@
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
@@ -4451,7 +4451,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -6268,24 +6406,24 @@
+@@ -6270,24 +6408,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4481,7 +4481,7 @@
$as_echo "no" >&6; }
fi
-@@ -6294,7 +6432,7 @@
+@@ -6296,7 +6434,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4490,7 +4490,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6307,9 +6445,9 @@
+@@ -6309,9 +6447,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -4502,7 +4502,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -6320,24 +6458,24 @@
+@@ -6322,24 +6460,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4532,7 +4532,7 @@
$as_echo "no" >&6; }
fi
-@@ -6347,9 +6485,9 @@
+@@ -6349,9 +6487,9 @@
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
@@ -4544,7 +4544,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -6360,24 +6498,24 @@
+@@ -6362,24 +6500,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4574,7 +4574,7 @@
$as_echo "no" >&6; }
fi
-@@ -6386,7 +6524,7 @@
+@@ -6388,7 +6526,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4583,7 +4583,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6399,9 +6537,9 @@
+@@ -6401,9 +6539,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -4595,7 +4595,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -6412,24 +6550,24 @@
+@@ -6414,24 +6552,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4625,7 +4625,7 @@
$as_echo "no" >&6; }
fi
-@@ -6439,9 +6577,9 @@
+@@ -6441,9 +6579,9 @@
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
@@ -4637,7 +4637,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -6452,24 +6590,24 @@
+@@ -6454,24 +6592,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4667,7 +4667,7 @@
$as_echo "no" >&6; }
fi
-@@ -6478,7 +6616,7 @@
+@@ -6480,7 +6618,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4676,7 +4676,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6491,9 +6629,9 @@
+@@ -6493,9 +6631,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -4688,7 +4688,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -6504,24 +6642,24 @@
+@@ -6506,24 +6644,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4718,7 +4718,7 @@
$as_echo "no" >&6; }
fi
-@@ -6531,9 +6669,9 @@
+@@ -6533,9 +6671,9 @@
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
@@ -4730,7 +4730,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -6544,24 +6682,24 @@
+@@ -6546,24 +6684,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4760,7 +4760,7 @@
$as_echo "no" >&6; }
fi
-@@ -6570,7 +6708,7 @@
+@@ -6572,7 +6710,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4769,7 +4769,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6583,9 +6721,9 @@
+@@ -6585,9 +6723,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -4781,7 +4781,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -6596,24 +6734,24 @@
+@@ -6598,24 +6736,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4811,7 +4811,7 @@
$as_echo "no" >&6; }
fi
-@@ -6623,9 +6761,9 @@
+@@ -6625,9 +6763,9 @@
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
@@ -4823,7 +4823,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -6636,24 +6774,24 @@
+@@ -6638,24 +6776,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4853,7 +4853,7 @@
$as_echo "no" >&6; }
fi
-@@ -6662,7 +6800,7 @@
+@@ -6664,7 +6802,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4862,7 +4862,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6698,9 +6836,9 @@
+@@ -6700,9 +6838,9 @@
@@ -4874,7 +4874,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -6725,22 +6863,18 @@
+@@ -6727,22 +6865,18 @@
rm -f conftest.*
fi
fi
@@ -4901,7 +4901,7 @@
/* end confdefs.h. */
int
-@@ -6751,42 +6885,17 @@
+@@ -6753,42 +6887,17 @@
return 0;
}
_ACEOF
@@ -4949,7 +4949,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -6828,14 +6937,14 @@
+@@ -6830,14 +6939,14 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4966,7 +4966,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -6850,11 +6959,7 @@
+@@ -6852,11 +6961,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -4979,7 +4979,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -6863,78 +6968,34 @@
+@@ -6865,78 +6970,34 @@
#endif
Syntax error
_ACEOF
@@ -5063,7 +5063,7 @@
break
fi
-@@ -6946,7 +7007,7 @@
+@@ -6948,7 +7009,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -5072,7 +5072,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -6957,11 +7018,7 @@
+@@ -6959,11 +7020,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -5085,7 +5085,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -6970,87 +7027,40 @@
+@@ -6972,87 +7029,40 @@
#endif
Syntax error
_ACEOF
@@ -5182,7 +5182,7 @@
fi
ac_ext=c
-@@ -7060,16 +7070,12 @@
+@@ -7062,16 +7072,12 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -5202,7 +5202,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -7084,48 +7090,23 @@
+@@ -7086,48 +7092,23 @@
return 0;
}
_ACEOF
@@ -5256,7 +5256,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -7135,18 +7116,14 @@
+@@ -7137,18 +7118,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -5278,7 +5278,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -7156,14 +7133,10 @@
+@@ -7158,14 +7135,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -5295,7 +5295,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -7190,118 +7163,34 @@
+@@ -7192,118 +7165,34 @@
return 0;
}
_ACEOF
@@ -5427,7 +5427,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -7311,62 +7200,13 @@
+@@ -7313,62 +7202,13 @@
done
@@ -5495,7 +5495,7 @@
_ACEOF
fi
-@@ -7387,7 +7227,7 @@
+@@ -7389,7 +7229,7 @@
# Check whether --with-pic was given.
@@ -5504,7 +5504,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -7403,7 +7243,7 @@
+@@ -7405,7 +7245,7 @@
# Check whether --enable-fast-install was given.
@@ -5513,7 +5513,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -7484,9 +7324,9 @@
+@@ -7486,9 +7326,9 @@
setopt NO_GLOB_SUBST
fi
@@ -5525,7 +5525,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -7499,7 +7339,7 @@
+@@ -7501,7 +7341,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -5534,7 +5534,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -7592,9 +7432,9 @@
+@@ -7594,9 +7434,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -5546,7 +5546,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -7645,10 +7485,10 @@
+@@ -7647,10 +7487,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -5559,7 +5559,7 @@
$as_echo "no" >&6; }
fi
-@@ -7658,9 +7498,9 @@
+@@ -7660,9 +7500,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -5571,7 +5571,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -7711,10 +7551,10 @@
+@@ -7713,10 +7553,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -5584,7 +5584,7 @@
$as_echo "no" >&6; }
fi
-@@ -7795,9 +7635,9 @@
+@@ -7797,9 +7637,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -5596,21 +5596,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -7813,11 +7653,11 @@
+@@ -7815,11 +7655,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:7816: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7656: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:7818: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7658: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:7820: \$? = $ac_status" >&5
-+ echo "$as_me:7660: \$? = $ac_status" >&5
+- echo "$as_me:7822: \$? = $ac_status" >&5
++ echo "$as_me:7662: \$? = $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.
-@@ -7830,7 +7670,7 @@
+@@ -7832,7 +7672,7 @@
$RM conftest*
fi
@@ -5619,7 +5619,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -7850,7 +7690,7 @@
+@@ -7852,7 +7692,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -5628,7 +5628,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -7982,7 +7822,7 @@
+@@ -7984,7 +7824,7 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -5637,7 +5637,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -8122,7 +7962,7 @@
+@@ -8124,7 +7964,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -5646,7 +5646,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -8134,9 +7974,9 @@
+@@ -8136,9 +7976,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -5658,21 +5658,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -8152,11 +7992,11 @@
+@@ -8154,11 +7994,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:8155: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7995: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8157: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7997: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8159: \$? = $ac_status" >&5
-+ echo "$as_me:7999: \$? = $ac_status" >&5
+- echo "$as_me:8161: \$? = $ac_status" >&5
++ echo "$as_me:8001: \$? = $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.
-@@ -8169,7 +8009,7 @@
+@@ -8171,7 +8011,7 @@
$RM conftest*
fi
@@ -5681,7 +5681,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -8193,9 +8033,9 @@
+@@ -8195,9 +8035,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -5693,7 +5693,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -8221,7 +8061,7 @@
+@@ -8223,7 +8063,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -5702,7 +5702,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -8236,9 +8076,9 @@
+@@ -8238,9 +8078,9 @@
@@ -5714,21 +5714,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8257,11 +8097,11 @@
+@@ -8259,11 +8099,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:8260: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8100: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8262: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8102: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8264: \$? = $ac_status" >&5
-+ echo "$as_me:8104: \$? = $ac_status" >&5
+- echo "$as_me:8266: \$? = $ac_status" >&5
++ echo "$as_me:8106: \$? = $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
-@@ -8283,7 +8123,7 @@
+@@ -8285,7 +8125,7 @@
$RM conftest*
fi
@@ -5737,7 +5737,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -8291,9 +8131,9 @@
+@@ -8293,9 +8133,9 @@
@@ -5749,21 +5749,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8312,11 +8152,11 @@
+@@ -8314,11 +8154,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:8315: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8155: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8317: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8157: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8319: \$? = $ac_status" >&5
-+ echo "$as_me:8159: \$? = $ac_status" >&5
+- echo "$as_me:8321: \$? = $ac_status" >&5
++ echo "$as_me:8161: \$? = $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
-@@ -8338,7 +8178,7 @@
+@@ -8340,7 +8180,7 @@
$RM conftest*
fi
@@ -5772,7 +5772,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -8347,7 +8187,7 @@
+@@ -8349,7 +8189,7 @@
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -5781,7 +5781,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -8355,10 +8195,10 @@
+@@ -8357,10 +8197,10 @@
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -5794,7 +5794,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -8371,7 +8211,7 @@
+@@ -8373,7 +8213,7 @@
@@ -5803,7 +5803,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -8431,6 +8271,9 @@
+@@ -8433,6 +8273,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -5813,7 +5813,7 @@
esac
ld_shlibs=yes
-@@ -8452,6 +8295,7 @@
+@@ -8454,6 +8297,7 @@
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -5821,7 +5821,7 @@
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -8543,7 +8387,7 @@
+@@ -8545,7 +8389,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -5830,7 +5830,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -8613,7 +8457,7 @@
+@@ -8615,7 +8459,7 @@
fi
;;
@@ -5839,7 +5839,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -8788,6 +8632,7 @@
+@@ -8790,6 +8634,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -5847,7 +5847,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -8813,11 +8658,7 @@
+@@ -8815,11 +8660,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -5860,7 +5860,7 @@
/* end confdefs.h. */
int
-@@ -8828,27 +8669,7 @@
+@@ -8830,27 +8671,7 @@
return 0;
}
_ACEOF
@@ -5889,7 +5889,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -8862,16 +8683,9 @@
+@@ -8864,16 +8685,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -5908,7 +5908,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -8884,11 +8698,7 @@
+@@ -8886,11 +8700,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -5921,7 +5921,7 @@
/* end confdefs.h. */
int
-@@ -8899,27 +8709,7 @@
+@@ -8901,27 +8711,7 @@
return 0;
}
_ACEOF
@@ -5950,7 +5950,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -8933,16 +8723,9 @@
+@@ -8935,16 +8725,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -5969,7 +5969,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -9154,42 +8937,16 @@
+@@ -9156,42 +8939,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -6017,7 +6017,7 @@
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -9202,7 +8959,7 @@
+@@ -9204,7 +8961,7 @@
link_all_deplibs=yes
;;
@@ -6026,7 +6026,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9445,7 +9202,7 @@
+@@ -9447,7 +9204,7 @@
fi
fi
@@ -6035,7 +6035,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -9482,16 +9239,16 @@
+@@ -9484,16 +9241,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -6056,7 +6056,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -9505,11 +9262,11 @@
+@@ -9507,11 +9264,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -6071,7 +6071,7 @@
then
archive_cmds_need_lc=no
else
-@@ -9520,7 +9277,7 @@
+@@ -9522,7 +9279,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -6080,7 +6080,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -9684,7 +9441,7 @@
+@@ -9686,7 +9443,7 @@
@@ -6089,7 +6089,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -10092,7 +9849,7 @@
+@@ -10094,7 +9851,7 @@
;;
# This must be Linux ELF.
@@ -6098,7 +6098,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10106,11 +9863,7 @@
+@@ -10108,11 +9865,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -6111,7 +6111,7 @@
/* end confdefs.h. */
int
-@@ -10121,41 +9874,13 @@
+@@ -10123,41 +9876,13 @@
return 0;
}
_ACEOF
@@ -6157,7 +6157,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -10164,13 +9889,10 @@
+@@ -10166,13 +9891,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -6172,7 +6172,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10182,6 +9904,18 @@
+@@ -10184,6 +9906,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6191,7 +6191,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10370,7 +10104,7 @@
+@@ -10372,7 +10106,7 @@
dynamic_linker=no
;;
esac
@@ -6200,7 +6200,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -10472,7 +10206,7 @@
+@@ -10474,7 +10208,7 @@
@@ -6209,7 +6209,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -10497,7 +10231,7 @@
+@@ -10499,7 +10233,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -6218,7 +6218,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -10542,18 +10276,14 @@
+@@ -10544,18 +10278,14 @@
darwin*)
# if libdl is installed we need to link against it
@@ -6240,7 +6240,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10571,43 +10301,18 @@
+@@ -10573,43 +10303,18 @@
return 0;
}
_ACEOF
@@ -6290,7 +6290,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -10620,106 +10325,18 @@
+@@ -10622,106 +10327,18 @@
;;
*)
@@ -6402,7 +6402,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10737,145 +10354,32 @@
+@@ -10739,145 +10356,32 @@
return 0;
}
_ACEOF
@@ -6559,7 +6559,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10893,57 +10397,28 @@
+@@ -10895,57 +10399,28 @@
return 0;
}
_ACEOF
@@ -6626,7 +6626,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10961,57 +10436,28 @@
+@@ -10963,57 +10438,28 @@
return 0;
}
_ACEOF
@@ -6693,7 +6693,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11029,43 +10475,18 @@
+@@ -11031,43 +10477,18 @@
return 0;
}
_ACEOF
@@ -6743,7 +6743,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -11104,9 +10525,9 @@
+@@ -11106,9 +10527,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -6755,16 +6755,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11115,7 +10536,7 @@
+@@ -11117,7 +10538,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 11118 "configure"
-+#line 10539 "configure"
+-#line 11120 "configure"
++#line 10541 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11174,11 +10595,11 @@
+@@ -11176,11 +10597,11 @@
return status;
}
_LT_EOF
@@ -6779,7 +6779,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -11195,14 +10616,14 @@
+@@ -11197,14 +10618,14 @@
fi
@@ -6797,16 +6797,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11211,7 +10632,7 @@
+@@ -11213,7 +10634,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 11214 "configure"
-+#line 10635 "configure"
+-#line 11216 "configure"
++#line 10637 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11270,11 +10691,11 @@
+@@ -11272,11 +10693,11 @@
return status;
}
_LT_EOF
@@ -6821,7 +6821,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -11291,7 +10712,7 @@
+@@ -11293,7 +10714,7 @@
fi
@@ -6830,7 +6830,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -11330,12 +10751,12 @@
+@@ -11332,12 +10753,12 @@
striplib=
old_striplib=
@@ -6845,7 +6845,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -11344,15 +10765,15 @@
+@@ -11346,15 +10767,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -6864,7 +6864,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -11370,12 +10791,12 @@
+@@ -11372,12 +10793,12 @@
# Report which library types will actually be built
@@ -6880,7 +6880,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -11396,14 +10817,14 @@
+@@ -11398,14 +10819,14 @@
fi
;;
esac
@@ -6898,7 +6898,7 @@
$as_echo "$enable_static" >&6; }
-@@ -11439,17 +10860,13 @@
+@@ -11441,17 +10862,13 @@
@@ -6919,7 +6919,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11474,54 +10891,27 @@
+@@ -11476,54 +10893,27 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -6982,7 +6982,7 @@
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-@@ -11534,9 +10924,9 @@
+@@ -11536,9 +10926,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -6994,7 +6994,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11547,24 +10937,24 @@
+@@ -11549,24 +10939,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7024,7 +7024,7 @@
$as_echo "no" >&6; }
fi
-@@ -11574,9 +10964,9 @@
+@@ -11576,9 +10966,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -7036,7 +7036,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -11587,24 +10977,24 @@
+@@ -11589,24 +10979,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7066,7 +7066,7 @@
$as_echo "no" >&6; }
fi
-@@ -11613,7 +11003,7 @@
+@@ -11615,7 +11005,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7075,7 +7075,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -11627,9 +11017,9 @@
+@@ -11629,9 +11019,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -7087,7 +7087,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11640,24 +11030,24 @@
+@@ -11642,24 +11032,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7117,7 +7117,7 @@
$as_echo "no" >&6; }
fi
-@@ -11667,9 +11057,9 @@
+@@ -11669,9 +11059,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -7129,7 +7129,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11681,18 +11071,18 @@
+@@ -11683,18 +11073,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7151,7 +7151,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -11711,10 +11101,10 @@
+@@ -11713,10 +11103,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7164,7 +7164,7 @@
$as_echo "no" >&6; }
fi
-@@ -11726,9 +11116,9 @@
+@@ -11728,9 +11118,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -7176,7 +7176,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11739,24 +11129,24 @@
+@@ -11741,24 +11131,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7206,7 +7206,7 @@
$as_echo "no" >&6; }
fi
-@@ -11770,9 +11160,9 @@
+@@ -11772,9 +11162,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -7218,7 +7218,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -11783,24 +11173,24 @@
+@@ -11785,24 +11175,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7248,7 +7248,7 @@
$as_echo "no" >&6; }
fi
-@@ -11813,7 +11203,7 @@
+@@ -11815,7 +11205,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7257,7 +7257,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -11824,62 +11214,42 @@
+@@ -11826,62 +11216,42 @@
fi
@@ -7342,7 +7342,7 @@
/* end confdefs.h. */
int
-@@ -11893,37 +11263,16 @@
+@@ -11895,37 +11265,16 @@
return 0;
}
_ACEOF
@@ -7383,7 +7383,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -11932,20 +11281,16 @@
+@@ -11934,20 +11283,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -7407,7 +7407,7 @@
/* end confdefs.h. */
int
-@@ -11956,35 +11301,11 @@
+@@ -11958,35 +11303,11 @@
return 0;
}
_ACEOF
@@ -7446,7 +7446,7 @@
/* end confdefs.h. */
int
-@@ -11995,36 +11316,12 @@
+@@ -11997,36 +11318,12 @@
return 0;
}
_ACEOF
@@ -7487,7 +7487,7 @@
/* end confdefs.h. */
int
-@@ -12035,42 +11332,17 @@
+@@ -12037,42 +11334,17 @@
return 0;
}
_ACEOF
@@ -7532,7 +7532,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -12087,18 +11359,14 @@
+@@ -12089,18 +11361,14 @@
CFLAGS=
fi
fi
@@ -7554,7 +7554,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -12155,32 +11423,9 @@
+@@ -12157,32 +11425,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -7588,7 +7588,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -12191,17 +11436,19 @@
+@@ -12193,17 +11438,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -7611,7 +7611,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -12211,9 +11458,9 @@
+@@ -12213,9 +11460,9 @@
depcc="$CC" am_compiler_list=
@@ -7623,7 +7623,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -12321,7 +11568,7 @@
+@@ -12323,7 +11570,7 @@
fi
fi
@@ -7632,7 +7632,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -12344,9 +11591,9 @@
+@@ -12346,9 +11593,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -7644,7 +7644,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12357,24 +11604,24 @@
+@@ -12359,24 +11606,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7674,7 +7674,7 @@
$as_echo "no" >&6; }
fi
-@@ -12384,9 +11631,9 @@
+@@ -12386,9 +11633,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -7686,7 +7686,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -12397,24 +11644,24 @@
+@@ -12399,24 +11646,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7716,7 +7716,7 @@
$as_echo "no" >&6; }
fi
-@@ -12423,7 +11670,7 @@
+@@ -12425,7 +11672,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7725,7 +7725,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -12437,9 +11684,9 @@
+@@ -12439,9 +11686,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -7737,7 +7737,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12450,24 +11697,24 @@
+@@ -12452,24 +11699,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7767,7 +7767,7 @@
$as_echo "no" >&6; }
fi
-@@ -12477,9 +11724,9 @@
+@@ -12479,9 +11726,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -7779,7 +7779,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12491,18 +11738,18 @@
+@@ -12493,18 +11740,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7801,7 +7801,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -12521,10 +11768,10 @@
+@@ -12523,10 +11770,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7814,7 +7814,7 @@
$as_echo "no" >&6; }
fi
-@@ -12536,9 +11783,9 @@
+@@ -12538,9 +11785,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -7826,7 +7826,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12549,24 +11796,24 @@
+@@ -12551,24 +11798,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7856,7 +7856,7 @@
$as_echo "no" >&6; }
fi
-@@ -12580,9 +11827,9 @@
+@@ -12582,9 +11829,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -7868,7 +7868,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -12593,24 +11840,24 @@
+@@ -12595,24 +11842,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7898,7 +7898,7 @@
$as_echo "no" >&6; }
fi
-@@ -12623,7 +11870,7 @@
+@@ -12625,7 +11872,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7907,7 +7907,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -12634,62 +11881,42 @@
+@@ -12636,62 +11883,42 @@
fi
@@ -7992,7 +7992,7 @@
/* end confdefs.h. */
int
-@@ -12703,37 +11930,16 @@
+@@ -12705,37 +11932,16 @@
return 0;
}
_ACEOF
@@ -8033,7 +8033,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -12742,20 +11948,16 @@
+@@ -12744,20 +11950,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -8057,7 +8057,7 @@
/* end confdefs.h. */
int
-@@ -12766,35 +11968,11 @@
+@@ -12768,35 +11970,11 @@
return 0;
}
_ACEOF
@@ -8096,7 +8096,7 @@
/* end confdefs.h. */
int
-@@ -12805,36 +11983,12 @@
+@@ -12807,36 +11985,12 @@
return 0;
}
_ACEOF
@@ -8137,7 +8137,7 @@
/* end confdefs.h. */
int
-@@ -12845,42 +11999,17 @@
+@@ -12847,42 +12001,17 @@
return 0;
}
_ACEOF
@@ -8182,7 +8182,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -12897,18 +12026,14 @@
+@@ -12899,18 +12028,14 @@
CFLAGS=
fi
fi
@@ -8204,7 +8204,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -12965,32 +12090,9 @@
+@@ -12967,32 +12092,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -8238,7 +8238,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -13001,17 +12103,19 @@
+@@ -13003,17 +12105,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -8261,7 +8261,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -13021,9 +12125,9 @@
+@@ -13023,9 +12127,9 @@
depcc="$CC" am_compiler_list=
@@ -8273,7 +8273,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -13131,7 +12235,7 @@
+@@ -13133,7 +12237,7 @@
fi
fi
@@ -8282,7 +8282,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -13149,16 +12253,12 @@
+@@ -13151,16 +12255,12 @@
am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
@@ -8302,7 +8302,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -13173,48 +12273,23 @@
+@@ -13175,48 +12275,23 @@
return 0;
}
_ACEOF
@@ -8356,7 +8356,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -13224,18 +12299,14 @@
+@@ -13226,18 +12301,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -8378,7 +8378,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -13245,14 +12316,10 @@
+@@ -13247,14 +12318,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -8395,7 +8395,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -13279,60 +12346,31 @@
+@@ -13281,60 +12348,31 @@
return 0;
}
_ACEOF
@@ -8465,7 +8465,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -13345,14 +12383,14 @@
+@@ -13347,14 +12385,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8483,7 +8483,7 @@
IFS=$as_save_IFS
;;
-@@ -13360,19 +12398,19 @@
+@@ -13362,19 +12400,19 @@
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -8507,7 +8507,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_MKENUMS in
-@@ -13385,14 +12423,14 @@
+@@ -13387,14 +12425,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8525,7 +8525,7 @@
IFS=$as_save_IFS
;;
-@@ -13400,26 +12438,26 @@
+@@ -13402,26 +12440,26 @@
fi
GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
if test -n "$GLIB_MKENUMS"; then
@@ -8557,7 +8557,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -13427,35 +12465,31 @@
+@@ -13429,35 +12467,31 @@
case "$am__api_version" in
1.01234)
@@ -8599,7 +8599,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -13468,14 +12502,14 @@
+@@ -13470,14 +12504,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8617,7 +8617,7 @@
IFS=$as_save_IFS
;;
-@@ -13483,19 +12517,19 @@
+@@ -13485,19 +12519,19 @@
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -8641,7 +8641,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -13508,14 +12542,14 @@
+@@ -13510,14 +12544,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8659,7 +8659,7 @@
IFS=$as_save_IFS
;;
-@@ -13523,19 +12557,19 @@
+@@ -13525,19 +12559,19 @@
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -8683,7 +8683,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -13548,14 +12582,14 @@
+@@ -13550,14 +12584,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8701,7 +8701,7 @@
IFS=$as_save_IFS
;;
-@@ -13563,18 +12597,16 @@
+@@ -13565,18 +12599,16 @@
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -8723,7 +8723,7 @@
fi
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -13696,9 +12728,9 @@
+@@ -13698,9 +12730,9 @@
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -8735,7 +8735,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -13711,14 +12743,14 @@
+@@ -13713,14 +12745,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8753,7 +8753,7 @@
IFS=$as_save_IFS
;;
-@@ -13726,19 +12758,19 @@
+@@ -13728,19 +12760,19 @@
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -8777,7 +8777,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -13751,14 +12783,14 @@
+@@ -13753,14 +12785,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8795,7 +8795,7 @@
IFS=$as_save_IFS
;;
-@@ -13766,19 +12798,19 @@
+@@ -13768,19 +12800,19 @@
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -8819,7 +8819,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -13791,14 +12823,14 @@
+@@ -13793,14 +12825,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8837,7 +8837,7 @@
IFS=$as_save_IFS
;;
-@@ -13806,19 +12838,19 @@
+@@ -13808,19 +12840,19 @@
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -8861,7 +8861,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -13831,14 +12863,14 @@
+@@ -13833,14 +12865,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8879,7 +8879,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -13847,33 +12879,29 @@
+@@ -13849,33 +12881,29 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -8919,7 +8919,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -13886,14 +12914,14 @@
+@@ -13888,14 +12916,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8937,7 +8937,7 @@
IFS=$as_save_IFS
;;
-@@ -13901,41 +12929,35 @@
+@@ -13903,41 +12931,35 @@
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -8988,7 +8988,7 @@
fi
fi
-@@ -13945,11 +12967,7 @@
+@@ -13947,11 +12969,7 @@
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -9001,7 +9001,7 @@
/* end confdefs.h. */
int
-@@ -13961,120 +12979,13 @@
+@@ -13963,120 +12981,13 @@
return 0;
}
_ACEOF
@@ -9126,7 +9126,7 @@
DATADIRNAME=share
else
DATADIRNAME=lib
-@@ -14086,10 +12997,8 @@
+@@ -14088,10 +12999,8 @@
;;
esac
fi
@@ -9139,7 +9139,7 @@
fi
-@@ -14103,9 +13012,9 @@
+@@ -14105,9 +13014,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
@@ -9151,7 +9151,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -14118,14 +13027,14 @@
+@@ -14120,14 +13029,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9169,7 +9169,7 @@
IFS=$as_save_IFS
;;
-@@ -14133,10 +13042,10 @@
+@@ -14135,10 +13044,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -9182,7 +9182,7 @@
$as_echo "no" >&6; }
fi
-@@ -14146,9 +13055,9 @@
+@@ -14148,9 +13057,9 @@
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -9194,7 +9194,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -14161,14 +13070,14 @@
+@@ -14163,14 +13072,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9212,7 +9212,7 @@
IFS=$as_save_IFS
;;
-@@ -14176,10 +13085,10 @@
+@@ -14178,10 +13087,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -9225,7 +9225,7 @@
$as_echo "no" >&6; }
fi
-@@ -14188,7 +13097,7 @@
+@@ -14190,7 +13099,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9234,7 +9234,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -14201,13 +13110,13 @@
+@@ -14203,13 +13112,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -9251,7 +9251,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -14216,7 +13125,7 @@
+@@ -14218,7 +13127,7 @@
# Check whether --enable-debug was given.
@@ -9260,7 +9260,7 @@
enableval=$enable_debug;
else
enable_debug=no
-@@ -14225,16 +13134,14 @@
+@@ -14227,16 +13136,14 @@
if test x$enable_debug = xyes ; then
@@ -9279,7 +9279,7 @@
enableval=$enable_compile_warnings;
else
enable_compile_warnings="maximum"
-@@ -14265,13 +13172,9 @@
+@@ -14267,13 +13174,9 @@
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -9295,7 +9295,7 @@
/* end confdefs.h. */
int
-@@ -14282,35 +13185,14 @@
+@@ -14284,35 +13187,14 @@
return 0;
}
_ACEOF
@@ -9334,7 +9334,7 @@
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
-@@ -14324,26 +13206,24 @@
+@@ -14326,26 +13208,24 @@
fi
;;
*)
@@ -9366,7 +9366,7 @@
$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
complCFLAGS=
if test "x$enable_iso_c" != "xno"; then
-@@ -14358,7 +13238,7 @@
+@@ -14360,7 +13240,7 @@
esac
fi
fi
@@ -9375,7 +9375,7 @@
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -14383,9 +13263,7 @@
+@@ -14385,9 +13265,7 @@
if test "$enable_maintainer_mode" = "yes"; then
@@ -9386,7 +9386,7 @@
enable_debug=yes
DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
-@@ -14403,11 +13281,11 @@
+@@ -14405,11 +13283,11 @@
GNOME_KEYRING_REQUIRED=2.26.0
if test -n "$PKG_CONFIG" && \
@@ -9401,7 +9401,7 @@
have_libnotify=yes
else
have_libnotify=no
-@@ -14417,24 +13295,22 @@
+@@ -14419,24 +13297,22 @@
if test "$have_libnotify" = "yes"; then
LIBNOTIFY_PACKAGE="libnotify >= $LIBNOTIFY_REQUIRED"
@@ -9430,7 +9430,7 @@
$as_echo "$enable_tests" >&6; }
if test "$enable_tests" = "yes"; then
-@@ -14448,14 +13324,15 @@
+@@ -14450,14 +13326,15 @@
pkg_failed=no
@@ -9452,7 +9452,7 @@
glib-2.0 >= \$GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14473,7 +13350,7 @@
+@@ -14475,7 +13352,7 @@
webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
@@ -9461,7 +9461,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14494,8 +13371,8 @@
+@@ -14496,8 +13373,8 @@
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
") 2>&5
ac_status=$?
@@ -9472,7 +9472,7 @@
pkg_cv_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14518,14 +13395,16 @@
+@@ -14520,14 +13397,16 @@
else
pkg_failed=yes
fi
@@ -9496,7 +9496,7 @@
glib-2.0 >= \$GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14543,7 +13422,7 @@
+@@ -14545,7 +13424,7 @@
webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
@@ -9505,7 +9505,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14564,8 +13443,8 @@
+@@ -14566,8 +13445,8 @@
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
") 2>&5
ac_status=$?
@@ -9516,7 +9516,7 @@
pkg_cv_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14588,8 +13467,9 @@
+@@ -14590,8 +13469,9 @@
else
pkg_failed=yes
fi
@@ -9528,7 +9528,7 @@
fi
-@@ -14602,7 +13482,7 @@
+@@ -14604,7 +13484,7 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9537,7 +9537,7 @@
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14620,9 +13500,9 @@
+@@ -14622,9 +13502,9 @@
webkit-1.0 >= $WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
@@ -9549,7 +9549,7 @@
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14640,12 +13520,12 @@
+@@ -14642,12 +13522,12 @@
webkit-1.0 >= $WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
@@ -9564,7 +9564,7 @@
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14673,51 +13553,11 @@
+@@ -14675,51 +13555,11 @@
Alternatively, you may set the environment variables DEPENDENCIES_CFLAGS
and DEPENDENCIES_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9619,7 +9619,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14726,12 +13566,11 @@
+@@ -14728,12 +13568,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -9634,7 +9634,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14742,40 +13581,44 @@
+@@ -14744,40 +13583,44 @@
pkg_failed=no
@@ -9698,7 +9698,7 @@
fi
-@@ -14788,14 +13631,14 @@
+@@ -14790,14 +13633,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9716,7 +9716,7 @@
$DBUS_PKG_ERRORS
-@@ -14805,23 +13648,11 @@
+@@ -14807,23 +13650,11 @@
Alternatively, you may set the environment variables DBUS_CFLAGS
and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9743,7 +9743,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14830,31 +13661,20 @@
+@@ -14832,31 +13663,20 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -9779,7 +9779,7 @@
$as_echo_n "(cached) " >&6
else
case $DBUS_BINDING_TOOL in
-@@ -14867,14 +13687,14 @@
+@@ -14869,14 +13689,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9797,7 +9797,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_DBUS_BINDING_TOOL" && ac_cv_path_DBUS_BINDING_TOOL="no"
-@@ -14883,19 +13703,17 @@
+@@ -14885,19 +13705,17 @@
fi
DBUS_BINDING_TOOL=$ac_cv_path_DBUS_BINDING_TOOL
if test -n "$DBUS_BINDING_TOOL"; then
@@ -9820,7 +9820,7 @@
fi
# *****
-@@ -14911,13 +13729,13 @@
+@@ -14913,13 +13731,13 @@
# Check whether --with-gconf-source was given.
@@ -9836,7 +9836,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -14926,22 +13744,20 @@
+@@ -14928,22 +13746,20 @@
# Check whether --with-gconf-schema-file-dir was given.
@@ -9863,7 +9863,7 @@
esac
fi
-@@ -14957,9 +13773,9 @@
+@@ -14959,9 +13775,9 @@
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -9875,7 +9875,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -14972,14 +13788,14 @@
+@@ -14974,14 +13790,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9893,7 +9893,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-@@ -14988,134 +13804,29 @@
+@@ -14990,134 +13806,29 @@
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -10036,7 +10036,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -15125,150 +13836,12 @@
+@@ -15127,150 +13838,12 @@
# for backtrace()
@@ -10192,7 +10192,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -15277,18 +13850,14 @@
+@@ -15279,18 +13852,14 @@
done
@@ -10214,7 +10214,7 @@
/* end confdefs.h. */
#ifndef __cplusplus
typedef int foo_t;
-@@ -15297,41 +13866,17 @@
+@@ -15299,41 +13868,17 @@
#endif
_ACEOF
@@ -10258,7 +10258,7 @@
case $ac_cv_c_inline in
inline | yes) ;;
*)
-@@ -15347,16 +13892,12 @@
+@@ -15349,16 +13894,12 @@
;;
esac
@@ -10278,7 +10278,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/time.h>
-@@ -15371,308 +13912,38 @@
+@@ -15373,308 +13914,38 @@
return 0;
}
_ACEOF
@@ -10599,7 +10599,7 @@
-@@ -15681,25 +13952,32 @@
+@@ -15683,25 +13954,32 @@
@@ -10640,7 +10640,7 @@
/* end confdefs.h. */
/* Test program from Paul Eggert and Tony Leneis. */
#ifdef TIME_WITH_SYS_TIME
-@@ -15896,44 +14174,17 @@
+@@ -15898,44 +14176,17 @@
return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
}
_ACEOF
@@ -10690,7 +10690,7 @@
$as_echo "$ac_cv_func_working_mktime" >&6; }
if test $ac_cv_func_working_mktime = no; then
case " $LIBOBJS " in
-@@ -15944,19 +14195,15 @@
+@@ -15946,19 +14197,15 @@
fi
@@ -10714,7 +10714,7 @@
/* end confdefs.h. */
$ac_includes_default
-@@ -15989,44 +14236,17 @@
+@@ -15991,44 +14238,17 @@
}
_ACEOF
@@ -10764,7 +10764,7 @@
$as_echo "$ac_cv_func_strtod" >&6; }
if test $ac_cv_func_strtod = no; then
case " $LIBOBJS " in
-@@ -16035,105 +14255,20 @@
+@@ -16037,105 +14257,20 @@
;;
esac
@@ -10875,7 +10875,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16151,46 +14286,21 @@
+@@ -16153,46 +14288,21 @@
return 0;
}
_ACEOF
@@ -10929,7 +10929,7 @@
$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
fi
-@@ -16198,102 +14308,9 @@
+@@ -16200,102 +14310,9 @@
fi
@@ -11034,7 +11034,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -16317,48 +14334,23 @@
+@@ -16319,48 +14336,23 @@
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $_FLAGS"
@@ -11089,7 +11089,7 @@
$as_echo "$ac_cv_have_declaration_after_statement" >&6; }
if test "$ac_cv_have_declaration_after_statement" = "yes"; then
-@@ -16377,151 +14369,12 @@
+@@ -16379,151 +14371,12 @@
# Multimedia keys
# ***************
@@ -11245,7 +11245,7 @@
_ACEOF
fi
-@@ -16539,62 +14392,59 @@
+@@ -16541,62 +14394,59 @@
# Check whether --enable-introspection was given.
@@ -11334,7 +11334,7 @@
$as_echo "$found_introspection" >&6; }
INTROSPECTION_SCANNER=
-@@ -16635,9 +14485,7 @@
+@@ -16637,9 +14487,7 @@
if test "$found_introspection" = "yes"; then
EPIPHANY_FEATURES="$EPIPHANY_FEATURES introspection"
@@ -11345,7 +11345,7 @@
fi
-@@ -16645,22 +14493,20 @@
+@@ -16647,22 +14495,20 @@
# Seed
# ****
@@ -11372,7 +11372,7 @@
fi
if test "$enable_seed" = "yes"; then
-@@ -16669,40 +14515,44 @@
+@@ -16671,40 +14517,44 @@
SEED_REQUIRED=2.27.91
pkg_failed=no
@@ -11436,7 +11436,7 @@
fi
-@@ -16715,25 +14565,14 @@
+@@ -16717,25 +14567,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11465,7 +11465,7 @@
$SEED_PKG_ERRORS
-@@ -16743,22 +14582,11 @@
+@@ -16745,22 +14584,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.
@@ -11491,7 +11491,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -16767,20 +14595,17 @@
+@@ -16769,20 +14597,17 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11515,7 +11515,49 @@
fi
-@@ -16797,55 +14622,59 @@
+@@ -16800,16 +14625,16 @@
+ # Stolen from GIO's TLS
+ # *********************
+
+-{ $as_echo "$as_me:$LINENO: checking location of system Certificate Authority list" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking location of system Certificate Authority list" >&5
+ $as_echo_n "checking location of system Certificate Authority list... " >&6; }
+
+ # Check whether --with-ca-file was given.
+-if test "${with_ca_file+set}" = set; then
++if test "${with_ca_file+set}" = set; then :
+ withval=$with_ca_file;
+ fi
+
+ if test "$with_ca_file" = "no"; then
+- { $as_echo "$as_me:$LINENO: result: disabled" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+ $as_echo "disabled" >&6; }
+ else
+ if test -z "$with_ca_file"; then
+@@ -16820,18 +14645,14 @@
+ fi
+ done
+ if test -z "$with_ca_file"; then
+- { { $as_echo "$as_me:$LINENO: error: could not find. Use --with-ca-file=path to set, or --without-ca-file to disable" >&5
+-$as_echo "$as_me: error: could not find. Use --with-ca-file=path to set, or --without-ca-file to disable" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "could not find. Use --with-ca-file=path to set, or --without-ca-file to disable" "$LINENO" 5
+ fi
+ fi
+
+- { $as_echo "$as_me:$LINENO: result: $with_ca_file" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ca_file" >&5
+ $as_echo "$with_ca_file" >&6; }
+ if ! test -f "$with_ca_file"; then
+- { { $as_echo "$as_me:$LINENO: error: No such file '$with_ca_file'. Use --with-ca-file=path to set, or --without-ca-file to disable" >&5
+-$as_echo "$as_me: error: No such file '$with_ca_file'. Use --with-ca-file=path to set, or --without-ca-file to disable" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "No such file '$with_ca_file'. Use --with-ca-file=path to set, or --without-ca-file to disable" "$LINENO" 5
+ fi
+ GTLS_SYSTEM_CA_FILE="$with_ca_file"
+
+@@ -16846,55 +14667,59 @@
# NSS
# ***
@@ -11597,7 +11639,7 @@
fi
-@@ -16858,25 +14687,14 @@
+@@ -16907,25 +14732,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11626,7 +11668,7 @@
$NSS_PKG_ERRORS
-@@ -16886,22 +14704,11 @@
+@@ -16935,22 +14749,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.
@@ -11652,7 +11694,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -16910,20 +14717,17 @@
+@@ -16959,20 +14762,17 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11676,7 +11718,7 @@
fi
-@@ -16944,16 +14748,16 @@
+@@ -16993,16 +14793,16 @@
# Zeroconf bookmarks sites
@@ -11696,7 +11738,7 @@
$as_echo "$enable_zeroconf" >&6; }
if test "$enable_zeroconf" != "no"; then
-@@ -16961,52 +14765,56 @@
+@@ -17010,52 +14810,56 @@
pkg_failed=no
@@ -11774,7 +11816,7 @@
fi
-@@ -17019,18 +14827,18 @@
+@@ -17068,18 +14872,18 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11798,7 +11840,7 @@
$as_echo "no" >&6; }
have_avahi=no
elif test $pkg_failed = untried; then
-@@ -17038,15 +14846,13 @@
+@@ -17087,15 +14891,13 @@
else
AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS
AVAHI_LIBS=$pkg_cv_AVAHI_LIBS
@@ -11816,7 +11858,7 @@
elif test "$have_avahi" = "yes"; then
enable_zeroconf=yes
else
-@@ -17056,9 +14862,7 @@
+@@ -17105,9 +14907,7 @@
if test "$enable_zeroconf" = "yes"; then
@@ -11827,7 +11869,7 @@
fi
-@@ -17073,55 +14877,59 @@
+@@ -17122,55 +14922,59 @@
# NetworkManager
@@ -11909,7 +11951,7 @@
fi
-@@ -17134,14 +14942,14 @@
+@@ -17183,14 +14987,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11927,7 +11969,7 @@
$as_echo "no" >&6; }
have_network_manager=no
elif test $pkg_failed = untried; then
-@@ -17149,26 +14957,22 @@
+@@ -17198,26 +15002,22 @@
else
NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS
NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS
@@ -11958,7 +12000,7 @@
fi
-@@ -17209,18 +15013,18 @@
+@@ -17258,18 +15058,18 @@
ISO_CODES_REQUIRED=0.35
if test -n "$PKG_CONFIG" && \
@@ -11981,7 +12023,7 @@
$as_echo_n "checking whether iso-codes has iso-639 and iso-3166 domains... " >&6; }
if $PKG_CONFIG --variable=domains iso-codes | grep -q 639 && \
$PKG_CONFIG --variable=domains iso-codes | grep -q 3166 ; then
-@@ -17229,7 +15033,7 @@
+@@ -17278,7 +15078,7 @@
result=no
have_iso_codes=no
fi
@@ -11990,7 +12032,7 @@
$as_echo "$result" >&6; }
fi
-@@ -17240,14 +15044,10 @@
+@@ -17289,14 +15089,10 @@
_ACEOF
@@ -12007,7 +12049,7 @@
fi
GETTEXT_PACKAGE=epiphany
-@@ -17258,151 +15058,12 @@
+@@ -17307,151 +15103,12 @@
_ACEOF
@@ -12164,7 +12206,7 @@
_ACEOF
fi
-@@ -17410,16 +15071,12 @@
+@@ -17459,16 +15116,12 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -12184,7 +12226,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -17430,207 +15087,45 @@
+@@ -17479,207 +15132,45 @@
return 0;
}
_ACEOF
@@ -12417,7 +12459,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -17643,54 +15138,25 @@
+@@ -17692,54 +15183,25 @@
return 0;
}
_ACEOF
@@ -12480,7 +12522,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -17703,141 +15169,26 @@
+@@ -17752,141 +15214,26 @@
return 0;
}
_ACEOF
@@ -12632,7 +12674,7 @@
_ACEOF
fi
-@@ -17852,18 +15203,14 @@
+@@ -17901,18 +15248,14 @@
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -12654,7 +12696,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17881,55 +15228,26 @@
+@@ -17930,55 +15273,26 @@
return 0;
}
_ACEOF
@@ -12719,7 +12761,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17947,55 +15265,26 @@
+@@ -17996,55 +15310,26 @@
return 0;
}
_ACEOF
@@ -12784,7 +12826,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18013,43 +15302,18 @@
+@@ -18062,43 +15347,18 @@
return 0;
}
_ACEOF
@@ -12834,7 +12876,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -18059,22 +15323,18 @@
+@@ -18108,22 +15368,18 @@
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -12862,7 +12904,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18092,55 +15352,26 @@
+@@ -18141,55 +15397,26 @@
return 0;
}
_ACEOF
@@ -12927,7 +12969,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18158,160 +15389,45 @@
+@@ -18207,160 +15434,45 @@
return 0;
}
_ACEOF
@@ -13117,7 +13159,7 @@
_ACEOF
fi
-@@ -18341,15 +15457,13 @@
+@@ -18390,15 +15502,13 @@
if test "$gt_cv_have_gettext" = "yes"; then
@@ -13136,7 +13178,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -18374,118 +15488,28 @@
+@@ -18423,118 +15533,28 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -13263,7 +13305,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -18500,14 +15524,14 @@
+@@ -18549,14 +15569,14 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -13283,7 +13325,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -18515,9 +15539,9 @@
+@@ -18564,9 +15584,9 @@
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -13295,7 +13337,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -18530,14 +15554,14 @@
+@@ -18579,14 +15599,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13313,7 +13355,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -18546,19 +15570,19 @@
+@@ -18595,19 +15615,19 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -13337,7 +13379,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -18583,18 +15607,14 @@
+@@ -18632,18 +15652,14 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -13359,7 +13401,7 @@
/* end confdefs.h. */
int
-@@ -18606,121 +15626,14 @@
+@@ -18655,121 +15671,14 @@
return 0;
}
_ACEOF
@@ -13485,7 +13527,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -18735,10 +15648,8 @@
+@@ -18784,10 +15693,8 @@
;;
esac
fi
@@ -13498,7 +13540,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -18752,9 +15663,7 @@
+@@ -18801,9 +15708,7 @@
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -13509,7 +13551,7 @@
fi
-@@ -18762,7 +15671,7 @@
+@@ -18811,7 +15716,7 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -13518,7 +13560,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -18795,7 +15704,7 @@
+@@ -18844,7 +15749,7 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -13527,7 +13569,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -18820,7 +15729,7 @@
+@@ -18869,7 +15774,7 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -13536,7 +13578,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -18868,7 +15777,7 @@
+@@ -18917,7 +15822,7 @@
# Check whether --with-distributor-name was given.
@@ -13545,7 +13587,7 @@
withval=$with_distributor_name; LSB_DISTRIBUTOR="$withval"
fi
-@@ -18878,9 +15787,9 @@
+@@ -18927,9 +15832,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
@@ -13557,7 +13599,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LSB_RELEASE"; then
-@@ -18891,24 +15800,24 @@
+@@ -18940,24 +15845,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13587,7 +13629,7 @@
$as_echo "no" >&6; }
fi
-@@ -18938,35 +15847,33 @@
+@@ -18987,35 +15892,33 @@
gdu_cv_version_required=0.3.2
@@ -13631,7 +13673,7 @@
withval=$with_help_dir;
else
with_help_dir='${datadir}/gnome/help'
-@@ -18977,7 +15884,7 @@
+@@ -19026,7 +15929,7 @@
# Check whether --with-omf-dir was given.
@@ -13640,7 +13682,7 @@
withval=$with_omf_dir;
else
with_omf_dir='${datadir}/omf'
-@@ -18988,7 +15895,7 @@
+@@ -19037,7 +15940,7 @@
# Check whether --with-help-formats was given.
@@ -13649,7 +13691,7 @@
withval=$with_help_formats;
else
with_help_formats=''
-@@ -18998,7 +15905,7 @@
+@@ -19047,7 +15950,7 @@
# Check whether --enable-scrollkeeper was given.
@@ -13658,7 +13700,7 @@
enableval=$enable_scrollkeeper;
else
enable_scrollkeeper=yes
-@@ -19027,9 +15934,137 @@
+@@ -19076,9 +15979,137 @@
@@ -13798,7 +13840,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -19039,7 +16074,7 @@
+@@ -19088,7 +16119,7 @@
# Check whether --enable-gtk-doc was given.
@@ -13807,7 +13849,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -19048,68 +16083,40 @@
+@@ -19097,68 +16128,40 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -13894,7 +13936,7 @@
if test x$enable_gtk_doc = xyes; then
-@@ -19120,6 +16127,22 @@
+@@ -19169,6 +16172,22 @@
ENABLE_GTK_DOC_FALSE=
fi
@@ -13917,7 +13959,7 @@
if test -n "$LIBTOOL"; then
GTK_DOC_USE_LIBTOOL_TRUE=
GTK_DOC_USE_LIBTOOL_FALSE='#'
-@@ -19128,6 +16151,14 @@
+@@ -19177,6 +16196,14 @@
GTK_DOC_USE_LIBTOOL_FALSE=
fi
@@ -13932,7 +13974,7 @@
# ************
-@@ -19135,9 +16166,7 @@
+@@ -19184,9 +16211,7 @@
# ************
@@ -13943,7 +13985,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"
-@@ -19170,13 +16199,13 @@
+@@ -19219,13 +16244,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -13959,7 +14001,7 @@
esac ;;
esac
done
-@@ -19184,8 +16213,8 @@
+@@ -19233,8 +16258,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -13970,7 +14012,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -19208,11 +16237,11 @@
+@@ -19257,11 +16282,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" &&
@@ -13984,7 +14026,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -19232,8 +16261,8 @@
+@@ -19281,8 +16306,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.
@@ -13995,7 +14037,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -19249,136 +16278,98 @@
+@@ -19298,136 +16323,98 @@
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -14181,7 +14223,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -19388,17 +16379,18 @@
+@@ -19437,17 +16424,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -14207,7 +14249,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -19406,23 +16398,15 @@
+@@ -19455,23 +16443,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -14236,7 +14278,7 @@
as_nl='
'
export as_nl
-@@ -19430,7 +16414,13 @@
+@@ -19479,7 +16459,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
@@ -14251,7 +14293,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -19441,7 +16431,7 @@
+@@ -19490,7 +16476,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -14260,7 +14302,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -19464,13 +16454,6 @@
+@@ -19513,13 +16499,6 @@
}
fi
@@ -14274,7 +14316,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -19480,15 +16463,15 @@
+@@ -19529,15 +16508,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -14293,7 +14335,7 @@
IFS=$as_save_IFS
;;
-@@ -19500,12 +16483,16 @@
+@@ -19549,12 +16528,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -14314,7 +14356,7 @@
done
PS1='$ '
PS2='> '
-@@ -19517,7 +16504,89 @@
+@@ -19566,7 +16549,89 @@
LANGUAGE=C
export LANGUAGE
@@ -14405,7 +14447,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -19531,8 +16600,12 @@
+@@ -19580,8 +16645,12 @@
as_basename=false
fi
@@ -14419,7 +14461,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -19552,76 +16625,25 @@
+@@ -19601,76 +16670,25 @@
}
s/.*/./; q'`
@@ -14507,7 +14549,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -19650,8 +16672,56 @@
+@@ -19699,8 +16717,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -14565,7 +14607,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -19670,10 +16740,10 @@
+@@ -19719,10 +16785,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -14578,7 +14620,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -19688,13 +16758,19 @@
+@@ -19737,13 +16803,19 @@
exec 6>&1
@@ -14594,13 +14636,13 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by GNOME Web Browser $as_me 2.29.90.1, which was
+ This file was extended by GNOME Web Browser $as_me 2.29.91, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -19726,13 +16802,15 @@
+@@ -19775,13 +16847,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -14619,7 +14661,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -19751,16 +16829,17 @@
+@@ -19800,16 +16874,17 @@
Configuration commands:
$config_commands
@@ -14630,7 +14672,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- GNOME Web Browser config.status 2.29.90.1
+ GNOME Web Browser config.status 2.29.91
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
@@ -14641,7 +14683,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -19796,6 +16875,8 @@
+@@ -19845,6 +16920,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -14650,7 +14692,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -19803,20 +16884,19 @@
+@@ -19852,20 +16929,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -14675,7 +14717,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -19824,11 +16904,10 @@
+@@ -19873,11 +16949,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -14690,7 +14732,7 @@
ac_need_defaults=false ;;
esac
-@@ -20163,9 +17242,7 @@
+@@ -20212,9 +17287,7 @@
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -14701,7 +14743,7 @@
esac
done
-@@ -20192,7 +17269,7 @@
+@@ -20241,7 +17314,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -14710,7 +14752,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -20203,11 +17280,7 @@
+@@ -20252,11 +17325,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -14723,7 +14765,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -20215,10 +17288,16 @@
+@@ -20264,10 +17333,16 @@
if test -n "$CONFIG_FILES"; then
@@ -14742,7 +14784,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -20232,24 +17311,18 @@
+@@ -20281,24 +17356,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -14770,7 +14812,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -20271,7 +17344,7 @@
+@@ -20320,7 +17389,7 @@
t delim
:nl
h
@@ -14779,7 +14821,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -20285,7 +17358,7 @@
+@@ -20334,7 +17403,7 @@
t nl
:delim
h
@@ -14788,7 +14830,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -20338,9 +17411,7 @@
+@@ -20387,9 +17456,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -14799,7 +14841,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -20381,9 +17452,7 @@
+@@ -20430,9 +17497,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -14810,7 +14852,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -20468,9 +17537,7 @@
+@@ -20517,9 +17582,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -14821,7 +14863,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -20483,9 +17550,7 @@
+@@ -20532,9 +17595,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -14832,7 +14874,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -20513,12 +17578,10 @@
+@@ -20562,12 +17623,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -14847,7 +14889,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -20529,7 +17592,7 @@
+@@ -20578,7 +17637,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -14856,7 +14898,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -20542,9 +17605,7 @@
+@@ -20591,9 +17650,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -14867,7 +14909,7 @@
esac
;;
esac
-@@ -20572,47 +17633,7 @@
+@@ -20621,47 +17678,7 @@
q
}
s/.*/./; q'`
@@ -14916,7 +14958,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -20669,7 +17690,6 @@
+@@ -20718,7 +17735,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=
@@ -14924,7 +14966,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -20679,12 +17699,11 @@
+@@ -20728,12 +17744,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -14939,7 +14981,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
-@@ -20694,7 +17713,7 @@
+@@ -20743,7 +17758,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -14948,7 +14990,7 @@
esac
_ACEOF
-@@ -20723,14 +17742,12 @@
+@@ -20772,14 +17787,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -14965,7 +15007,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;}
-@@ -20740,9 +17757,7 @@
+@@ -20789,9 +17802,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -14976,7 +15018,7 @@
;;
:H)
#
-@@ -20753,25 +17768,19 @@
+@@ -20802,25 +17813,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -15006,7 +15048,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -20809,7 +17818,7 @@
+@@ -20858,7 +17863,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -15015,7 +15057,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -20904,47 +17913,7 @@
+@@ -20953,47 +17958,7 @@
q
}
s/.*/./; q'`
@@ -15064,7 +15106,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -21591,9 +18560,7 @@
+@@ -21640,9 +18605,7 @@
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -15075,7 +15117,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -21616,15 +18583,12 @@
+@@ -21665,15 +18628,12 @@
done # for ac_tag
@@ -15093,7 +15135,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -21645,10 +18609,10 @@
+@@ -21694,10 +18654,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.
@@ -15106,9 +15148,9 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/data/art/Makefile.in epiphany-browser-2.29.90.1/data/art/Makefile.in
---- epiphany-browser-2.29.90.1.old/data/art/Makefile.in 2010-02-10 14:41:10.000000000 +0100
-+++ epiphany-browser-2.29.90.1/data/art/Makefile.in 2010-02-12 07:40:59.487390877 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/data/art/Makefile.in epiphany-browser-2.29.91/data/art/Makefile.in
+--- epiphany-browser-2.29.91.old/data/art/Makefile.in 2010-02-22 21:18:37.000000000 +0100
++++ epiphany-browser-2.29.91/data/art/Makefile.in 2010-02-27 12:51:53.764726676 +0100
@@ -141,6 +141,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15126,9 +15168,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/data/glade/Makefile.in epiphany-browser-2.29.90.1/data/glade/Makefile.in
---- epiphany-browser-2.29.90.1.old/data/glade/Makefile.in 2010-02-10 14:41:10.000000000 +0100
-+++ epiphany-browser-2.29.90.1/data/glade/Makefile.in 2010-02-12 07:40:59.555390437 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/data/glade/Makefile.in epiphany-browser-2.29.91/data/glade/Makefile.in
+--- epiphany-browser-2.29.91.old/data/glade/Makefile.in 2010-02-22 21:18:38.000000000 +0100
++++ epiphany-browser-2.29.91/data/glade/Makefile.in 2010-02-27 12:51:53.824726546 +0100
@@ -141,6 +141,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15146,9 +15188,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/data/icons/Makefile.in epiphany-browser-2.29.90.1/data/icons/Makefile.in
---- epiphany-browser-2.29.90.1.old/data/icons/Makefile.in 2010-02-10 14:41:10.000000000 +0100
-+++ epiphany-browser-2.29.90.1/data/icons/Makefile.in 2010-02-12 07:40:59.615390863 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/data/icons/Makefile.in epiphany-browser-2.29.91/data/icons/Makefile.in
+--- epiphany-browser-2.29.91.old/data/icons/Makefile.in 2010-02-22 21:18:38.000000000 +0100
++++ epiphany-browser-2.29.91/data/icons/Makefile.in 2010-02-27 12:51:53.888727350 +0100
@@ -119,6 +119,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15166,9 +15208,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/data/Makefile.in epiphany-browser-2.29.90.1/data/Makefile.in
---- epiphany-browser-2.29.90.1.old/data/Makefile.in 2010-02-10 14:41:09.000000000 +0100
-+++ epiphany-browser-2.29.90.1/data/Makefile.in 2010-02-12 07:40:59.423390842 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/data/Makefile.in epiphany-browser-2.29.91/data/Makefile.in
+--- epiphany-browser-2.29.91.old/data/Makefile.in 2010-02-22 21:18:37.000000000 +0100
++++ epiphany-browser-2.29.91/data/Makefile.in 2010-02-27 12:51:53.704726669 +0100
@@ -191,6 +191,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15186,9 +15228,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/data/ui/Makefile.in epiphany-browser-2.29.90.1/data/ui/Makefile.in
---- epiphany-browser-2.29.90.1.old/data/ui/Makefile.in 2010-02-10 14:41:10.000000000 +0100
-+++ epiphany-browser-2.29.90.1/data/ui/Makefile.in 2010-02-12 07:40:59.679390962 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/data/ui/Makefile.in epiphany-browser-2.29.91/data/ui/Makefile.in
+--- epiphany-browser-2.29.91.old/data/ui/Makefile.in 2010-02-22 21:18:38.000000000 +0100
++++ epiphany-browser-2.29.91/data/ui/Makefile.in 2010-02-27 12:51:53.944726648 +0100
@@ -141,6 +141,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15206,9 +15248,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/doc/Makefile.in epiphany-browser-2.29.90.1/doc/Makefile.in
---- epiphany-browser-2.29.90.1.old/doc/Makefile.in 2010-02-10 14:41:10.000000000 +0100
-+++ epiphany-browser-2.29.90.1/doc/Makefile.in 2010-02-12 07:40:59.795391464 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/doc/Makefile.in epiphany-browser-2.29.91/doc/Makefile.in
+--- epiphany-browser-2.29.91.old/doc/Makefile.in 2010-02-22 21:18:38.000000000 +0100
++++ epiphany-browser-2.29.91/doc/Makefile.in 2010-02-27 12:51:54.016727143 +0100
@@ -182,6 +182,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15226,9 +15268,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/doc/reference/Makefile.in epiphany-browser-2.29.90.1/doc/reference/Makefile.in
---- epiphany-browser-2.29.90.1.old/doc/reference/Makefile.in 2010-02-10 14:41:10.000000000 +0100
-+++ epiphany-browser-2.29.90.1/doc/reference/Makefile.in 2010-02-12 07:40:59.867390634 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/doc/reference/Makefile.in epiphany-browser-2.29.91/doc/reference/Makefile.in
+--- epiphany-browser-2.29.91.old/doc/reference/Makefile.in 2010-02-22 21:18:38.000000000 +0100
++++ epiphany-browser-2.29.91/doc/reference/Makefile.in 2010-02-27 12:51:54.088727151 +0100
@@ -123,6 +123,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15246,9 +15288,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/embed/Makefile.in epiphany-browser-2.29.90.1/embed/Makefile.in
---- epiphany-browser-2.29.90.1.old/embed/Makefile.in 2010-02-10 14:41:10.000000000 +0100
-+++ epiphany-browser-2.29.90.1/embed/Makefile.in 2010-02-12 07:41:00.135390540 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/embed/Makefile.in epiphany-browser-2.29.91/embed/Makefile.in
+--- epiphany-browser-2.29.91.old/embed/Makefile.in 2010-02-22 21:18:38.000000000 +0100
++++ epiphany-browser-2.29.91/embed/Makefile.in 2010-02-27 12:51:54.269726333 +0100
@@ -196,6 +196,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15266,9 +15308,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/gtk-doc.make epiphany-browser-2.29.90.1/gtk-doc.make
---- epiphany-browser-2.29.90.1.old/gtk-doc.make 1970-01-01 01:00:00.000000000 +0100
-+++ epiphany-browser-2.29.90.1/gtk-doc.make 2010-02-12 07:40:51.779418206 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/gtk-doc.make epiphany-browser-2.29.91/gtk-doc.make
+--- epiphany-browser-2.29.91.old/gtk-doc.make 1970-01-01 01:00:00.000000000 +0100
++++ epiphany-browser-2.29.91/gtk-doc.make 2010-02-27 12:51:48.841727311 +0100
@@ -0,0 +1,224 @@
+# -*- mode: makefile -*-
+
@@ -15494,9 +15536,9 @@
+ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/help/Makefile.in epiphany-browser-2.29.90.1/help/Makefile.in
---- epiphany-browser-2.29.90.1.old/help/Makefile.in 2010-02-10 14:41:10.000000000 +0100
-+++ epiphany-browser-2.29.90.1/help/Makefile.in 2010-02-12 07:41:00.219390743 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/help/Makefile.in epiphany-browser-2.29.91/help/Makefile.in
+--- epiphany-browser-2.29.91.old/help/Makefile.in 2010-02-22 21:18:38.000000000 +0100
++++ epiphany-browser-2.29.91/help/Makefile.in 2010-02-27 12:51:54.357726272 +0100
@@ -142,6 +142,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15514,9 +15556,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/lib/egg/Makefile.in epiphany-browser-2.29.90.1/lib/egg/Makefile.in
---- epiphany-browser-2.29.90.1.old/lib/egg/Makefile.in 2010-02-10 14:41:11.000000000 +0100
-+++ epiphany-browser-2.29.90.1/lib/egg/Makefile.in 2010-02-12 07:41:00.563390755 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/lib/egg/Makefile.in epiphany-browser-2.29.91/lib/egg/Makefile.in
+--- epiphany-browser-2.29.91.old/lib/egg/Makefile.in 2010-02-22 21:18:39.000000000 +0100
++++ epiphany-browser-2.29.91/lib/egg/Makefile.in 2010-02-27 12:51:54.661726233 +0100
@@ -165,6 +165,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15534,9 +15576,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/lib/Makefile.in epiphany-browser-2.29.90.1/lib/Makefile.in
---- epiphany-browser-2.29.90.1.old/lib/Makefile.in 2010-02-10 14:41:11.000000000 +0100
-+++ epiphany-browser-2.29.90.1/lib/Makefile.in 2010-02-12 07:41:00.423391331 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/lib/Makefile.in epiphany-browser-2.29.91/lib/Makefile.in
+--- epiphany-browser-2.29.91.old/lib/Makefile.in 2010-02-22 21:18:39.000000000 +0100
++++ epiphany-browser-2.29.91/lib/Makefile.in 2010-02-27 12:51:54.545726502 +0100
@@ -275,6 +275,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15563,9 +15605,9 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/lib/widgets/Makefile.in epiphany-browser-2.29.90.1/lib/widgets/Makefile.in
---- epiphany-browser-2.29.90.1.old/lib/widgets/Makefile.in 2010-02-10 14:41:11.000000000 +0100
-+++ epiphany-browser-2.29.90.1/lib/widgets/Makefile.in 2010-02-12 07:41:00.667391253 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/lib/widgets/Makefile.in epiphany-browser-2.29.91/lib/widgets/Makefile.in
+--- epiphany-browser-2.29.91.old/lib/widgets/Makefile.in 2010-02-22 21:18:39.000000000 +0100
++++ epiphany-browser-2.29.91/lib/widgets/Makefile.in 2010-02-27 12:51:54.773726143 +0100
@@ -160,6 +160,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15583,9 +15625,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/ltmain.sh epiphany-browser-2.29.90.1/ltmain.sh
---- epiphany-browser-2.29.90.1.old/ltmain.sh 2010-01-05 19:51:24.000000000 +0100
-+++ epiphany-browser-2.29.90.1/ltmain.sh 2010-02-12 07:40:50.416430459 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/ltmain.sh epiphany-browser-2.29.91/ltmain.sh
+--- epiphany-browser-2.29.91.old/ltmain.sh 2010-01-05 19:51:24.000000000 +0100
++++ epiphany-browser-2.29.91/ltmain.sh 2010-02-27 12:51:48.429728582 +0100
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -15664,9 +15706,9 @@
esac
;;
no)
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/m4/gtk-doc.m4 epiphany-browser-2.29.90.1/m4/gtk-doc.m4
---- epiphany-browser-2.29.90.1.old/m4/gtk-doc.m4 2010-01-05 19:51:24.000000000 +0100
-+++ epiphany-browser-2.29.90.1/m4/gtk-doc.m4 2010-02-12 07:40:51.747418678 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/m4/gtk-doc.m4 epiphany-browser-2.29.91/m4/gtk-doc.m4
+--- epiphany-browser-2.29.91.old/m4/gtk-doc.m4 2010-01-05 19:51:24.000000000 +0100
++++ epiphany-browser-2.29.91/m4/gtk-doc.m4 2010-02-27 12:51:48.841727311 +0100
@@ -8,6 +8,12 @@
[
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
@@ -15713,9 +15755,9 @@
AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
])
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/m4/libtool.m4 epiphany-browser-2.29.90.1/m4/libtool.m4
---- epiphany-browser-2.29.90.1.old/m4/libtool.m4 2010-01-05 19:51:24.000000000 +0100
-+++ epiphany-browser-2.29.90.1/m4/libtool.m4 2010-02-12 07:40:50.600393916 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/m4/libtool.m4 epiphany-browser-2.29.91/m4/libtool.m4
+--- epiphany-browser-2.29.91.old/m4/libtool.m4 2010-01-05 19:51:24.000000000 +0100
++++ epiphany-browser-2.29.91/m4/libtool.m4 2010-02-27 12:51:48.473727750 +0100
@@ -2445,7 +2445,7 @@
;;
@@ -15872,9 +15914,9 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/Makefile.in epiphany-browser-2.29.90.1/Makefile.in
---- epiphany-browser-2.29.90.1.old/Makefile.in 2010-02-10 14:41:12.000000000 +0100
-+++ epiphany-browser-2.29.90.1/Makefile.in 2010-02-12 07:41:01.251390341 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/Makefile.in epiphany-browser-2.29.91/Makefile.in
+--- epiphany-browser-2.29.91.old/Makefile.in 2010-02-22 21:18:40.000000000 +0100
++++ epiphany-browser-2.29.91/Makefile.in 2010-02-27 12:51:55.325726813 +0100
@@ -178,6 +178,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15892,9 +15934,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/po/Makefile.in.in epiphany-browser-2.29.90.1/po/Makefile.in.in
---- epiphany-browser-2.29.90.1.old/po/Makefile.in.in 2010-01-05 19:51:24.000000000 +0100
-+++ epiphany-browser-2.29.90.1/po/Makefile.in.in 2010-02-12 07:40:51.615392469 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/po/Makefile.in.in epiphany-browser-2.29.91/po/Makefile.in.in
+--- epiphany-browser-2.29.91.old/po/Makefile.in.in 2010-01-05 19:51:24.000000000 +0100
++++ epiphany-browser-2.29.91/po/Makefile.in.in 2010-02-27 12:51:48.813726685 +0100
@@ -129,7 +129,7 @@
done
@@ -15904,9 +15946,9 @@
# Define this as empty until I found a useful application.
install-exec installcheck:
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/src/bookmarks/Makefile.in epiphany-browser-2.29.90.1/src/bookmarks/Makefile.in
---- epiphany-browser-2.29.90.1.old/src/bookmarks/Makefile.in 2010-02-10 14:41:12.000000000 +0100
-+++ epiphany-browser-2.29.90.1/src/bookmarks/Makefile.in 2010-02-12 07:41:01.059390456 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/src/bookmarks/Makefile.in epiphany-browser-2.29.91/src/bookmarks/Makefile.in
+--- epiphany-browser-2.29.91.old/src/bookmarks/Makefile.in 2010-02-22 21:18:40.000000000 +0100
++++ epiphany-browser-2.29.91/src/bookmarks/Makefile.in 2010-02-27 12:51:55.177727429 +0100
@@ -208,6 +208,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15924,9 +15966,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/src/Makefile.in epiphany-browser-2.29.90.1/src/Makefile.in
---- epiphany-browser-2.29.90.1.old/src/Makefile.in 2010-02-10 14:41:11.000000000 +0100
-+++ epiphany-browser-2.29.90.1/src/Makefile.in 2010-02-12 07:41:00.911394065 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/src/Makefile.in epiphany-browser-2.29.91/src/Makefile.in
+--- epiphany-browser-2.29.91.old/src/Makefile.in 2010-02-22 21:18:39.000000000 +0100
++++ epiphany-browser-2.29.91/src/Makefile.in 2010-02-27 12:51:55.017726292 +0100
@@ -329,6 +329,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15955,9 +15997,9 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.90.1.old/tests/Makefile.in epiphany-browser-2.29.90.1/tests/Makefile.in
---- epiphany-browser-2.29.90.1.old/tests/Makefile.in 2010-02-10 14:41:12.000000000 +0100
-+++ epiphany-browser-2.29.90.1/tests/Makefile.in 2010-02-12 07:41:01.139390560 +0100
+diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.29.91.old/tests/Makefile.in epiphany-browser-2.29.91/tests/Makefile.in
+--- epiphany-browser-2.29.91.old/tests/Makefile.in 2010-02-22 21:18:40.000000000 +0100
++++ epiphany-browser-2.29.91/tests/Makefile.in 2010-02-27 12:51:55.257726346 +0100
@@ -184,6 +184,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=23141&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series [utf-8] Sat Feb 27 11:53:11 2010
@@ -6,6 +6,5 @@
07_bookmarks.patch
10_smart_bookmarks.patch
12_safetypes.patch
-13_enable_page_cache.patch
99_autoreconf.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list