r21307 - in /desktop/experimental/epiphany-webkit/debian: changelog patches/00_browser_wrapper_path.patch patches/99_autoreconf.patch
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Wed Sep 9 22:05:06 UTC 2009
Author: kov
Date: Wed Sep 9 22:05:05 2009
New Revision: 21307
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21307
Log:
Refreshed some patches
Modified:
desktop/experimental/epiphany-webkit/debian/changelog
desktop/experimental/epiphany-webkit/debian/patches/00_browser_wrapper_path.patch
desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch
Modified: desktop/experimental/epiphany-webkit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/changelog?rev=21307&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/changelog [utf-8] Wed Sep 9 22:05:05 2009
@@ -10,6 +10,9 @@
- bump version requirement for webkit to 1.1.14
* debian/patches/16_reimplement_search_on_locationbar.patch:
- removed; this feature went upstream, now
+ * debian/patches/00_browser_wrapper_path.patch
+ debian/patches/99_autoreconf.patch:
+ - refreshed
-- Gustavo Noronha Silva <kov at debian.org> Wed, 09 Sep 2009 18:33:15 -0300
Modified: desktop/experimental/epiphany-webkit/debian/patches/00_browser_wrapper_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/00_browser_wrapper_path.patch?rev=21307&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/00_browser_wrapper_path.patch [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/00_browser_wrapper_path.patch [utf-8] Wed Sep 9 22:05:05 2009
@@ -1,7 +1,7 @@
-Index: epiphany-2.24.3/data/bme.desktop.in.in
+Index: epiphany-webkit-2.27.92/data/bme.desktop.in.in
===================================================================
---- epiphany-2.24.3.orig/data/bme.desktop.in.in 2008-09-01 13:58:31.000000000 +0200
-+++ epiphany-2.24.3/data/bme.desktop.in.in 2009-05-18 17:03:00.000000000 -0300
+--- epiphany-webkit-2.27.92.orig/data/bme.desktop.in.in 2009-04-17 03:06:40.000000000 -0300
++++ epiphany-webkit-2.27.92/data/bme.desktop.in.in 2009-09-09 18:56:59.222409973 -0300
@@ -2,7 +2,7 @@
_Name=Epiphany Web Bookmarks
_GenericName=Web Bookmarks
@@ -11,15 +11,16 @@
StartupNotify=true
Terminal=false
Type=Application
-Index: epiphany/data/epiphany.desktop.in.in
+Index: epiphany-webkit-2.27.92/data/epiphany.desktop.in.in
===================================================================
---- epiphany/data/epiphany.desktop.in.in~ 2009-04-24 15:31:31.000000000 -0300
-+++ epiphany/data/epiphany.desktop.in.in 2009-06-01 20:00:56.000000000 -0300
-@@ -1,12 +1,12 @@
+--- epiphany-webkit-2.27.92.orig/data/epiphany.desktop.in.in 2009-09-04 11:09:21.000000000 -0300
++++ epiphany-webkit-2.27.92/data/epiphany.desktop.in.in 2009-09-09 18:58:17.565912976 -0300
+@@ -1,13 +1,13 @@
[Desktop Entry]
--_Name=Epiphany Web Browser
-+_Name=Epiphany Web Browser (WebKit)
+ _Name=Epiphany
_GenericName=Web Browser
+-_X-GNOME-FullName=Epiphany Web Browser
++_X-GNOME-FullName=Epiphany Web Browser (WebKit)
_Comment=Browse the web
-Exec=epiphany %U
+Exec=epiphany-webkit %U
@@ -31,10 +32,10 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=epiphany
X-GNOME-Bugzilla-Component=BugBuddyBugs
-Index: epiphany/data/epiphany.desktop.in.in
+Index: epiphany-webkit-2.27.92/lib/ephy-stock-icons.h
===================================================================
---- epiphany/lib/ephy-stock-icons.h~
-+++ epiphanh/lib/ephy-stock-icons.h
+--- epiphany-webkit-2.27.92.orig/lib/ephy-stock-icons.h 2009-08-26 10:26:28.000000000 -0300
++++ epiphany-webkit-2.27.92/lib/ephy-stock-icons.h 2009-09-09 18:56:59.222409973 -0300
@@ -26,7 +26,7 @@
G_BEGIN_DECLS
Modified: desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch?rev=21307&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch [utf-8] Wed Sep 9 22:05:05 2009
@@ -2,15 +2,15 @@
aclocal-1.10 -I m4
automake-1.10
autoconf
-Index: epiphany-webkit-2.27.91/configure
+Index: epiphany-webkit-2.27.92/configure
===================================================================
---- epiphany-webkit-2.27.91.orig/configure 2009-08-24 14:12:01.000000000 -0300
-+++ epiphany-webkit-2.27.91/configure 2009-08-25 11:47:13.078350669 -0300
+--- epiphany-webkit-2.27.92.orig/configure 2009-09-07 16:58:28.000000000 -0300
++++ epiphany-webkit-2.27.92/configure 2009-09-09 19:03:06.634409476 -0300
@@ -1,20 +1,22 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for GNOME Web Browser 2.27.91.
-+# Generated by GNU Autoconf 2.64 for GNOME Web Browser 2.27.91.
+-# Generated by GNU Autoconf 2.63 for GNOME Web Browser 2.27.92.
++# Generated by GNU Autoconf 2.64 for GNOME Web Browser 2.27.92.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany>.
#
@@ -805,14 +805,14 @@
PACKAGE_NAME='GNOME Web Browser'
-PACKAGE_TARNAME='epiphany'
+PACKAGE_TARNAME='epiphany-webkit'
- PACKAGE_VERSION='2.27.91'
- PACKAGE_STRING='GNOME Web Browser 2.27.91'
+ PACKAGE_VERSION='2.27.92'
+ PACKAGE_STRING='GNOME Web Browser 2.27.92'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
+PACKAGE_URL=''
ac_unique_file="configure.ac"
# Factoring default headers for most tests.
-@@ -1019,6 +974,7 @@
+@@ -1023,6 +978,7 @@
program_transform_name
prefix
exec_prefix
@@ -820,7 +820,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1190,8 +1146,7 @@
+@@ -1197,8 +1153,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -830,7 +830,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1217,8 +1172,7 @@
+@@ -1224,8 +1179,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -840,7 +840,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1422,8 +1376,7 @@
+@@ -1429,8 +1383,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -850,7 +850,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1439,8 +1392,7 @@
+@@ -1446,8 +1399,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -860,7 +860,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1470,17 +1422,17 @@
+@@ -1477,17 +1429,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -884,7 +884,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1497,15 +1449,13 @@
+@@ -1504,15 +1456,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -902,7 +902,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1528,8 +1478,7 @@
+@@ -1535,8 +1485,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -912,7 +912,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1559,11 +1508,9 @@
+@@ -1566,11 +1515,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -926,7 +926,7 @@
# Find the source files, if location was not specified.
-@@ -1602,13 +1549,11 @@
+@@ -1609,13 +1556,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -942,7 +942,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1682,7 +1627,7 @@
+@@ -1689,7 +1634,7 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
@@ -951,7 +951,7 @@
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
-@@ -1729,7 +1674,8 @@
+@@ -1736,7 +1681,8 @@
Turn on compiler warnings
--enable-iso-c Try to warn if code is not ISO C
--enable-tests Wheter to build tests (default: yes)
@@ -960,11 +960,11 @@
+ Disable the schemas installation
--enable-introspection Enable GObject introspection (default: disabled)
--enable-seed Enable Seed support (default: disabled)
- --disable-zeroconf Whether to enable zeroconf bookmarks support
-@@ -1857,21 +1803,432 @@
+ --enable-nss Enable NSS support (default: enabled)
+@@ -1867,21 +1813,432 @@
if $ac_init_version; then
cat <<\_ACEOF
- GNOME Web Browser configure 2.27.91
+ GNOME Web Browser configure 2.27.92
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.64
@@ -1392,13 +1392,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.27.91, which was
+ It was created by GNOME Web Browser $as_me 2.27.92, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
-@@ -1907,8 +2264,8 @@
+@@ -1917,8 +2274,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1409,7 +1409,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1945,9 +2302,9 @@
+@@ -1955,9 +2312,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1421,7 +1421,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1963,13 +2320,13 @@
+@@ -1973,13 +2330,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -1438,7 +1438,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -1994,13 +2351,13 @@
+@@ -2004,13 +2361,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -1454,7 +1454,7 @@
esac ;;
esac
done
-@@ -2072,39 +2429,41 @@
+@@ -2082,39 +2439,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -1501,7 +1501,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2123,7 +2482,7 @@
+@@ -2133,7 +2492,7 @@
do
test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
@@ -1510,7 +1510,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2134,7 +2493,7 @@
+@@ -2144,7 +2503,7 @@
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
@@ -1519,7 +1519,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2142,14 +2501,14 @@
+@@ -2152,14 +2511,14 @@
esac
fi
else
@@ -1538,7 +1538,7 @@
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
-@@ -2160,11 +2519,11 @@
+@@ -2170,11 +2529,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -1552,7 +1552,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2174,17 +2533,17 @@
+@@ -2184,17 +2543,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
@@ -1574,7 +1574,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2196,43 +2555,20 @@
+@@ -2206,43 +2565,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -1625,7 +1625,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2286,24 +2622,16 @@
+@@ -2296,24 +2632,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -1658,7 +1658,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2329,10 +2657,10 @@
+@@ -2339,10 +2667,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.
@@ -1671,7 +1671,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2340,11 +2668,11 @@
+@@ -2350,11 +2678,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1687,7 +1687,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2381,7 +2709,7 @@
+@@ -2391,7 +2719,7 @@
;;
esac
@@ -1696,7 +1696,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2397,7 +2725,7 @@
+@@ -2407,7 +2735,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -1705,7 +1705,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2408,7 +2736,7 @@
+@@ -2418,7 +2746,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -1714,7 +1714,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2419,15 +2747,11 @@
+@@ -2429,15 +2757,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -1732,7 +1732,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2449,11 +2773,8 @@
+@@ -2459,11 +2783,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".
@@ -1746,7 +1746,7 @@
fi
test "$2" = conftest.file
-@@ -2462,13 +2783,10 @@
+@@ -2472,13 +2793,10 @@
# Ok.
:
else
@@ -1763,7 +1763,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2496,7 +2814,7 @@
+@@ -2506,7 +2824,7 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -1772,7 +1772,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2517,9 +2835,9 @@
+@@ -2527,9 +2845,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
@@ -1784,7 +1784,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2530,24 +2848,24 @@
+@@ -2540,24 +2858,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1814,7 +1814,7 @@
$as_echo "no" >&6; }
fi
-@@ -2557,9 +2875,9 @@
+@@ -2567,9 +2885,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
@@ -1826,7 +1826,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2570,24 +2888,24 @@
+@@ -2580,24 +2898,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1856,7 +1856,7 @@
$as_echo "no" >&6; }
fi
-@@ -2596,7 +2914,7 @@
+@@ -2606,7 +2924,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -1865,7 +1865,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2609,10 +2927,10 @@
+@@ -2619,10 +2937,10 @@
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -1878,7 +1878,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2620,7 +2938,7 @@
+@@ -2630,7 +2948,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1887,7 +1887,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 #(
-@@ -2632,7 +2950,7 @@
+@@ -2642,7 +2960,7 @@
esac
done
done
@@ -1896,7 +1896,7 @@
IFS=$as_save_IFS
fi
-@@ -2648,7 +2966,7 @@
+@@ -2658,7 +2976,7 @@
MKDIR_P="$ac_install_sh -d"
fi
fi
@@ -1905,7 +1905,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2661,9 +2979,9 @@
+@@ -2671,9 +2989,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
@@ -1917,7 +1917,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2674,24 +2992,24 @@
+@@ -2684,24 +3002,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1947,7 +1947,7 @@
$as_echo "no" >&6; }
fi
-@@ -2699,11 +3017,11 @@
+@@ -2709,11 +3027,11 @@
test -n "$AWK" && break
done
@@ -1961,7 +1961,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2721,11 +3039,11 @@
+@@ -2731,11 +3049,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -1975,7 +1975,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2745,9 +3063,7 @@
+@@ -2755,9 +3073,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -1986,16 +1986,16 @@
fi
fi
-@@ -2762,7 +3078,7 @@
+@@ -2772,7 +3088,7 @@
# Define the identity of the package.
- PACKAGE='epiphany'
+ PACKAGE='epiphany-webkit'
- VERSION='2.27.91'
-
-
-@@ -2798,7 +3114,7 @@
+ VERSION='2.27.92'
+
+
+@@ -2808,7 +3124,7 @@
AMTAR=${AMTAR-"${am_missing_run}tar"}
@@ -2004,7 +2004,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'
-@@ -2871,13 +3187,13 @@
+@@ -2881,13 +3197,13 @@
done
rm -rf conftest.dir
@@ -2020,7 +2020,7 @@
$as_echo "$am_cv_prog_tar_ustar" >&6; }
-@@ -2887,7 +3203,7 @@
+@@ -2897,7 +3213,7 @@
# Use AM_SILENT_RULES if present
# Check whether --enable-silent-rules was given.
@@ -2029,7 +2029,7 @@
enableval=$enable_silent_rules;
fi
-@@ -2903,16 +3219,16 @@
+@@ -2913,16 +3229,16 @@
enable_maintainer_mode=yes
fi
@@ -2049,7 +2049,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2927,7 +3243,7 @@
+@@ -2937,7 +3253,7 @@
# Check whether --enable-shared was given.
@@ -2058,7 +2058,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -2958,7 +3274,7 @@
+@@ -2968,7 +3284,7 @@
# Check whether --enable-static was given.
@@ -2067,7 +2067,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -2995,7 +3311,7 @@
+@@ -3005,7 +3321,7 @@
case `pwd` in
*\ * | *\ *)
@@ -2076,7 +2076,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -3020,35 +3336,27 @@
+@@ -3030,35 +3346,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -2119,7 +2119,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -3064,28 +3372,24 @@
+@@ -3074,28 +3382,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -2153,7 +2153,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -3113,7 +3417,7 @@
+@@ -3123,7 +3427,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -2162,7 +2162,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -3141,12 +3445,12 @@
+@@ -3151,12 +3455,12 @@
fi
@@ -2177,7 +2177,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -3171,9 +3475,9 @@
+@@ -3181,9 +3485,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
@@ -2189,7 +2189,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3184,24 +3488,24 @@
+@@ -3194,24 +3498,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2219,7 +2219,7 @@
$as_echo "no" >&6; }
fi
-@@ -3211,9 +3515,9 @@
+@@ -3221,9 +3525,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
@@ -2231,7 +2231,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3224,24 +3528,24 @@
+@@ -3234,24 +3538,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2261,7 +2261,7 @@
$as_echo "no" >&6; }
fi
-@@ -3250,7 +3554,7 @@
+@@ -3260,7 +3564,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2270,7 +2270,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3264,9 +3568,9 @@
+@@ -3274,9 +3578,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
@@ -2282,7 +2282,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3277,24 +3581,24 @@
+@@ -3287,24 +3591,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2312,7 +2312,7 @@
$as_echo "no" >&6; }
fi
-@@ -3304,9 +3608,9 @@
+@@ -3314,9 +3618,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
@@ -2324,7 +2324,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3318,18 +3622,18 @@
+@@ -3328,18 +3632,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2346,7 +2346,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3348,10 +3652,10 @@
+@@ -3358,10 +3662,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2359,7 +2359,7 @@
$as_echo "no" >&6; }
fi
-@@ -3363,9 +3667,9 @@
+@@ -3373,9 +3677,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
@@ -2371,7 +2371,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3376,24 +3680,24 @@
+@@ -3386,24 +3690,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2401,7 +2401,7 @@
$as_echo "no" >&6; }
fi
-@@ -3407,9 +3711,9 @@
+@@ -3417,9 +3721,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
@@ -2413,7 +2413,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3420,24 +3724,24 @@
+@@ -3430,24 +3734,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2443,7 +2443,7 @@
$as_echo "no" >&6; }
fi
-@@ -3450,7 +3754,7 @@
+@@ -3460,7 +3764,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2452,7 +2452,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3461,73 +3765,55 @@
+@@ -3471,73 +3775,55 @@
fi
@@ -2551,7 +2551,7 @@
$as_echo_n "checking for C compiler default output file name... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-@@ -3544,17 +3830,17 @@
+@@ -3554,17 +3840,17 @@
done
rm -f $ac_rmfiles
@@ -2574,7 +2574,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,
-@@ -3571,7 +3857,7 @@
+@@ -3581,7 +3867,7 @@
# certainly right.
break;;
*.* )
@@ -2583,7 +2583,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3590,84 +3876,75 @@
+@@ -3600,84 +3886,75 @@
else
ac_file=''
fi
@@ -2693,7 +2693,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
-@@ -3682,32 +3959,24 @@
+@@ -3692,32 +3969,24 @@
esac
done
else
@@ -2733,7 +2733,7 @@
/* end confdefs.h. */
int
-@@ -3719,17 +3988,17 @@
+@@ -3729,17 +3998,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -2756,7 +2756,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3742,31 +4011,23 @@
+@@ -3752,31 +4021,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2795,7 +2795,7 @@
/* end confdefs.h. */
int
-@@ -3780,37 +4041,16 @@
+@@ -3790,37 +4051,16 @@
return 0;
}
_ACEOF
@@ -2836,7 +2836,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3819,20 +4059,16 @@
+@@ -3829,20 +4069,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -2860,7 +2860,7 @@
/* end confdefs.h. */
int
-@@ -3843,35 +4079,11 @@
+@@ -3853,35 +4089,11 @@
return 0;
}
_ACEOF
@@ -2899,7 +2899,7 @@
/* end confdefs.h. */
int
-@@ -3882,36 +4094,12 @@
+@@ -3892,36 +4104,12 @@
return 0;
}
_ACEOF
@@ -2940,7 +2940,7 @@
/* end confdefs.h. */
int
-@@ -3922,42 +4110,17 @@
+@@ -3932,42 +4120,17 @@
return 0;
}
_ACEOF
@@ -2985,7 +2985,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3974,18 +4137,14 @@
+@@ -3984,18 +4147,14 @@
CFLAGS=
fi
fi
@@ -3007,7 +3007,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -4042,32 +4201,9 @@
+@@ -4052,32 +4211,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -3041,7 +3041,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -4078,17 +4214,19 @@
+@@ -4088,17 +4224,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -3064,7 +3064,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -4098,9 +4236,9 @@
+@@ -4108,9 +4246,9 @@
depcc="$CC" am_compiler_list=
@@ -3076,7 +3076,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4208,7 +4346,7 @@
+@@ -4218,7 +4356,7 @@
fi
fi
@@ -3085,7 +3085,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4223,9 +4361,9 @@
+@@ -4233,9 +4371,9 @@
fi
@@ -3097,7 +3097,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -4233,7 +4371,7 @@
+@@ -4243,7 +4381,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -3106,7 +3106,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -4242,7 +4380,7 @@
+@@ -4252,7 +4390,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3115,7 +3115,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
-@@ -4262,7 +4400,7 @@
+@@ -4272,7 +4410,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
@@ -3124,7 +3124,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"
-@@ -4277,19 +4415,17 @@
+@@ -4287,19 +4425,17 @@
$ac_path_SED_found && break 3
done
done
@@ -3147,7 +3147,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -4307,9 +4443,9 @@
+@@ -4317,9 +4453,9 @@
@@ -3159,7 +3159,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4320,7 +4456,7 @@
+@@ -4330,7 +4466,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3168,7 +3168,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
-@@ -4340,7 +4476,7 @@
+@@ -4350,7 +4486,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
@@ -3177,7 +3177,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"
-@@ -4355,26 +4491,24 @@
+@@ -4365,26 +4501,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -3209,7 +3209,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4388,7 +4522,7 @@
+@@ -4398,7 +4532,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3218,7 +3218,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
-@@ -4408,7 +4542,7 @@
+@@ -4418,7 +4552,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
@@ -3227,7 +3227,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"
-@@ -4423,12 +4557,10 @@
+@@ -4433,12 +4567,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -3242,7 +3242,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4436,14 +4568,14 @@
+@@ -4446,14 +4578,14 @@
fi
fi
@@ -3260,7 +3260,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -4457,7 +4589,7 @@
+@@ -4467,7 +4599,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3269,7 +3269,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
-@@ -4477,7 +4609,7 @@
+@@ -4487,7 +4619,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
@@ -3278,7 +3278,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"
-@@ -4492,12 +4624,10 @@
+@@ -4502,12 +4634,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -3293,7 +3293,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -4505,7 +4635,7 @@
+@@ -4515,7 +4645,7 @@
fi
fi
@@ -3302,7 +3302,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -4531,7 +4661,7 @@
+@@ -4541,7 +4671,7 @@
# Check whether --with-gnu-ld was given.
@@ -3311,7 +3311,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -4540,7 +4670,7 @@
+@@ -4550,7 +4680,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -3320,7 +3320,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -4570,13 +4700,13 @@
+@@ -4580,13 +4710,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -3337,7 +3337,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -4607,18 +4737,16 @@
+@@ -4617,18 +4747,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -3361,7 +3361,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -4631,7 +4759,7 @@
+@@ -4641,7 +4769,7 @@
;;
esac
fi
@@ -3370,7 +3370,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -4643,9 +4771,9 @@
+@@ -4653,9 +4781,9 @@
@@ -3382,7 +3382,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -4692,7 +4820,7 @@
+@@ -4702,7 +4830,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -3391,7 +3391,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -4703,9 +4831,9 @@
+@@ -4713,9 +4841,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
@@ -3403,7 +3403,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -4716,24 +4844,24 @@
+@@ -4726,24 +4854,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3433,7 +3433,7 @@
$as_echo "no" >&6; }
fi
-@@ -4747,9 +4875,9 @@
+@@ -4757,9 +4885,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
@@ -3445,7 +3445,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -4760,24 +4888,24 @@
+@@ -4770,24 +4898,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3475,7 +3475,7 @@
$as_echo "no" >&6; }
fi
-@@ -4790,7 +4918,7 @@
+@@ -4800,7 +4928,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3484,7 +3484,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4810,44 +4938,44 @@
+@@ -4820,44 +4948,44 @@
@@ -3497,16 +3497,16 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:4820: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:4948: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:4830: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:4958: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:4823: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:4951: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:4833: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:4961: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:4826: output\"" >&5)
-+ (eval echo "\"\$as_me:4954: output\"" >&5)
+- (eval echo "\"\$as_me:4836: output\"" >&5)
++ (eval echo "\"\$as_me:4964: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -3540,7 +3540,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -4965,10 +5093,10 @@
+@@ -4975,10 +5103,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -3553,7 +3553,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -4982,7 +5110,7 @@
+@@ -4992,7 +5120,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -3562,7 +3562,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -4992,17 +5120,17 @@
+@@ -5002,17 +5130,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -3583,7 +3583,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -5037,14 +5165,14 @@
+@@ -5047,14 +5175,14 @@
@@ -3601,7 +3601,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -5073,9 +5201,9 @@
+@@ -5083,9 +5211,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
@@ -3613,7 +3613,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -5086,24 +5214,24 @@
+@@ -5096,24 +5224,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3643,7 +3643,7 @@
$as_echo "no" >&6; }
fi
-@@ -5113,9 +5241,9 @@
+@@ -5123,9 +5251,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
@@ -3655,7 +3655,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -5126,24 +5254,24 @@
+@@ -5136,24 +5264,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3685,7 +3685,7 @@
$as_echo "no" >&6; }
fi
-@@ -5152,7 +5280,7 @@
+@@ -5162,7 +5290,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3694,7 +3694,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5172,9 +5300,9 @@
+@@ -5182,9 +5310,9 @@
@@ -3706,7 +3706,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -5368,7 +5496,7 @@
+@@ -5378,7 +5506,7 @@
esac
fi
@@ -3715,7 +3715,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
-@@ -5388,9 +5516,9 @@
+@@ -5398,9 +5526,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
@@ -3727,7 +3727,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -5401,24 +5529,24 @@
+@@ -5411,24 +5539,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3757,7 +3757,7 @@
$as_echo "no" >&6; }
fi
-@@ -5428,9 +5556,9 @@
+@@ -5438,9 +5566,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
@@ -3769,7 +3769,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -5441,24 +5569,24 @@
+@@ -5451,24 +5579,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3799,7 +3799,7 @@
$as_echo "no" >&6; }
fi
-@@ -5467,7 +5595,7 @@
+@@ -5477,7 +5605,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3808,7 +3808,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5493,9 +5621,9 @@
+@@ -5503,9 +5631,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
@@ -3820,7 +3820,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -5506,24 +5634,24 @@
+@@ -5516,24 +5644,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3850,7 +3850,7 @@
$as_echo "no" >&6; }
fi
-@@ -5533,9 +5661,9 @@
+@@ -5543,9 +5671,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
@@ -3862,7 +3862,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -5546,24 +5674,24 @@
+@@ -5556,24 +5684,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3892,7 +3892,7 @@
$as_echo "no" >&6; }
fi
-@@ -5572,7 +5700,7 @@
+@@ -5582,7 +5710,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3901,7 +3901,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5592,9 +5720,9 @@
+@@ -5602,9 +5730,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
@@ -3913,7 +3913,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -5605,24 +5733,24 @@
+@@ -5615,24 +5743,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3943,7 +3943,7 @@
$as_echo "no" >&6; }
fi
-@@ -5632,9 +5760,9 @@
+@@ -5642,9 +5770,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
@@ -3955,7 +3955,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -5645,24 +5773,24 @@
+@@ -5655,24 +5783,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3985,7 +3985,7 @@
$as_echo "no" >&6; }
fi
-@@ -5671,7 +5799,7 @@
+@@ -5681,7 +5809,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3994,7 +3994,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5749,9 +5877,9 @@
+@@ -5759,9 +5887,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -4006,7 +4006,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -5867,18 +5995,18 @@
+@@ -5877,18 +6005,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -4031,7 +4031,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -5931,11 +6059,11 @@
+@@ -5941,11 +6069,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -4046,7 +4046,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -5969,10 +6097,10 @@
+@@ -5979,10 +6107,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
@@ -4059,7 +4059,7 @@
$as_echo "ok" >&6; }
fi
-@@ -5999,7 +6127,7 @@
+@@ -6009,7 +6137,7 @@
# Check whether --enable-libtool-lock was given.
@@ -4068,7 +4068,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -6011,11 +6139,11 @@
+@@ -6021,11 +6149,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4083,13 +4083,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -6029,12 +6157,12 @@
+@@ -6039,12 +6167,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6032 "configure"' > conftest.$ac_ext
+- echo '#line 6042 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 6160 "configure"' > conftest.$ac_ext
++ echo '#line 6170 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4100,7 +4100,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -6068,11 +6196,11 @@
+@@ -6078,11 +6206,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4115,7 +4115,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -6121,9 +6249,9 @@
+@@ -6131,9 +6259,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -4127,7 +4127,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -6132,11 +6260,7 @@
+@@ -6142,11 +6270,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4140,7 +4140,7 @@
/* end confdefs.h. */
int
-@@ -6147,38 +6271,13 @@
+@@ -6157,38 +6281,13 @@
return 0;
}
_ACEOF
@@ -4183,7 +4183,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -6186,7 +6285,7 @@
+@@ -6196,7 +6295,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -4192,7 +4192,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
-@@ -6196,11 +6295,11 @@
+@@ -6206,11 +6305,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4207,7 +4207,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -6226,9 +6325,9 @@
+@@ -6236,9 +6335,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
@@ -4219,7 +4219,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -6239,24 +6338,24 @@
+@@ -6249,24 +6348,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4249,7 +4249,7 @@
$as_echo "no" >&6; }
fi
-@@ -6266,9 +6365,9 @@
+@@ -6276,9 +6375,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
@@ -4261,7 +4261,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -6279,24 +6378,24 @@
+@@ -6289,24 +6388,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4291,7 +4291,7 @@
$as_echo "no" >&6; }
fi
-@@ -6305,7 +6404,7 @@
+@@ -6315,7 +6414,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4300,7 +4300,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6318,9 +6417,9 @@
+@@ -6328,9 +6427,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
@@ -4312,7 +4312,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -6331,24 +6430,24 @@
+@@ -6341,24 +6440,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4342,7 +4342,7 @@
$as_echo "no" >&6; }
fi
-@@ -6358,9 +6457,9 @@
+@@ -6368,9 +6467,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
@@ -4354,7 +4354,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -6371,24 +6470,24 @@
+@@ -6381,24 +6480,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4384,7 +4384,7 @@
$as_echo "no" >&6; }
fi
-@@ -6397,7 +6496,7 @@
+@@ -6407,7 +6506,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4393,7 +4393,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6410,9 +6509,9 @@
+@@ -6420,9 +6519,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
@@ -4405,7 +4405,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -6423,24 +6522,24 @@
+@@ -6433,24 +6532,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4435,7 +4435,7 @@
$as_echo "no" >&6; }
fi
-@@ -6450,9 +6549,9 @@
+@@ -6460,9 +6559,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
@@ -4447,7 +4447,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -6463,24 +6562,24 @@
+@@ -6473,24 +6572,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4477,7 +4477,7 @@
$as_echo "no" >&6; }
fi
-@@ -6489,7 +6588,7 @@
+@@ -6499,7 +6598,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4486,7 +4486,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6502,9 +6601,9 @@
+@@ -6512,9 +6611,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
@@ -4498,7 +4498,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -6515,24 +6614,24 @@
+@@ -6525,24 +6624,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4528,7 +4528,7 @@
$as_echo "no" >&6; }
fi
-@@ -6542,9 +6641,9 @@
+@@ -6552,9 +6651,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
@@ -4540,7 +4540,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -6555,24 +6654,24 @@
+@@ -6565,24 +6664,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4570,7 +4570,7 @@
$as_echo "no" >&6; }
fi
-@@ -6581,7 +6680,7 @@
+@@ -6591,7 +6690,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4579,7 +4579,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6594,9 +6693,9 @@
+@@ -6604,9 +6703,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
@@ -4591,7 +4591,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -6607,24 +6706,24 @@
+@@ -6617,24 +6716,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4621,7 +4621,7 @@
$as_echo "no" >&6; }
fi
-@@ -6634,9 +6733,9 @@
+@@ -6644,9 +6743,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
@@ -4633,7 +4633,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -6647,24 +6746,24 @@
+@@ -6657,24 +6756,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4663,7 +4663,7 @@
$as_echo "no" >&6; }
fi
-@@ -6673,7 +6772,7 @@
+@@ -6683,7 +6782,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4672,7 +4672,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6709,9 +6808,9 @@
+@@ -6719,9 +6818,9 @@
@@ -4684,7 +4684,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -6736,22 +6835,18 @@
+@@ -6746,22 +6845,18 @@
rm -f conftest.*
fi
fi
@@ -4711,7 +4711,7 @@
/* end confdefs.h. */
int
-@@ -6762,42 +6857,17 @@
+@@ -6772,42 +6867,17 @@
return 0;
}
_ACEOF
@@ -4759,7 +4759,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -6839,14 +6909,14 @@
+@@ -6849,14 +6919,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
@@ -4776,7 +4776,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -6861,11 +6931,7 @@
+@@ -6871,11 +6941,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.
@@ -4789,7 +4789,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -6874,78 +6940,34 @@
+@@ -6884,78 +6950,34 @@
#endif
Syntax error
_ACEOF
@@ -4873,7 +4873,7 @@
break
fi
-@@ -6957,7 +6979,7 @@
+@@ -6967,7 +6989,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -4882,7 +4882,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -6968,11 +6990,7 @@
+@@ -6978,11 +7000,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.
@@ -4895,7 +4895,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -6981,87 +6999,40 @@
+@@ -6991,87 +7009,40 @@
#endif
Syntax error
_ACEOF
@@ -4992,7 +4992,7 @@
fi
ac_ext=c
-@@ -7071,16 +7042,12 @@
+@@ -7081,16 +7052,12 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -5012,7 +5012,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -7095,48 +7062,23 @@
+@@ -7105,48 +7072,23 @@
return 0;
}
_ACEOF
@@ -5066,7 +5066,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -7146,18 +7088,14 @@
+@@ -7156,18 +7098,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -5088,7 +5088,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -7167,14 +7105,10 @@
+@@ -7177,14 +7115,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -5105,7 +5105,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -7201,118 +7135,34 @@
+@@ -7211,118 +7145,34 @@
return 0;
}
_ACEOF
@@ -5237,7 +5237,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -7322,62 +7172,13 @@
+@@ -7332,62 +7182,13 @@
done
@@ -5305,7 +5305,7 @@
_ACEOF
fi
-@@ -7398,7 +7199,7 @@
+@@ -7408,7 +7209,7 @@
# Check whether --with-pic was given.
@@ -5314,7 +5314,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -7414,7 +7215,7 @@
+@@ -7424,7 +7225,7 @@
# Check whether --enable-fast-install was given.
@@ -5323,7 +5323,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -7495,9 +7296,9 @@
+@@ -7505,9 +7306,9 @@
setopt NO_GLOB_SUBST
fi
@@ -5335,7 +5335,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -7510,7 +7311,7 @@
+@@ -7520,7 +7321,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -5344,7 +5344,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -7603,9 +7404,9 @@
+@@ -7613,9 +7414,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -5356,7 +5356,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -7656,10 +7457,10 @@
+@@ -7666,10 +7467,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -5369,7 +5369,7 @@
$as_echo "no" >&6; }
fi
-@@ -7669,9 +7470,9 @@
+@@ -7679,9 +7480,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -5381,7 +5381,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -7722,10 +7523,10 @@
+@@ -7732,10 +7533,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -5394,7 +5394,7 @@
$as_echo "no" >&6; }
fi
-@@ -7806,9 +7607,9 @@
+@@ -7816,9 +7617,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -5406,21 +5406,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -7824,11 +7625,11 @@
+@@ -7834,11 +7635,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:7827: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7628: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:7837: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7638: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:7831: \$? = $ac_status" >&5
-+ echo "$as_me:7632: \$? = $ac_status" >&5
+- echo "$as_me:7841: \$? = $ac_status" >&5
++ echo "$as_me:7642: \$? = $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.
-@@ -7841,7 +7642,7 @@
+@@ -7851,7 +7652,7 @@
$RM conftest*
fi
@@ -5429,7 +5429,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -7861,7 +7662,7 @@
+@@ -7871,7 +7672,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -5438,7 +5438,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -8133,7 +7934,7 @@
+@@ -8143,7 +7944,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -5447,7 +5447,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -8145,9 +7946,9 @@
+@@ -8155,9 +7956,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -5459,21 +5459,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -8163,11 +7964,11 @@
+@@ -8173,11 +7974,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:8166: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7967: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8176: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7977: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8170: \$? = $ac_status" >&5
-+ echo "$as_me:7971: \$? = $ac_status" >&5
+- echo "$as_me:8180: \$? = $ac_status" >&5
++ echo "$as_me:7981: \$? = $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.
-@@ -8180,7 +7981,7 @@
+@@ -8190,7 +7991,7 @@
$RM conftest*
fi
@@ -5482,7 +5482,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -8204,9 +8005,9 @@
+@@ -8214,9 +8015,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -5494,7 +5494,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -8232,7 +8033,7 @@
+@@ -8242,7 +8043,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -5503,7 +5503,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -8247,9 +8048,9 @@
+@@ -8257,9 +8058,9 @@
@@ -5515,21 +5515,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8268,11 +8069,11 @@
+@@ -8278,11 +8079,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:8271: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8072: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8281: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8082: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8275: \$? = $ac_status" >&5
-+ echo "$as_me:8076: \$? = $ac_status" >&5
+- echo "$as_me:8285: \$? = $ac_status" >&5
++ echo "$as_me:8086: \$? = $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
-@@ -8294,7 +8095,7 @@
+@@ -8304,7 +8105,7 @@
$RM conftest*
fi
@@ -5538,7 +5538,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -8302,9 +8103,9 @@
+@@ -8312,9 +8113,9 @@
@@ -5550,21 +5550,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8323,11 +8124,11 @@
+@@ -8333,11 +8134,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:8326: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8127: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8336: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8137: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8330: \$? = $ac_status" >&5
-+ echo "$as_me:8131: \$? = $ac_status" >&5
+- echo "$as_me:8340: \$? = $ac_status" >&5
++ echo "$as_me:8141: \$? = $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
-@@ -8349,7 +8150,7 @@
+@@ -8359,7 +8160,7 @@
$RM conftest*
fi
@@ -5573,7 +5573,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -8358,7 +8159,7 @@
+@@ -8368,7 +8169,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
@@ -5582,7 +5582,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -8366,10 +8167,10 @@
+@@ -8376,10 +8177,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
@@ -5595,7 +5595,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -8382,7 +8183,7 @@
+@@ -8392,7 +8193,7 @@
@@ -5604,7 +5604,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -8824,11 +8625,7 @@
+@@ -8834,11 +8635,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -5617,7 +5617,7 @@
/* end confdefs.h. */
int
-@@ -8839,27 +8636,7 @@
+@@ -8849,27 +8646,7 @@
return 0;
}
_ACEOF
@@ -5646,7 +5646,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -8873,16 +8650,9 @@
+@@ -8883,16 +8660,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
@@ -5665,7 +5665,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -8895,11 +8665,7 @@
+@@ -8905,11 +8675,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -5678,7 +5678,7 @@
/* end confdefs.h. */
int
-@@ -8910,27 +8676,7 @@
+@@ -8920,27 +8686,7 @@
return 0;
}
_ACEOF
@@ -5707,7 +5707,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -8944,16 +8690,9 @@
+@@ -8954,16 +8700,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
@@ -5726,7 +5726,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -9165,42 +8904,16 @@
+@@ -9175,42 +8914,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -5774,7 +5774,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'
-@@ -9456,7 +9169,7 @@
+@@ -9466,7 +9179,7 @@
fi
fi
@@ -5783,7 +5783,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -9493,16 +9206,16 @@
+@@ -9503,16 +9216,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.
@@ -5804,7 +5804,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -9516,11 +9229,11 @@
+@@ -9526,11 +9239,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -5819,7 +5819,7 @@
then
archive_cmds_need_lc=no
else
-@@ -9531,7 +9244,7 @@
+@@ -9541,7 +9254,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -5828,7 +5828,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -9695,7 +9408,7 @@
+@@ -9705,7 +9418,7 @@
@@ -5837,7 +5837,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -10117,11 +9830,7 @@
+@@ -10127,11 +9840,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -5850,7 +5850,7 @@
/* end confdefs.h. */
int
-@@ -10132,41 +9841,13 @@
+@@ -10142,41 +9851,13 @@
return 0;
}
_ACEOF
@@ -5896,7 +5896,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -10381,7 +10062,7 @@
+@@ -10391,7 +10072,7 @@
dynamic_linker=no
;;
esac
@@ -5905,7 +5905,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -10483,7 +10164,7 @@
+@@ -10493,7 +10174,7 @@
@@ -5914,7 +5914,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -10508,7 +10189,7 @@
+@@ -10518,7 +10199,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -5923,7 +5923,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -10553,18 +10234,14 @@
+@@ -10563,18 +10244,14 @@
darwin*)
# if libdl is installed we need to link against it
@@ -5945,7 +5945,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10582,43 +10259,18 @@
+@@ -10592,43 +10269,18 @@
return 0;
}
_ACEOF
@@ -5995,7 +5995,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -10631,33 +10283,19 @@
+@@ -10641,33 +10293,19 @@
;;
*)
@@ -6039,7 +6039,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -10666,13 +10304,6 @@
+@@ -10676,13 +10314,6 @@
extern "C"
#endif
char shl_load ();
@@ -6053,7 +6053,7 @@
int
main ()
{
-@@ -10681,212 +10312,32 @@
+@@ -10691,212 +10322,32 @@
return 0;
}
_ACEOF
@@ -6279,7 +6279,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10904,57 +10355,28 @@
+@@ -10914,57 +10365,28 @@
return 0;
}
_ACEOF
@@ -6346,7 +6346,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10972,57 +10394,28 @@
+@@ -10982,57 +10404,28 @@
return 0;
}
_ACEOF
@@ -6413,7 +6413,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11040,43 +10433,18 @@
+@@ -11050,43 +10443,18 @@
return 0;
}
_ACEOF
@@ -6463,7 +6463,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -11115,9 +10483,9 @@
+@@ -11125,9 +10493,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -6475,16 +6475,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11126,7 +10494,7 @@
+@@ -11136,7 +10504,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 11129 "configure"
-+#line 10497 "configure"
+-#line 11139 "configure"
++#line 10507 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11185,11 +10553,11 @@
+@@ -11195,11 +10563,11 @@
return status;
}
_LT_EOF
@@ -6499,7 +6499,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -11206,14 +10574,14 @@
+@@ -11216,14 +10584,14 @@
fi
@@ -6517,16 +6517,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11222,7 +10590,7 @@
+@@ -11232,7 +10600,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 11225 "configure"
-+#line 10593 "configure"
+-#line 11235 "configure"
++#line 10603 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11281,11 +10649,11 @@
+@@ -11291,11 +10659,11 @@
return status;
}
_LT_EOF
@@ -6541,7 +6541,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -11302,7 +10670,7 @@
+@@ -11312,7 +10680,7 @@
fi
@@ -6550,7 +6550,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -11341,12 +10709,12 @@
+@@ -11351,12 +10719,12 @@
striplib=
old_striplib=
@@ -6565,7 +6565,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -11355,15 +10723,15 @@
+@@ -11365,15 +10733,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -6584,7 +6584,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -11381,12 +10749,12 @@
+@@ -11391,12 +10759,12 @@
# Report which library types will actually be built
@@ -6600,7 +6600,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -11407,14 +10775,14 @@
+@@ -11417,14 +10785,14 @@
fi
;;
esac
@@ -6618,7 +6618,7 @@
$as_echo "$enable_static" >&6; }
-@@ -11455,9 +10823,9 @@
+@@ -11465,9 +10833,9 @@
# Josh Triplett <josh at freedesktop.org>
# Extract the first word of "bash", so it can be a program name with args.
set dummy bash; ac_word=$2
@@ -6630,7 +6630,7 @@
$as_echo_n "(cached) " >&6
else
case $DOLT_BASH in
-@@ -11470,14 +10838,14 @@
+@@ -11480,14 +10848,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6648,7 +6648,7 @@
IFS=$as_save_IFS
;;
-@@ -11485,15 +10853,15 @@
+@@ -11495,15 +10863,15 @@
fi
DOLT_BASH=$ac_cv_path_DOLT_BASH
if test -n "$DOLT_BASH"; then
@@ -6667,7 +6667,7 @@
$as_echo_n "checking if dolt supports this host... " >&6; }
dolt_supported=yes
if test x$DOLT_BASH = x; then
-@@ -11515,12 +10883,12 @@
+@@ -11525,12 +10893,12 @@
;;
esac
if test x$dolt_supported = xno ; then
@@ -6682,7 +6682,7 @@
$as_echo "yes, replacing libtool" >&6; }
cat <<__DOLTCOMPILE__EOF__ >doltcompile
-@@ -11648,17 +11016,13 @@
+@@ -11658,17 +11026,13 @@
# end dolt
@@ -6703,7 +6703,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11683,54 +11047,27 @@
+@@ -11693,54 +11057,27 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -6766,7 +6766,7 @@
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-@@ -11743,9 +11080,9 @@
+@@ -11753,9 +11090,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
@@ -6778,7 +6778,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11756,24 +11093,24 @@
+@@ -11766,24 +11103,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6808,7 +6808,7 @@
$as_echo "no" >&6; }
fi
-@@ -11783,9 +11120,9 @@
+@@ -11793,9 +11130,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
@@ -6820,7 +6820,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -11796,24 +11133,24 @@
+@@ -11806,24 +11143,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6850,7 +6850,7 @@
$as_echo "no" >&6; }
fi
-@@ -11822,7 +11159,7 @@
+@@ -11832,7 +11169,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6859,7 +6859,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -11836,9 +11173,9 @@
+@@ -11846,9 +11183,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
@@ -6871,7 +6871,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11849,24 +11186,24 @@
+@@ -11859,24 +11196,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6901,7 +6901,7 @@
$as_echo "no" >&6; }
fi
-@@ -11876,9 +11213,9 @@
+@@ -11886,9 +11223,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
@@ -6913,7 +6913,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11890,18 +11227,18 @@
+@@ -11900,18 +11237,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6935,7 +6935,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -11920,10 +11257,10 @@
+@@ -11930,10 +11267,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -6948,7 +6948,7 @@
$as_echo "no" >&6; }
fi
-@@ -11935,9 +11272,9 @@
+@@ -11945,9 +11282,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
@@ -6960,7 +6960,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11948,24 +11285,24 @@
+@@ -11958,24 +11295,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6990,7 +6990,7 @@
$as_echo "no" >&6; }
fi
-@@ -11979,9 +11316,9 @@
+@@ -11989,9 +11326,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
@@ -7002,7 +7002,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -11992,24 +11329,24 @@
+@@ -12002,24 +11339,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7032,7 +7032,7 @@
$as_echo "no" >&6; }
fi
-@@ -12022,7 +11359,7 @@
+@@ -12032,7 +11369,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7041,7 +7041,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -12033,62 +11370,42 @@
+@@ -12043,62 +11380,42 @@
fi
@@ -7126,7 +7126,7 @@
/* end confdefs.h. */
int
-@@ -12102,37 +11419,16 @@
+@@ -12112,37 +11429,16 @@
return 0;
}
_ACEOF
@@ -7167,7 +7167,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -12141,20 +11437,16 @@
+@@ -12151,20 +11447,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -7191,7 +7191,7 @@
/* end confdefs.h. */
int
-@@ -12165,35 +11457,11 @@
+@@ -12175,35 +11467,11 @@
return 0;
}
_ACEOF
@@ -7230,7 +7230,7 @@
/* end confdefs.h. */
int
-@@ -12204,36 +11472,12 @@
+@@ -12214,36 +11482,12 @@
return 0;
}
_ACEOF
@@ -7271,7 +7271,7 @@
/* end confdefs.h. */
int
-@@ -12244,42 +11488,17 @@
+@@ -12254,42 +11498,17 @@
return 0;
}
_ACEOF
@@ -7316,7 +7316,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -12296,18 +11515,14 @@
+@@ -12306,18 +11525,14 @@
CFLAGS=
fi
fi
@@ -7338,7 +7338,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -12364,32 +11579,9 @@
+@@ -12374,32 +11589,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -7372,7 +7372,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -12400,17 +11592,19 @@
+@@ -12410,17 +11602,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -7395,7 +7395,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -12420,9 +11614,9 @@
+@@ -12430,9 +11624,9 @@
depcc="$CC" am_compiler_list=
@@ -7407,7 +7407,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -12530,7 +11724,7 @@
+@@ -12540,7 +11734,7 @@
fi
fi
@@ -7416,7 +7416,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -12553,9 +11747,9 @@
+@@ -12563,9 +11757,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
@@ -7428,7 +7428,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12566,24 +11760,24 @@
+@@ -12576,24 +11770,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7458,7 +7458,7 @@
$as_echo "no" >&6; }
fi
-@@ -12593,9 +11787,9 @@
+@@ -12603,9 +11797,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
@@ -7470,7 +7470,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -12606,24 +11800,24 @@
+@@ -12616,24 +11810,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7500,7 +7500,7 @@
$as_echo "no" >&6; }
fi
-@@ -12632,7 +11826,7 @@
+@@ -12642,7 +11836,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7509,7 +7509,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -12646,9 +11840,9 @@
+@@ -12656,9 +11850,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
@@ -7521,7 +7521,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12659,24 +11853,24 @@
+@@ -12669,24 +11863,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7551,7 +7551,7 @@
$as_echo "no" >&6; }
fi
-@@ -12686,9 +11880,9 @@
+@@ -12696,9 +11890,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
@@ -7563,7 +7563,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12700,18 +11894,18 @@
+@@ -12710,18 +11904,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7585,7 +7585,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -12730,10 +11924,10 @@
+@@ -12740,10 +11934,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7598,7 +7598,7 @@
$as_echo "no" >&6; }
fi
-@@ -12745,9 +11939,9 @@
+@@ -12755,9 +11949,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
@@ -7610,7 +7610,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12758,24 +11952,24 @@
+@@ -12768,24 +11962,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7640,7 +7640,7 @@
$as_echo "no" >&6; }
fi
-@@ -12789,9 +11983,9 @@
+@@ -12799,9 +11993,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
@@ -7652,7 +7652,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -12802,24 +11996,24 @@
+@@ -12812,24 +12006,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7682,7 +7682,7 @@
$as_echo "no" >&6; }
fi
-@@ -12832,7 +12026,7 @@
+@@ -12842,7 +12036,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7691,7 +7691,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -12843,62 +12037,42 @@
+@@ -12853,62 +12047,42 @@
fi
@@ -7776,7 +7776,7 @@
/* end confdefs.h. */
int
-@@ -12912,37 +12086,16 @@
+@@ -12922,37 +12096,16 @@
return 0;
}
_ACEOF
@@ -7817,7 +7817,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -12951,20 +12104,16 @@
+@@ -12961,20 +12114,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -7841,7 +7841,7 @@
/* end confdefs.h. */
int
-@@ -12975,35 +12124,11 @@
+@@ -12985,35 +12134,11 @@
return 0;
}
_ACEOF
@@ -7880,7 +7880,7 @@
/* end confdefs.h. */
int
-@@ -13014,36 +12139,12 @@
+@@ -13024,36 +12149,12 @@
return 0;
}
_ACEOF
@@ -7921,7 +7921,7 @@
/* end confdefs.h. */
int
-@@ -13054,42 +12155,17 @@
+@@ -13064,42 +12165,17 @@
return 0;
}
_ACEOF
@@ -7966,7 +7966,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -13106,18 +12182,14 @@
+@@ -13116,18 +12192,14 @@
CFLAGS=
fi
fi
@@ -7988,7 +7988,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -13174,32 +12246,9 @@
+@@ -13184,32 +12256,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -8022,7 +8022,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -13210,17 +12259,19 @@
+@@ -13220,17 +12269,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -8045,7 +8045,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -13230,9 +12281,9 @@
+@@ -13240,9 +12291,9 @@
depcc="$CC" am_compiler_list=
@@ -8057,7 +8057,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -13340,7 +12391,7 @@
+@@ -13350,7 +12401,7 @@
fi
fi
@@ -8066,7 +8066,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -13358,16 +12409,12 @@
+@@ -13368,16 +12419,12 @@
am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
@@ -8086,7 +8086,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -13382,48 +12429,23 @@
+@@ -13392,48 +12439,23 @@
return 0;
}
_ACEOF
@@ -8140,7 +8140,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -13433,18 +12455,14 @@
+@@ -13443,18 +12465,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -8162,7 +8162,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -13454,14 +12472,10 @@
+@@ -13464,14 +12482,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -8179,7 +8179,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -13488,60 +12502,31 @@
+@@ -13498,60 +12512,31 @@
return 0;
}
_ACEOF
@@ -8249,7 +8249,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -13554,14 +12539,14 @@
+@@ -13564,14 +12549,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8267,7 +8267,7 @@
IFS=$as_save_IFS
;;
-@@ -13569,19 +12554,19 @@
+@@ -13579,19 +12564,19 @@
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -8291,7 +8291,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_MKENUMS in
-@@ -13594,14 +12579,14 @@
+@@ -13604,14 +12589,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8309,7 +8309,7 @@
IFS=$as_save_IFS
;;
-@@ -13609,26 +12594,26 @@
+@@ -13619,26 +12604,26 @@
fi
GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
if test -n "$GLIB_MKENUMS"; then
@@ -8341,7 +8341,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -13636,35 +12621,31 @@
+@@ -13646,35 +12631,31 @@
case "$am__api_version" in
1.01234)
@@ -8383,7 +8383,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -13677,14 +12658,14 @@
+@@ -13687,14 +12668,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8401,7 +8401,7 @@
IFS=$as_save_IFS
;;
-@@ -13692,19 +12673,19 @@
+@@ -13702,19 +12683,19 @@
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -8425,7 +8425,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -13717,14 +12698,14 @@
+@@ -13727,14 +12708,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8443,7 +8443,7 @@
IFS=$as_save_IFS
;;
-@@ -13732,19 +12713,19 @@
+@@ -13742,19 +12723,19 @@
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -8467,7 +8467,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -13757,14 +12738,14 @@
+@@ -13767,14 +12748,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8485,7 +8485,7 @@
IFS=$as_save_IFS
;;
-@@ -13772,18 +12753,16 @@
+@@ -13782,18 +12763,16 @@
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -8507,7 +8507,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 $< $@'
-@@ -13829,9 +12808,9 @@
+@@ -13839,9 +12818,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
@@ -8519,7 +8519,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -13844,14 +12823,14 @@
+@@ -13854,14 +12833,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8537,7 +8537,7 @@
IFS=$as_save_IFS
;;
-@@ -13859,19 +12838,19 @@
+@@ -13869,19 +12848,19 @@
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -8561,7 +8561,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -13884,14 +12863,14 @@
+@@ -13894,14 +12873,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8579,7 +8579,7 @@
IFS=$as_save_IFS
;;
-@@ -13899,19 +12878,19 @@
+@@ -13909,19 +12888,19 @@
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -8603,7 +8603,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -13924,14 +12903,14 @@
+@@ -13934,14 +12913,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8621,7 +8621,7 @@
IFS=$as_save_IFS
;;
-@@ -13939,19 +12918,19 @@
+@@ -13949,19 +12928,19 @@
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -8645,7 +8645,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -13964,14 +12943,14 @@
+@@ -13974,14 +12953,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8663,7 +8663,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -13980,33 +12959,29 @@
+@@ -13990,33 +12969,29 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -8703,7 +8703,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -14019,14 +12994,14 @@
+@@ -14029,14 +13004,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8721,7 +8721,7 @@
IFS=$as_save_IFS
;;
-@@ -14034,34 +13009,28 @@
+@@ -14044,34 +13019,28 @@
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -8763,7 +8763,7 @@
fi
fi
-@@ -14071,11 +13040,7 @@
+@@ -14081,11 +13050,7 @@
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -8776,7 +8776,7 @@
/* end confdefs.h. */
int
-@@ -14087,136 +13052,27 @@
+@@ -14097,136 +13062,27 @@
return 0;
}
_ACEOF
@@ -8929,7 +8929,7 @@
-@@ -14229,9 +13085,9 @@
+@@ -14239,9 +13095,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
@@ -8941,7 +8941,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -14244,14 +13100,14 @@
+@@ -14254,14 +13110,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8959,7 +8959,7 @@
IFS=$as_save_IFS
;;
-@@ -14259,10 +13115,10 @@
+@@ -14269,10 +13125,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -8972,7 +8972,7 @@
$as_echo "no" >&6; }
fi
-@@ -14272,9 +13128,9 @@
+@@ -14282,9 +13138,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
@@ -8984,7 +8984,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -14287,14 +13143,14 @@
+@@ -14297,14 +13153,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9002,7 +9002,7 @@
IFS=$as_save_IFS
;;
-@@ -14302,10 +13158,10 @@
+@@ -14312,10 +13168,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -9015,7 +9015,7 @@
$as_echo "no" >&6; }
fi
-@@ -14314,7 +13170,7 @@
+@@ -14324,7 +13180,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9024,7 +9024,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -14327,13 +13183,13 @@
+@@ -14337,13 +13193,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -9041,7 +9041,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -14342,7 +13198,7 @@
+@@ -14352,7 +13208,7 @@
# Check whether --enable-debug was given.
@@ -9050,7 +9050,7 @@
enableval=$enable_debug;
else
enable_debug=no
-@@ -14351,16 +13207,14 @@
+@@ -14361,16 +13217,14 @@
if test x$enable_debug = xyes ; then
@@ -9069,7 +9069,7 @@
enableval=$enable_compile_warnings;
else
enable_compile_warnings="maximum"
-@@ -14391,13 +13245,9 @@
+@@ -14401,13 +13255,9 @@
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -9085,7 +9085,7 @@
/* end confdefs.h. */
int
-@@ -14408,35 +13258,14 @@
+@@ -14418,35 +13268,14 @@
return 0;
}
_ACEOF
@@ -9124,7 +9124,7 @@
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
-@@ -14450,26 +13279,24 @@
+@@ -14460,26 +13289,24 @@
fi
;;
*)
@@ -9156,7 +9156,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
-@@ -14484,7 +13311,7 @@
+@@ -14494,7 +13321,7 @@
esac
fi
fi
@@ -9165,7 +9165,7 @@
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -14506,9 +13333,7 @@
+@@ -14516,9 +13343,7 @@
if test "$enable_maintainer_mode" = "yes"; then
@@ -9176,7 +9176,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"
-@@ -14526,11 +13351,11 @@
+@@ -14536,11 +13361,11 @@
GNOME_KEYRING_REQUIRED=2.26.0
if test -n "$PKG_CONFIG" && \
@@ -9191,7 +9191,7 @@
have_libnotify=yes
else
have_libnotify=no
-@@ -14540,24 +13365,22 @@
+@@ -14550,24 +13375,22 @@
if test "$have_libnotify" = "yes"; then
LIBNOTIFY_PACKAGE="libnotify >= $LIBNOTIFY_REQUIRED"
@@ -9220,7 +9220,7 @@
$as_echo "$enable_tests" >&6; }
if test "$enable_tests" = "yes"; then
-@@ -14571,14 +13394,15 @@
+@@ -14581,14 +13404,15 @@
pkg_failed=no
@@ -9242,7 +9242,7 @@
glib-2.0 >= \$GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14596,7 +13420,7 @@
+@@ -14606,7 +13430,7 @@
webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
@@ -9251,7 +9251,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14617,8 +13441,8 @@
+@@ -14627,8 +13451,8 @@
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
") 2>&5
ac_status=$?
@@ -9262,7 +9262,7 @@
pkg_cv_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14641,14 +13465,16 @@
+@@ -14651,14 +13475,16 @@
else
pkg_failed=yes
fi
@@ -9286,7 +9286,7 @@
glib-2.0 >= \$GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14666,7 +13492,7 @@
+@@ -14676,7 +13502,7 @@
webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
@@ -9295,7 +9295,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14687,8 +13513,8 @@
+@@ -14697,8 +13523,8 @@
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
") 2>&5
ac_status=$?
@@ -9306,7 +9306,7 @@
pkg_cv_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14711,8 +13537,9 @@
+@@ -14721,8 +13547,9 @@
else
pkg_failed=yes
fi
@@ -9318,7 +9318,7 @@
fi
-@@ -14725,7 +13552,7 @@
+@@ -14735,7 +13562,7 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9327,7 +9327,7 @@
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14743,9 +13570,9 @@
+@@ -14753,9 +13580,9 @@
webkit-1.0 >= $WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
@@ -9339,7 +9339,7 @@
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14763,41 +13590,12 @@
+@@ -14773,41 +13600,12 @@
webkit-1.0 >= $WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
@@ -9383,7 +9383,7 @@
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14825,22 +13623,11 @@
+@@ -14835,22 +13633,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.
@@ -9409,7 +9409,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14849,12 +13636,11 @@
+@@ -14859,12 +13646,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -9424,7 +9424,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14865,40 +13651,44 @@
+@@ -14875,40 +13661,44 @@
pkg_failed=no
@@ -9488,7 +9488,7 @@
fi
-@@ -14911,25 +13701,14 @@
+@@ -14921,25 +13711,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9517,7 +9517,7 @@
$DBUS_PKG_ERRORS
-@@ -14939,22 +13718,11 @@
+@@ -14949,22 +13728,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.
@@ -9543,7 +9543,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14963,21 +13731,20 @@
+@@ -14973,21 +13741,20 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -9569,7 +9569,7 @@
$as_echo_n "(cached) " >&6
else
case $DBUS_BINDING_TOOL in
-@@ -14990,14 +13757,14 @@
+@@ -15000,14 +13767,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9587,7 +9587,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_DBUS_BINDING_TOOL" && ac_cv_path_DBUS_BINDING_TOOL="no"
-@@ -15006,19 +13773,17 @@
+@@ -15016,19 +13783,17 @@
fi
DBUS_BINDING_TOOL=$ac_cv_path_DBUS_BINDING_TOOL
if test -n "$DBUS_BINDING_TOOL"; then
@@ -9610,7 +9610,7 @@
fi
# *****
-@@ -15034,13 +13799,13 @@
+@@ -15044,13 +13809,13 @@
# Check whether --with-gconf-source was given.
@@ -9626,7 +9626,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -15049,22 +13814,20 @@
+@@ -15059,22 +13824,20 @@
# Check whether --with-gconf-schema-file-dir was given.
@@ -9653,7 +9653,7 @@
esac
fi
-@@ -15080,9 +13843,9 @@
+@@ -15090,9 +13853,9 @@
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -9665,7 +9665,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -15095,14 +13858,14 @@
+@@ -15105,14 +13868,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9683,7 +9683,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-@@ -15111,134 +13874,160 @@
+@@ -15121,134 +13884,160 @@
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -9932,7 +9932,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -15247,582 +14036,18 @@
+@@ -15257,582 +14046,18 @@
done
@@ -10372,10 +10372,10 @@
-_ACEOF
-
-fi
-
+-
-done
-
--
+
-
-
-
@@ -10519,7 +10519,7 @@
/* end confdefs.h. */
/* Test program from Paul Eggert and Tony Leneis. */
#ifdef TIME_WITH_SYS_TIME
-@@ -16019,44 +14244,17 @@
+@@ -16029,44 +14254,17 @@
return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
}
_ACEOF
@@ -10569,7 +10569,7 @@
$as_echo "$ac_cv_func_working_mktime" >&6; }
if test $ac_cv_func_working_mktime = no; then
case " $LIBOBJS " in
-@@ -16067,19 +14265,15 @@
+@@ -16077,19 +14275,15 @@
fi
@@ -10593,7 +10593,7 @@
/* end confdefs.h. */
$ac_includes_default
-@@ -16112,44 +14306,17 @@
+@@ -16122,44 +14316,17 @@
}
_ACEOF
@@ -10643,7 +10643,7 @@
$as_echo "$ac_cv_func_strtod" >&6; }
if test $ac_cv_func_strtod = no; then
case " $LIBOBJS " in
-@@ -16158,265 +14325,62 @@
+@@ -16168,105 +14335,20 @@
;;
esac
@@ -10661,7 +10661,9 @@
-/* Define pow to an innocuous variant, in case <limits.h> declares pow.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define pow innocuous_pow
--
++ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
++if test "x$ac_cv_func_pow" = x""yes; then :
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char pow (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
@@ -10724,17 +10726,15 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_pow=no
--fi
-+ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
-+if test "x$ac_cv_func_pow" = x""yes; then :
+ fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_pow" >&5
-$as_echo "$ac_cv_func_pow" >&6; }
-
+-
if test $ac_cv_func_pow = no; then
- { $as_echo "$as_me:$LINENO: checking for pow in -lm" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
@@ -10753,21 +10753,11 @@
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char pow ();
--int
--main ()
--{
--return pow ();
-- ;
-- return 0;
--}
--_ACEOF
+ /* Override any GCC internal prototype to avoid an error.
+@@ -16284,149 +14366,31 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -10789,21 +10779,26 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_m_pow=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_m_pow=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_m_pow=no
--fi
++ ac_cv_lib_m_pow=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
--$as_echo "$ac_cv_lib_m_pow" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
+ $as_echo "$ac_cv_lib_m_pow" >&6; }
-if test "x$ac_cv_lib_m_pow" = x""yes; then
- POW_LIB=-lm
-else
@@ -10862,23 +10857,15 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char pow ();
- int
- main ()
- {
+-int
+-main ()
+-{
-if (sizeof ((size_t)))
- return 0;
-+return pow ();
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -10898,29 +10885,21 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_m_pow=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_size_t=yes
-+ ac_cv_lib_m_pow=no
- fi
+-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
-+$as_echo "$ac_cv_lib_m_pow" >&6; }
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+if test "x$ac_cv_lib_m_pow" = x""yes; then :
+ POW_LIB=-lm
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
+$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
+fi
@@ -10940,7 +10919,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -16440,48 +14404,23 @@
+@@ -16450,48 +14414,23 @@
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $_FLAGS"
@@ -10995,7 +10974,7 @@
$as_echo "$ac_cv_have_declaration_after_statement" >&6; }
if test "$ac_cv_have_declaration_after_statement" = "yes"; then
-@@ -16500,151 +14439,12 @@
+@@ -16510,151 +14449,12 @@
# Multimedia keys
# ***************
@@ -11151,7 +11130,7 @@
_ACEOF
fi
-@@ -16658,16 +14458,16 @@
+@@ -16668,16 +14468,16 @@
# GObject Introspection
# *********************
@@ -11171,7 +11150,7 @@
$as_echo "$enable_introspection" >&6; }
G_IR_SCANNER=
-@@ -16682,40 +14482,44 @@
+@@ -16692,40 +14492,44 @@
GOBJECT_INTROSPECTION_REQUIRED=0.6.2
pkg_failed=no
@@ -11235,7 +11214,7 @@
fi
-@@ -16728,25 +14532,14 @@
+@@ -16738,25 +14542,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11264,7 +11243,7 @@
$INTROSPECTION_PKG_ERRORS
-@@ -16756,22 +14549,11 @@
+@@ -16766,22 +14559,11 @@
Alternatively, you may set the environment variables INTROSPECTION_CFLAGS
and INTROSPECTION_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -11290,7 +11269,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -16780,12 +14562,11 @@
+@@ -16790,12 +14572,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11305,7 +11284,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -16797,9 +14578,7 @@
+@@ -16807,9 +14588,7 @@
GIRTYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
@@ -11316,7 +11295,7 @@
fi
-@@ -16822,22 +14601,20 @@
+@@ -16832,22 +14611,20 @@
# Seed
# ****
@@ -11343,7 +11322,7 @@
fi
if test "$enable_seed" = "yes"; then
-@@ -16846,40 +14623,44 @@
+@@ -16856,40 +14633,44 @@
SEED_REQUIRED=2.27.91
pkg_failed=no
@@ -11407,7 +11386,7 @@
fi
-@@ -16892,25 +14673,14 @@
+@@ -16902,25 +14683,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11436,7 +11415,7 @@
$SEED_PKG_ERRORS
-@@ -16920,22 +14690,11 @@
+@@ -16930,22 +14700,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.
@@ -11462,7 +11441,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -16944,20 +14703,17 @@
+@@ -16954,20 +14713,17 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11486,7 +11465,169 @@
fi
-@@ -16978,16 +14734,16 @@
+@@ -16986,56 +14742,60 @@
+ # NSS
+ # ***
+
+-{ $as_echo "$as_me:$LINENO: checking whether NSS support is requested" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NSS support is requested" >&5
+ $as_echo_n "checking whether NSS support is requested... " >&6; }
+ # Check whether --enable-nss was given.
+-if test "${enable_nss+set}" = set; then
++if test "${enable_nss+set}" = set; then :
+ enableval=$enable_nss;
+ else
+ enable_nss=yes
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $enable_nss" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_nss" >&5
+ $as_echo "$enable_nss" >&6; }
+
+ if test "$enable_nss" = "yes"; then
+ EPIPHANY_FEATURES="$EPIPHANY_FEATURES nss"
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for NSS" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS" >&5
+ $as_echo_n "checking for NSS... " >&6; }
+
+-if test -n "$NSS_CFLAGS"; then
+- pkg_cv_NSS_CFLAGS="$NSS_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$NSS_CFLAGS"; then
++ pkg_cv_NSS_CFLAGS="$NSS_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "nss") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$NSS_LIBS"; then
+- pkg_cv_NSS_LIBS="$NSS_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$NSS_LIBS"; then
++ pkg_cv_NSS_LIBS="$NSS_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "nss") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "nss" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -17048,25 +14808,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "nss" 2>&1`
++ NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nss"`
+ else
+- NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors "nss" 2>&1`
++ NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nss"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$NSS_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (nss) were not met:
+-
+-$NSS_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables NSS_CFLAGS
+-and NSS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (nss) were not met:
++ as_fn_error "Package requirements (nss) were not met:
+
+ $NSS_PKG_ERRORS
+
+@@ -17076,22 +14825,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.
+-" >&2;}
+- { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables NSS_CFLAGS
+-and NSS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -17100,20 +14838,17 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ NSS_CFLAGS=$pkg_cv_NSS_CFLAGS
+ NSS_LIBS=$pkg_cv_NSS_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ :
+ fi
+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_NSS 1
+-_ACEOF
++$as_echo "#define ENABLE_NSS 1" >>confdefs.h
+
+ fi
+
+@@ -17133,16 +14868,16 @@
# Zeroconf bookmarks sites
@@ -11506,7 +11647,7 @@
$as_echo "$enable_zeroconf" >&6; }
if test "$enable_zeroconf" != "no"; then
-@@ -16995,52 +14751,56 @@
+@@ -17150,52 +14885,56 @@
pkg_failed=no
@@ -11584,7 +11725,7 @@
fi
-@@ -17053,18 +14813,18 @@
+@@ -17208,18 +14947,18 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11608,7 +11749,7 @@
$as_echo "no" >&6; }
have_avahi=no
elif test $pkg_failed = untried; then
-@@ -17072,15 +14832,13 @@
+@@ -17227,15 +14966,13 @@
else
AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS
AVAHI_LIBS=$pkg_cv_AVAHI_LIBS
@@ -11626,7 +11767,7 @@
elif test "$have_avahi" = "yes"; then
enable_zeroconf=yes
else
-@@ -17090,9 +14848,7 @@
+@@ -17245,9 +14982,7 @@
if test "$enable_zeroconf" = "yes"; then
@@ -11637,7 +11778,7 @@
fi
-@@ -17107,55 +14863,59 @@
+@@ -17262,55 +14997,59 @@
# NetworkManager
@@ -11719,7 +11860,7 @@
fi
-@@ -17168,14 +14928,14 @@
+@@ -17323,14 +15062,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11737,7 +11878,7 @@
$as_echo "no" >&6; }
have_network_manager=no
elif test $pkg_failed = untried; then
-@@ -17183,26 +14943,22 @@
+@@ -17338,26 +15077,22 @@
else
NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS
NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS
@@ -11768,7 +11909,7 @@
fi
-@@ -17242,201 +14998,58 @@
+@@ -17397,201 +15132,58 @@
ISO_CODES_REQUIRED=0.35
@@ -12009,7 +12150,7 @@
_ACEOF
fi
-@@ -17444,16 +15057,12 @@
+@@ -17599,16 +15191,12 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -12029,7 +12170,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -17464,46 +15073,19 @@
+@@ -17619,46 +15207,19 @@
return 0;
}
_ACEOF
@@ -12082,7 +12223,7 @@
fi
fi
-@@ -17516,155 +15098,20 @@
+@@ -17671,155 +15232,20 @@
XGETTEXT=:
INTLLIBS=
@@ -12243,7 +12384,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -17677,54 +15124,25 @@
+@@ -17832,54 +15258,25 @@
return 0;
}
_ACEOF
@@ -12306,7 +12447,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -17737,141 +15155,26 @@
+@@ -17892,141 +15289,26 @@
return 0;
}
_ACEOF
@@ -12458,7 +12599,7 @@
_ACEOF
fi
-@@ -17886,18 +15189,14 @@
+@@ -18041,18 +15323,14 @@
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -12480,7 +12621,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17909,61 +15208,32 @@
+@@ -18064,61 +15342,32 @@
char bindtextdomain ();
int
main ()
@@ -12557,7 +12698,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17981,55 +15251,26 @@
+@@ -18136,55 +15385,26 @@
return 0;
}
_ACEOF
@@ -12622,7 +12763,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18047,43 +15288,18 @@
+@@ -18202,43 +15422,18 @@
return 0;
}
_ACEOF
@@ -12672,7 +12813,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -18093,22 +15309,18 @@
+@@ -18248,22 +15443,18 @@
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -12700,7 +12841,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18126,55 +15338,26 @@
+@@ -18281,55 +15472,26 @@
return 0;
}
_ACEOF
@@ -12765,7 +12906,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18192,43 +15375,18 @@
+@@ -18347,43 +15509,18 @@
return 0;
}
_ACEOF
@@ -12815,7 +12956,7 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -18250,102 +15408,12 @@
+@@ -18405,102 +15542,12 @@
glib_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
@@ -12923,7 +13064,7 @@
_ACEOF
fi
-@@ -18375,15 +15443,13 @@
+@@ -18530,15 +15577,13 @@
if test "$gt_cv_have_gettext" = "yes"; then
@@ -12942,7 +13083,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -18408,118 +15474,28 @@
+@@ -18563,118 +15608,28 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -13069,7 +13210,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -18534,14 +15510,14 @@
+@@ -18689,14 +15644,14 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -13089,7 +13230,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -18549,9 +15525,9 @@
+@@ -18704,9 +15659,9 @@
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -13101,7 +13242,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -18564,14 +15540,14 @@
+@@ -18719,14 +15674,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13119,7 +13260,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -18580,19 +15556,19 @@
+@@ -18735,19 +15690,19 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -13143,7 +13284,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -18617,144 +15593,33 @@
+@@ -18772,144 +15727,33 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -13304,7 +13445,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -18769,10 +15634,8 @@
+@@ -18924,10 +15768,8 @@
;;
esac
fi
@@ -13317,7 +13458,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -18786,9 +15649,7 @@
+@@ -18941,9 +15783,7 @@
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -13328,7 +13469,7 @@
fi
-@@ -18796,7 +15657,7 @@
+@@ -18951,7 +15791,7 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -13337,7 +13478,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -18829,7 +15690,7 @@
+@@ -18984,7 +15824,7 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -13346,7 +13487,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -18854,7 +15715,7 @@
+@@ -19009,7 +15849,7 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -13355,7 +13496,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -18902,7 +15763,7 @@
+@@ -19057,7 +15897,7 @@
# Check whether --with-distributor-name was given.
@@ -13364,7 +13505,7 @@
withval=$with_distributor_name; LSB_DISTRIBUTOR="$withval"
fi
-@@ -18912,9 +15773,9 @@
+@@ -19067,9 +15907,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
@@ -13376,7 +13517,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LSB_RELEASE"; then
-@@ -18925,24 +15786,24 @@
+@@ -19080,24 +15920,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13406,7 +13547,7 @@
$as_echo "no" >&6; }
fi
-@@ -18973,11 +15834,11 @@
+@@ -19128,11 +15968,11 @@
gdu_cv_version_required=0.3.2
if test -n "$PKG_CONFIG" && \
@@ -13421,7 +13562,7 @@
gdu_cv_have_gdu=yes
else
gdu_cv_have_gdu=no
-@@ -18986,15 +15847,13 @@
+@@ -19141,15 +15981,13 @@
if test "$gdu_cv_have_gdu" = "yes"; then
:
else
@@ -13439,7 +13580,7 @@
withval=$with_help_dir;
else
with_help_dir='${datadir}/gnome/help'
-@@ -19005,7 +15864,7 @@
+@@ -19160,7 +15998,7 @@
# Check whether --with-omf-dir was given.
@@ -13448,7 +13589,7 @@
withval=$with_omf_dir;
else
with_omf_dir='${datadir}/omf'
-@@ -19016,7 +15875,7 @@
+@@ -19171,7 +16009,7 @@
# Check whether --with-help-formats was given.
@@ -13457,7 +13598,7 @@
withval=$with_help_formats;
else
with_help_formats=''
-@@ -19026,7 +15885,7 @@
+@@ -19181,7 +16019,7 @@
# Check whether --enable-scrollkeeper was given.
@@ -13466,7 +13607,7 @@
enableval=$enable_scrollkeeper;
else
enable_scrollkeeper=yes
-@@ -19058,9 +15917,9 @@
+@@ -19213,9 +16051,9 @@
# Extract the first word of "gtkdoc-check", so it can be a program name with args.
set dummy gtkdoc-check; ac_word=$2
@@ -13478,7 +13619,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_CHECK in
-@@ -19073,14 +15932,14 @@
+@@ -19228,14 +16066,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13496,7 +13637,7 @@
IFS=$as_save_IFS
;;
-@@ -19088,10 +15947,10 @@
+@@ -19243,10 +16081,10 @@
fi
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
if test -n "$GTKDOC_CHECK"; then
@@ -13509,7 +13650,7 @@
$as_echo "no" >&6; }
fi
-@@ -19100,9 +15959,9 @@
+@@ -19255,9 +16093,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
@@ -13521,7 +13662,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_REBASE in
-@@ -19115,14 +15974,14 @@
+@@ -19270,14 +16108,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13539,7 +13680,7 @@
IFS=$as_save_IFS
;;
-@@ -19130,10 +15989,10 @@
+@@ -19285,10 +16123,10 @@
fi
GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
if test -n "$GTKDOC_REBASE"; then
@@ -13552,7 +13693,7 @@
$as_echo "no" >&6; }
fi
-@@ -19144,9 +16003,9 @@
+@@ -19299,9 +16137,9 @@
# Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
set dummy gtkdoc-mkpdf; ac_word=$2
@@ -13564,7 +13705,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_MKPDF in
-@@ -19159,14 +16018,14 @@
+@@ -19314,14 +16152,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13582,7 +13723,7 @@
IFS=$as_save_IFS
;;
-@@ -19174,10 +16033,10 @@
+@@ -19329,10 +16167,10 @@
fi
GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
if test -n "$GTKDOC_MKPDF"; then
@@ -13595,7 +13736,7 @@
$as_echo "no" >&6; }
fi
-@@ -19185,7 +16044,7 @@
+@@ -19340,7 +16178,7 @@
# Check whether --with-html-dir was given.
@@ -13604,7 +13745,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -19195,7 +16054,7 @@
+@@ -19350,7 +16188,7 @@
# Check whether --enable-gtk-doc was given.
@@ -13613,7 +13754,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -19204,33 +16063,31 @@
+@@ -19359,33 +16197,31 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -13655,7 +13796,7 @@
enableval=$enable_gtk_doc_pdf;
else
enable_gtk_doc_pdf=no
-@@ -19301,9 +16158,9 @@
+@@ -19456,9 +16292,9 @@
# Extract the first word of "gtk-builder-convert", so it can be a program name with args.
set dummy gtk-builder-convert; ac_word=$2
@@ -13667,7 +13808,7 @@
$as_echo_n "(cached) " >&6
else
case $GTK_BUILDER_CONVERT in
-@@ -19316,14 +16173,14 @@
+@@ -19471,14 +16307,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13685,7 +13826,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GTK_BUILDER_CONVERT" && ac_cv_path_GTK_BUILDER_CONVERT="false"
-@@ -19332,18 +16189,16 @@
+@@ -19487,18 +16323,16 @@
fi
GTK_BUILDER_CONVERT=$ac_cv_path_GTK_BUILDER_CONVERT
if test -n "$GTK_BUILDER_CONVERT"; then
@@ -13707,7 +13848,7 @@
fi
# ************
-@@ -19351,9 +16206,7 @@
+@@ -19506,9 +16340,7 @@
# ************
@@ -13718,7 +13859,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"
-@@ -19386,13 +16239,13 @@
+@@ -19541,13 +16373,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -13734,7 +13875,7 @@
esac ;;
esac
done
-@@ -19400,8 +16253,8 @@
+@@ -19555,8 +16387,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -13745,7 +13886,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -19424,11 +16277,11 @@
+@@ -19579,11 +16411,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" &&
@@ -13759,7 +13900,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -19448,8 +16301,8 @@
+@@ -19603,8 +16435,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.
@@ -13770,7 +13911,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -19465,150 +16318,94 @@
+@@ -19620,157 +16452,98 @@
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -13856,6 +13997,15 @@
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"ENABLE_SEED\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_NSS_TRUE}" && test -z "${ENABLE_NSS_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_NSS\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"ENABLE_NSS\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "conditional \"ENABLE_NSS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_ZEROCONF_TRUE}" && test -z "${ENABLE_ZEROCONF_FALSE}"; then
@@ -13962,7 +14112,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -19618,17 +16415,18 @@
+@@ -19780,17 +16553,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -13988,7 +14138,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -19636,23 +16434,15 @@
+@@ -19798,23 +16572,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -14017,7 +14167,7 @@
as_nl='
'
export as_nl
-@@ -19660,7 +16450,13 @@
+@@ -19822,7 +16588,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
@@ -14032,7 +14182,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -19671,7 +16467,7 @@
+@@ -19833,7 +16605,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -14041,7 +14191,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -19694,13 +16490,6 @@
+@@ -19856,13 +16628,6 @@
}
fi
@@ -14055,7 +14205,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -19710,15 +16499,15 @@
+@@ -19872,15 +16637,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -14074,7 +14224,7 @@
IFS=$as_save_IFS
;;
-@@ -19730,12 +16519,16 @@
+@@ -19892,12 +16657,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -14095,7 +14245,7 @@
done
PS1='$ '
PS2='> '
-@@ -19747,7 +16540,89 @@
+@@ -19909,7 +16678,89 @@
LANGUAGE=C
export LANGUAGE
@@ -14186,7 +14336,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -19761,8 +16636,12 @@
+@@ -19923,8 +16774,12 @@
as_basename=false
fi
@@ -14200,7 +14350,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -19782,76 +16661,25 @@
+@@ -19944,76 +16799,25 @@
}
s/.*/./; q'`
@@ -14288,7 +14438,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -19880,8 +16708,56 @@
+@@ -20042,8 +16846,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -14346,7 +14496,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -19900,10 +16776,10 @@
+@@ -20062,10 +16914,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -14359,7 +14509,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -19918,13 +16794,19 @@
+@@ -20080,13 +16932,19 @@
exec 6>&1
@@ -14375,13 +14525,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.27.91, which was
+ This file was extended by GNOME Web Browser $as_me 2.27.92, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -19956,10 +16838,11 @@
+@@ -20118,10 +16976,11 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -14396,7 +14546,7 @@
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
-@@ -19981,16 +16864,16 @@
+@@ -20143,16 +17002,16 @@
Configuration commands:
$config_commands
@@ -14406,7 +14556,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
- GNOME Web Browser config.status 2.27.91
+ GNOME Web Browser config.status 2.27.92
-configured by $0, generated by GNU Autoconf 2.63,
+configured by $0, generated by GNU Autoconf 2.64,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -14416,7 +14566,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -20033,20 +16916,19 @@
+@@ -20195,20 +17054,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -14441,7 +14591,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -20054,11 +16936,10 @@
+@@ -20216,11 +17074,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -14456,7 +14606,7 @@
ac_need_defaults=false ;;
esac
-@@ -20393,9 +17274,7 @@
+@@ -20555,9 +17412,7 @@
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -14467,7 +14617,7 @@
esac
done
-@@ -20422,7 +17301,7 @@
+@@ -20584,7 +17439,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -14476,7 +14626,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -20433,11 +17312,7 @@
+@@ -20595,11 +17450,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -14489,7 +14639,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -20445,10 +17320,16 @@
+@@ -20607,10 +17458,16 @@
if test -n "$CONFIG_FILES"; then
@@ -14508,7 +14658,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -20462,24 +17343,18 @@
+@@ -20624,24 +17481,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -14536,7 +14686,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -20568,9 +17443,7 @@
+@@ -20730,9 +17581,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -14547,7 +14697,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -20611,9 +17484,7 @@
+@@ -20773,9 +17622,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -14558,7 +14708,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -20698,9 +17569,7 @@
+@@ -20860,9 +17707,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -14569,7 +14719,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -20713,9 +17582,7 @@
+@@ -20875,9 +17720,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -14580,7 +14730,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -20743,12 +17610,10 @@
+@@ -20905,12 +17748,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -14595,7 +14745,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -20759,7 +17624,7 @@
+@@ -20921,7 +17762,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -14604,7 +14754,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -20772,9 +17637,7 @@
+@@ -20934,9 +17775,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -14615,7 +14765,7 @@
esac
;;
esac
-@@ -20802,47 +17665,7 @@
+@@ -20964,47 +17803,7 @@
q
}
s/.*/./; q'`
@@ -14664,7 +14814,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -20899,7 +17722,6 @@
+@@ -21061,7 +17860,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=
@@ -14672,7 +14822,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -20909,12 +17731,11 @@
+@@ -21071,12 +17869,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -14687,7 +14837,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
-@@ -20924,7 +17745,7 @@
+@@ -21086,7 +17883,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -14696,7 +14846,7 @@
esac
_ACEOF
-@@ -20953,14 +17774,12 @@
+@@ -21115,14 +17912,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -14713,7 +14863,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;}
-@@ -20970,9 +17789,7 @@
+@@ -21132,9 +17927,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -14724,7 +14874,7 @@
;;
:H)
#
-@@ -20983,25 +17800,19 @@
+@@ -21145,25 +17938,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -14754,7 +14904,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -21039,7 +17850,7 @@
+@@ -21201,7 +17988,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -14763,7 +14913,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -21134,47 +17945,7 @@
+@@ -21296,47 +18083,7 @@
q
}
s/.*/./; q'`
@@ -14812,7 +14962,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -21821,9 +18592,7 @@
+@@ -21983,9 +18730,7 @@
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then
@@ -14823,7 +14973,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -21846,15 +18615,12 @@
+@@ -22008,15 +18753,12 @@
done # for ac_tag
@@ -14841,7 +14991,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -21875,10 +18641,10 @@
+@@ -22037,10 +18779,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.
@@ -14854,11 +15004,11 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-Index: epiphany-webkit-2.27.91/lib/Makefile.in
+Index: epiphany-webkit-2.27.92/lib/Makefile.in
===================================================================
---- epiphany-webkit-2.27.91.orig/lib/Makefile.in 2009-08-24 14:11:59.000000000 -0300
-+++ epiphany-webkit-2.27.91/lib/Makefile.in 2009-08-25 11:47:15.346851681 -0300
-@@ -334,6 +334,7 @@
+--- epiphany-webkit-2.27.92.orig/lib/Makefile.in 2009-09-07 16:58:26.000000000 -0300
++++ epiphany-webkit-2.27.92/lib/Makefile.in 2009-09-09 19:03:08.569908810 -0300
+@@ -336,6 +336,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -14866,7 +15016,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -465,7 +466,7 @@
+@@ -467,7 +468,7 @@
-I$(top_srcdir)/lib/egg \
-DDATADIR="\"$(datadir)\"" \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -14875,10 +15025,10 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-Index: epiphany-webkit-2.27.91/ltmain.sh
+Index: epiphany-webkit-2.27.92/ltmain.sh
===================================================================
---- epiphany-webkit-2.27.91.orig/ltmain.sh 2009-08-21 05:02:57.000000000 -0300
-+++ epiphany-webkit-2.27.91/ltmain.sh 2009-08-25 11:47:02.670350851 -0300
+--- epiphany-webkit-2.27.92.orig/ltmain.sh 2009-09-06 19:34:59.000000000 -0300
++++ epiphany-webkit-2.27.92/ltmain.sh 2009-09-09 19:02:59.206409979 -0300
@@ -4202,6 +4202,11 @@
prev=
continue
@@ -14891,11 +15041,11 @@
esac
;;
expsyms)
-Index: epiphany-webkit-2.27.91/src/Makefile.in
+Index: epiphany-webkit-2.27.92/src/Makefile.in
===================================================================
---- epiphany-webkit-2.27.91.orig/src/Makefile.in 2009-08-24 14:12:00.000000000 -0300
-+++ epiphany-webkit-2.27.91/src/Makefile.in 2009-08-25 11:47:15.970851533 -0300
-@@ -402,6 +402,7 @@
+--- epiphany-webkit-2.27.92.orig/src/Makefile.in 2009-09-07 16:58:27.000000000 -0300
++++ epiphany-webkit-2.27.92/src/Makefile.in 2009-09-09 19:03:09.201908592 -0300
+@@ -418,6 +418,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -14903,7 +15053,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -534,8 +535,8 @@
+@@ -551,8 +552,8 @@
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
More information about the pkg-gnome-commits
mailing list