r22788 - in /desktop/unstable/epiphany-browser/debian: changelog patches/91_gtk-doc-1.13.patch patches/99_autoreconf.patch patches/series
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Thu Jan 14 17:19:38 UTC 2010
Author: slomo
Date: Thu Jan 14 17:19:37 2010
New Revision: 22788
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22788
Log:
* debian/patches/91_gtk-doc-1.13.patch,
debian/patches/99_autoreconf.patch:
+ Fix build with gtk-doc 1.13 (Closes: #565276).
Added:
desktop/unstable/epiphany-browser/debian/patches/91_gtk-doc-1.13.patch
Modified:
desktop/unstable/epiphany-browser/debian/changelog
desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch
desktop/unstable/epiphany-browser/debian/patches/series
Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=22788&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Thu Jan 14 17:19:37 2010
@@ -1,3 +1,11 @@
+epiphany-browser (2.29.5-3) unstable; urgency=low
+
+ * debian/patches/91_gtk-doc-1.13.patch,
+ debian/patches/99_autoreconf.patch:
+ + Fix build with gtk-doc 1.13 (Closes: #565276).
+
+ -- Sebastian Dröge <slomo at debian.org> Thu, 14 Jan 2010 18:18:45 +0100
+
epiphany-browser (2.29.5-2) unstable; urgency=low
* debian/control.in:
Added: desktop/unstable/epiphany-browser/debian/patches/91_gtk-doc-1.13.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/91_gtk-doc-1.13.patch?rev=22788&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/91_gtk-doc-1.13.patch (added)
+++ desktop/unstable/epiphany-browser/debian/patches/91_gtk-doc-1.13.patch [utf-8] Thu Jan 14 17:19:37 2010
@@ -1,0 +1,11 @@
+--- a/doc/reference/Makefile.am 2010-01-14 18:12:54.795738709 +0100
++++ b/doc/reference/Makefile.am 2010-01-14 18:13:09.125487827 +0100
+@@ -244,7 +244,7 @@
+ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ @echo '-- Fixing Crossreferences'
+- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
++ cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ touch html-build.stamp
+ endif
+
Modified: desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch?rev=22788&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch [utf-8] Thu Jan 14 17:19:37 2010
@@ -1,6 +1,6 @@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/aclocal.m4 epiphany-browser-2.29.5/aclocal.m4
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/aclocal.m4 epiphany-browser-2.29.5/aclocal.m4
--- epiphany-browser-2.29.5.old/aclocal.m4 2010-01-11 21:37:17.000000000 +0100
-+++ epiphany-browser-2.29.5/aclocal.m4 2010-01-13 10:10:34.366522295 +0100
++++ epiphany-browser-2.29.5/aclocal.m4 2010-01-14 18:15:46.759691929 +0100
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11 -*- Autoconf -*-
@@ -73,9 +73,9 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/config.h.in epiphany-browser-2.29.5/config.h.in
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/config.h.in epiphany-browser-2.29.5/config.h.in
--- epiphany-browser-2.29.5.old/config.h.in 2010-01-11 21:37:38.000000000 +0100
-+++ epiphany-browser-2.29.5/config.h.in 2010-01-13 10:10:36.094520767 +0100
++++ epiphany-browser-2.29.5/config.h.in 2010-01-14 18:15:47.979691548 +0100
@@ -169,6 +169,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -86,9 +86,9 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/configure epiphany-browser-2.29.5/configure
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/configure epiphany-browser-2.29.5/configure
--- epiphany-browser-2.29.5.old/configure 2010-01-11 21:37:23.000000000 +0100
-+++ epiphany-browser-2.29.5/configure 2010-01-13 10:10:35.594519160 +0100
++++ epiphany-browser-2.29.5/configure 2010-01-14 18:15:47.724689295 +0100
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -563,7 +563,7 @@
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
-
++
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
@@ -639,6 +639,7 @@
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
-(eval "as_func_return () {
- (exit \$1)
-}
@@ -654,10 +655,6 @@
-as_func_ret_failure () {
- return 1
-}
-
--exitcode=0
--if as_func_success; then
-- :
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
@@ -670,20 +667,16 @@
+ {
+ eval $1+=\$2
+ }'
- else
-- exitcode=1
-- echo as_func_success failed.
--fi
++else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
--if as_func_failure; then
-- exitcode=1
-- echo as_func_failure succeeded.
--fi
+-exitcode=0
+-if as_func_success; then
+- :
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
@@ -694,16 +687,23 @@
+ {
+ as_val=$(( $* ))
+ }'
-+else
+ else
+- exitcode=1
+- echo as_func_success failed.
+-fi
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+-if as_func_failure; then
+- exitcode=1
+- echo as_func_failure succeeded.
+-fi
+
-if as_func_ret_success; then
- :
-+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
@@ -907,7 +907,29 @@
ac_unique_file="configure.ac"
# Factoring default headers for most tests.
-@@ -1009,6 +967,7 @@
+@@ -791,12 +749,20 @@
+ ac_subst_vars='am__EXEEXT_FALSE
+ am__EXEEXT_TRUE
+ LTLIBOBJS
++GTK_DOC_USE_REBASE_FALSE
++GTK_DOC_USE_REBASE_TRUE
+ GTK_DOC_USE_LIBTOOL_FALSE
+ GTK_DOC_USE_LIBTOOL_TRUE
++GTK_DOC_BUILD_PDF_FALSE
++GTK_DOC_BUILD_PDF_TRUE
++GTK_DOC_BUILD_HTML_FALSE
++GTK_DOC_BUILD_HTML_TRUE
+ ENABLE_GTK_DOC_FALSE
+ ENABLE_GTK_DOC_TRUE
+-GTKDOC_CHECK
+ HTML_DIR
++GTKDOC_MKPDF
++GTKDOC_REBASE
++GTKDOC_CHECK
+ HAVE_GNOME_DOC_UTILS_FALSE
+ HAVE_GNOME_DOC_UTILS_TRUE
+ DISTCHECK_CONFIGURE_FLAGS
+@@ -1009,6 +975,7 @@
program_transform_name
prefix
exec_prefix
@@ -915,7 +937,16 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1179,8 +1138,7 @@
+@@ -1048,6 +1015,8 @@
+ enable_scrollkeeper
+ with_html_dir
+ enable_gtk_doc
++enable_gtk_doc_html
++enable_gtk_doc_pdf
+ '
+ ac_precious_vars='build_alias
+ host_alias
+@@ -1179,8 +1148,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 &&
@@ -925,7 +956,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1206,8 +1164,7 @@
+@@ -1206,8 +1174,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 &&
@@ -935,7 +966,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1411,8 +1368,7 @@
+@@ -1411,8 +1378,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 &&
@@ -945,7 +976,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1428,8 +1384,7 @@
+@@ -1428,8 +1394,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 &&
@@ -955,7 +986,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1459,17 +1414,17 @@
+@@ -1459,17 +1424,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -979,7 +1010,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1486,15 +1441,13 @@
+@@ -1486,15 +1451,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -997,7 +1028,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1517,8 +1470,7 @@
+@@ -1517,8 +1480,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -1007,7 +1038,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1548,11 +1500,9 @@
+@@ -1548,11 +1510,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -1021,7 +1052,7 @@
# Find the source files, if location was not specified.
-@@ -1591,13 +1541,11 @@
+@@ -1591,13 +1551,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -1037,7 +1068,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1671,7 +1619,8 @@
+@@ -1671,7 +1629,8 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
@@ -1047,16 +1078,18 @@
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
-@@ -1730,7 +1679,7 @@
+@@ -1730,7 +1689,9 @@
Whether to enable automatic network status with
NetworkManager (default: disabled)
--disable-scrollkeeper do not make updates to the scrollkeeper database
- --enable-gtk-doc use gtk-doc to build documentation [default=no]
+ --enable-gtk-doc use gtk-doc to build documentation [[default=no]]
++ --enable-gtk-doc-html build documentation in html format [[default=yes]]
++ --enable-gtk-doc-pdf build documentation in pdf format [[default=no]]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-@@ -1756,7 +1705,7 @@
+@@ -1756,7 +1717,7 @@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
@@ -1065,19 +1098,21 @@
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
-@@ -1845,21 +1794,432 @@
+@@ -1845,21 +1806,432 @@
if $ac_init_version; then
cat <<\_ACEOF
GNOME Web Browser configure 2.29.5
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.65
-+
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
-+This configure script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it.
-+_ACEOF
-+ exit
-+fi
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+ exit
+ fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
@@ -1436,11 +1471,7 @@
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
--This configure script is free software; the Free Software Foundation
--gives unlimited permission to copy, distribute and modify it.
++
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
@@ -1465,8 +1496,7 @@
+ ;
+ return 0;
+}
- _ACEOF
-- exit
++_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
@@ -1488,7 +1518,7 @@
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
++fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
@@ -1505,7 +1535,7 @@
$ $0 $@
-@@ -1895,8 +2255,8 @@
+@@ -1895,8 +2267,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1516,7 +1546,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1933,9 +2293,9 @@
+@@ -1933,9 +2305,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1528,7 +1558,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1951,13 +2311,13 @@
+@@ -1951,13 +2323,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -1545,7 +1575,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -1982,13 +2342,13 @@
+@@ -1982,13 +2354,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -1561,7 +1591,7 @@
esac ;;
esac
done
-@@ -2060,39 +2420,41 @@
+@@ -2060,39 +2432,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -1608,7 +1638,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2110,8 +2472,8 @@
+@@ -2110,8 +2484,8 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -1619,7 +1649,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2119,10 +2481,10 @@
+@@ -2119,10 +2493,10 @@
done
if test -r "$cache_file"; then
@@ -1634,7 +1664,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2130,14 +2492,14 @@
+@@ -2130,14 +2504,14 @@
esac
fi
else
@@ -1653,7 +1683,7 @@
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
-@@ -2148,11 +2510,11 @@
+@@ -2148,11 +2522,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -1667,7 +1697,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2162,17 +2524,17 @@
+@@ -2162,17 +2536,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
@@ -1689,7 +1719,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2184,43 +2546,20 @@
+@@ -2184,43 +2558,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -1740,7 +1770,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2274,24 +2613,16 @@
+@@ -2274,24 +2625,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -1773,7 +1803,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2317,10 +2648,10 @@
+@@ -2317,10 +2660,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.
@@ -1786,7 +1816,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2328,11 +2659,11 @@
+@@ -2328,11 +2671,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1802,7 +1832,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2369,7 +2700,7 @@
+@@ -2369,7 +2712,7 @@
;;
esac
@@ -1811,7 +1841,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2385,7 +2716,7 @@
+@@ -2385,7 +2728,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -1820,7 +1850,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2396,7 +2727,7 @@
+@@ -2396,7 +2739,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -1829,7 +1859,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2407,15 +2738,11 @@
+@@ -2407,15 +2750,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -1847,7 +1877,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2437,11 +2764,8 @@
+@@ -2437,11 +2776,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".
@@ -1861,7 +1891,7 @@
fi
test "$2" = conftest.file
-@@ -2450,13 +2774,10 @@
+@@ -2450,13 +2786,10 @@
# Ok.
:
else
@@ -1878,7 +1908,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2484,7 +2805,7 @@
+@@ -2484,7 +2817,7 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -1887,7 +1917,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2505,9 +2826,9 @@
+@@ -2505,9 +2838,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
@@ -1899,7 +1929,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2518,24 +2839,24 @@
+@@ -2518,24 +2851,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1929,7 +1959,7 @@
$as_echo "no" >&6; }
fi
-@@ -2545,9 +2866,9 @@
+@@ -2545,9 +2878,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
@@ -1941,7 +1971,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2558,24 +2879,24 @@
+@@ -2558,24 +2891,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1971,7 +2001,7 @@
$as_echo "no" >&6; }
fi
-@@ -2584,7 +2905,7 @@
+@@ -2584,7 +2917,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -1980,7 +2010,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2597,10 +2918,10 @@
+@@ -2597,10 +2930,10 @@
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -1993,7 +2023,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2608,7 +2929,7 @@
+@@ -2608,7 +2941,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2002,7 +2032,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2620,11 +2941,12 @@
+@@ -2620,11 +2953,12 @@
esac
done
done
@@ -2016,7 +2046,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2632,11 +2954,10 @@
+@@ -2632,11 +2966,10 @@
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
@@ -2029,7 +2059,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2649,9 +2970,9 @@
+@@ -2649,9 +2982,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
@@ -2041,7 +2071,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2662,24 +2983,24 @@
+@@ -2662,24 +2995,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2071,7 +2101,7 @@
$as_echo "no" >&6; }
fi
-@@ -2687,11 +3008,11 @@
+@@ -2687,11 +3020,11 @@
test -n "$AWK" && break
done
@@ -2085,7 +2115,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2709,11 +3030,11 @@
+@@ -2709,11 +3042,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -2099,7 +2129,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2733,9 +3054,7 @@
+@@ -2733,9 +3066,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -2110,7 +2140,7 @@
fi
fi
-@@ -2750,7 +3069,7 @@
+@@ -2750,7 +3081,7 @@
# Define the identity of the package.
@@ -2119,7 +2149,7 @@
VERSION='2.29.5'
-@@ -2786,7 +3105,7 @@
+@@ -2786,7 +3117,7 @@
AMTAR=${AMTAR-"${am_missing_run}tar"}
@@ -2128,7 +2158,7 @@
$as_echo_n "checking how to create a ustar tar archive... " >&6; }
# Loop over all known methods to create a tar archive until one works.
_am_tools='gnutar plaintar pax cpio none'
-@@ -2859,13 +3178,13 @@
+@@ -2859,13 +3190,13 @@
done
rm -rf conftest.dir
@@ -2144,7 +2174,7 @@
$as_echo "$am_cv_prog_tar_ustar" >&6; }
-@@ -2875,7 +3194,7 @@
+@@ -2875,7 +3206,7 @@
# Use AM_SILENT_RULES if present
# Check whether --enable-silent-rules was given.
@@ -2153,7 +2183,7 @@
enableval=$enable_silent_rules;
fi
-@@ -2891,16 +3210,16 @@
+@@ -2891,16 +3222,16 @@
enable_maintainer_mode=yes
fi
@@ -2173,7 +2203,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2915,7 +3234,7 @@
+@@ -2915,7 +3246,7 @@
# Check whether --enable-shared was given.
@@ -2182,7 +2212,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -2946,7 +3265,7 @@
+@@ -2946,7 +3277,7 @@
# Check whether --enable-static was given.
@@ -2191,7 +2221,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -2984,7 +3303,7 @@
+@@ -2984,7 +3315,7 @@
case `pwd` in
*\ * | *\ *)
@@ -2200,7 +2230,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -3009,35 +3328,27 @@
+@@ -3009,35 +3340,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -2243,7 +2273,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -3053,28 +3364,24 @@
+@@ -3053,28 +3376,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -2277,7 +2307,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -3102,7 +3409,7 @@
+@@ -3102,7 +3421,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -2286,7 +2316,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -3130,12 +3437,12 @@
+@@ -3130,12 +3449,12 @@
fi
@@ -2301,7 +2331,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -3160,9 +3467,9 @@
+@@ -3160,9 +3479,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
@@ -2313,7 +2343,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3173,24 +3480,24 @@
+@@ -3173,24 +3492,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2343,7 +2373,7 @@
$as_echo "no" >&6; }
fi
-@@ -3200,9 +3507,9 @@
+@@ -3200,9 +3519,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
@@ -2355,7 +2385,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3213,24 +3520,24 @@
+@@ -3213,24 +3532,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2385,7 +2415,7 @@
$as_echo "no" >&6; }
fi
-@@ -3239,7 +3546,7 @@
+@@ -3239,7 +3558,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2394,7 +2424,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3253,9 +3560,9 @@
+@@ -3253,9 +3572,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
@@ -2406,7 +2436,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3266,24 +3573,24 @@
+@@ -3266,24 +3585,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2436,7 +2466,7 @@
$as_echo "no" >&6; }
fi
-@@ -3293,9 +3600,9 @@
+@@ -3293,9 +3612,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
@@ -2448,7 +2478,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3307,18 +3614,18 @@
+@@ -3307,18 +3626,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2470,7 +2500,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3337,10 +3644,10 @@
+@@ -3337,10 +3656,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2483,7 +2513,7 @@
$as_echo "no" >&6; }
fi
-@@ -3352,9 +3659,9 @@
+@@ -3352,9 +3671,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
@@ -2495,7 +2525,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3365,24 +3672,24 @@
+@@ -3365,24 +3684,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2525,7 +2555,7 @@
$as_echo "no" >&6; }
fi
-@@ -3396,9 +3703,9 @@
+@@ -3396,9 +3715,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
@@ -2537,7 +2567,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3409,24 +3716,24 @@
+@@ -3409,24 +3728,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2567,7 +2597,7 @@
$as_echo "no" >&6; }
fi
-@@ -3439,7 +3746,7 @@
+@@ -3439,7 +3758,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2576,7 +2606,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3450,57 +3757,37 @@
+@@ -3450,57 +3769,37 @@
fi
@@ -2654,7 +2684,7 @@
/* end confdefs.h. */
int
-@@ -3516,8 +3803,8 @@
+@@ -3516,8 +3815,8 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -2665,7 +2695,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3533,17 +3820,17 @@
+@@ -3533,17 +3832,17 @@
done
rm -f $ac_rmfiles
@@ -2688,7 +2718,7 @@
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3560,7 +3847,7 @@
+@@ -3560,7 +3859,7 @@
# certainly right.
break;;
*.* )
@@ -2697,7 +2727,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3579,84 +3866,42 @@
+@@ -3579,84 +3878,42 @@
else
ac_file=''
fi
@@ -2803,7 +2833,7 @@
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3671,32 +3916,83 @@
+@@ -3671,32 +3928,83 @@
esac
done
else
@@ -2903,7 +2933,7 @@
/* end confdefs.h. */
int
-@@ -3708,17 +4004,17 @@
+@@ -3708,17 +4016,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -2926,7 +2956,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3731,31 +4027,23 @@
+@@ -3731,31 +4039,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2965,7 +2995,7 @@
/* end confdefs.h. */
int
-@@ -3769,37 +4057,16 @@
+@@ -3769,37 +4069,16 @@
return 0;
}
_ACEOF
@@ -3006,7 +3036,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3808,20 +4075,16 @@
+@@ -3808,20 +4087,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -3030,7 +3060,7 @@
/* end confdefs.h. */
int
-@@ -3832,35 +4095,11 @@
+@@ -3832,35 +4107,11 @@
return 0;
}
_ACEOF
@@ -3069,7 +3099,7 @@
/* end confdefs.h. */
int
-@@ -3871,82 +4110,33 @@
+@@ -3871,36 +4122,12 @@
return 0;
}
_ACEOF
@@ -3095,25 +3125,25 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++if ac_fn_c_try_compile "$LINENO"; then :
+
- ac_c_werror_flag=$ac_save_c_werror_flag
-- CFLAGS="-g"
++else
++ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
-+if ac_fn_c_try_compile "$LINENO"; then :
-
-- ;
-- return 0;
--}
--_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -3911,42 +4138,17 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -3132,25 +3162,13 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ac_cv_prog_cc_g=yes
- else
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+ CFLAGS="-g"
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
-+int
-+main ()
-+{
-
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_prog_cc_g=yes
+-
+-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -3167,7 +3185,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3963,18 +4153,14 @@
+@@ -3963,18 +4165,14 @@
CFLAGS=
fi
fi
@@ -3189,7 +3207,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -4031,32 +4217,9 @@
+@@ -4031,32 +4229,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -3223,7 +3241,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -4067,17 +4230,19 @@
+@@ -4067,17 +4242,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -3246,7 +3264,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -4087,9 +4252,9 @@
+@@ -4087,9 +4264,9 @@
depcc="$CC" am_compiler_list=
@@ -3258,7 +3276,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4197,7 +4362,7 @@
+@@ -4197,7 +4374,7 @@
fi
fi
@@ -3267,7 +3285,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4212,9 +4377,9 @@
+@@ -4212,9 +4389,9 @@
fi
@@ -3279,7 +3297,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -4222,7 +4387,7 @@
+@@ -4222,7 +4399,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -3288,7 +3306,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -4231,7 +4396,7 @@
+@@ -4231,7 +4408,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3297,7 +3315,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -4251,7 +4416,7 @@
+@@ -4251,7 +4428,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
@@ -3306,7 +3324,7 @@
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
-@@ -4266,19 +4431,17 @@
+@@ -4266,19 +4443,17 @@
$ac_path_SED_found && break 3
done
done
@@ -3329,7 +3347,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -4296,9 +4459,9 @@
+@@ -4296,9 +4471,9 @@
@@ -3341,7 +3359,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4309,7 +4472,7 @@
+@@ -4309,7 +4484,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3350,7 +3368,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -4329,7 +4492,7 @@
+@@ -4329,7 +4504,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
@@ -3359,7 +3377,7 @@
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -4344,26 +4507,24 @@
+@@ -4344,26 +4519,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -3391,7 +3409,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4377,7 +4538,7 @@
+@@ -4377,7 +4550,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3400,7 +3418,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -4397,7 +4558,7 @@
+@@ -4397,7 +4570,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
@@ -3409,7 +3427,7 @@
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4412,12 +4573,10 @@
+@@ -4412,12 +4585,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -3424,7 +3442,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4425,14 +4584,14 @@
+@@ -4425,14 +4596,14 @@
fi
fi
@@ -3442,7 +3460,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -4446,7 +4605,7 @@
+@@ -4446,7 +4617,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3451,7 +3469,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -4466,7 +4625,7 @@
+@@ -4466,7 +4637,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
@@ -3460,7 +3478,7 @@
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -4481,12 +4640,10 @@
+@@ -4481,12 +4652,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -3475,7 +3493,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -4494,7 +4651,7 @@
+@@ -4494,7 +4663,7 @@
fi
fi
@@ -3484,7 +3502,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -4520,7 +4677,7 @@
+@@ -4520,7 +4689,7 @@
# Check whether --with-gnu-ld was given.
@@ -3493,7 +3511,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -4529,7 +4686,7 @@
+@@ -4529,7 +4698,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -3502,7 +3520,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -4559,13 +4716,13 @@
+@@ -4559,13 +4728,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -3519,7 +3537,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -4596,18 +4753,16 @@
+@@ -4596,18 +4765,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -3543,7 +3561,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -4620,7 +4775,7 @@
+@@ -4620,7 +4787,7 @@
;;
esac
fi
@@ -3552,7 +3570,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -4632,9 +4787,9 @@
+@@ -4632,9 +4799,9 @@
@@ -3564,7 +3582,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -4681,7 +4836,7 @@
+@@ -4681,7 +4848,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -3573,7 +3591,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -4692,9 +4847,9 @@
+@@ -4692,9 +4859,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
@@ -3585,7 +3603,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -4705,24 +4860,24 @@
+@@ -4705,24 +4872,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3615,7 +3633,7 @@
$as_echo "no" >&6; }
fi
-@@ -4736,9 +4891,9 @@
+@@ -4736,9 +4903,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
@@ -3627,7 +3645,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -4749,24 +4904,24 @@
+@@ -4749,24 +4916,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3657,7 +3675,7 @@
$as_echo "no" >&6; }
fi
-@@ -4779,7 +4934,7 @@
+@@ -4779,7 +4946,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3666,7 +3684,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4799,44 +4954,44 @@
+@@ -4799,44 +4966,44 @@
@@ -3680,15 +3698,15 @@
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4809: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:4964: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:4976: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4812: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:4967: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:4979: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4815: output\"" >&5)
-+ (eval echo "\"\$as_me:4970: output\"" >&5)
++ (eval echo "\"\$as_me:4982: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -3722,7 +3740,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -4954,10 +5109,10 @@
+@@ -4954,10 +5121,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -3735,7 +3753,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -4971,7 +5126,7 @@
+@@ -4971,7 +5138,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -3744,7 +3762,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -4981,17 +5136,17 @@
+@@ -4981,17 +5148,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -3765,7 +3783,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -5026,14 +5181,14 @@
+@@ -5026,14 +5193,14 @@
@@ -3783,7 +3801,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -5062,9 +5217,9 @@
+@@ -5062,9 +5229,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
@@ -3795,7 +3813,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -5075,24 +5230,24 @@
+@@ -5075,24 +5242,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3825,7 +3843,7 @@
$as_echo "no" >&6; }
fi
-@@ -5102,9 +5257,9 @@
+@@ -5102,9 +5269,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
@@ -3837,7 +3855,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -5115,24 +5270,24 @@
+@@ -5115,24 +5282,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3867,7 +3885,7 @@
$as_echo "no" >&6; }
fi
-@@ -5141,7 +5296,7 @@
+@@ -5141,7 +5308,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3876,7 +3894,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5161,9 +5316,9 @@
+@@ -5161,9 +5328,9 @@
@@ -3888,7 +3906,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -5278,11 +5433,11 @@
+@@ -5278,11 +5445,11 @@
;;
# This must be Linux ELF.
@@ -3902,7 +3920,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -5357,7 +5512,7 @@
+@@ -5357,7 +5524,7 @@
esac
fi
@@ -3911,7 +3929,7 @@
$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -5377,9 +5532,9 @@
+@@ -5377,9 +5544,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
@@ -3923,7 +3941,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -5390,24 +5545,24 @@
+@@ -5390,24 +5557,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3953,7 +3971,7 @@
$as_echo "no" >&6; }
fi
-@@ -5417,9 +5572,9 @@
+@@ -5417,9 +5584,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
@@ -3965,7 +3983,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -5430,24 +5585,24 @@
+@@ -5430,24 +5597,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3995,7 +4013,7 @@
$as_echo "no" >&6; }
fi
-@@ -5456,7 +5611,7 @@
+@@ -5456,7 +5623,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4004,7 +4022,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5482,9 +5637,9 @@
+@@ -5482,9 +5649,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
@@ -4016,7 +4034,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -5495,24 +5650,24 @@
+@@ -5495,24 +5662,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4046,7 +4064,7 @@
$as_echo "no" >&6; }
fi
-@@ -5522,9 +5677,9 @@
+@@ -5522,9 +5689,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
@@ -4058,7 +4076,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -5535,24 +5690,24 @@
+@@ -5535,24 +5702,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4088,7 +4106,7 @@
$as_echo "no" >&6; }
fi
-@@ -5561,7 +5716,7 @@
+@@ -5561,7 +5728,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4097,7 +4115,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5581,9 +5736,9 @@
+@@ -5581,9 +5748,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
@@ -4109,7 +4127,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -5594,24 +5749,24 @@
+@@ -5594,24 +5761,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4139,7 +4157,7 @@
$as_echo "no" >&6; }
fi
-@@ -5621,9 +5776,9 @@
+@@ -5621,9 +5788,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
@@ -4151,7 +4169,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -5634,24 +5789,24 @@
+@@ -5634,24 +5801,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4181,7 +4199,7 @@
$as_echo "no" >&6; }
fi
-@@ -5660,7 +5815,7 @@
+@@ -5660,7 +5827,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4190,7 +4208,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5738,9 +5893,9 @@
+@@ -5738,9 +5905,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -4202,7 +4220,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -5856,18 +6011,18 @@
+@@ -5856,18 +6023,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -4227,7 +4245,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -5920,11 +6075,11 @@
+@@ -5920,11 +6087,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -4242,7 +4260,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -5958,10 +6113,10 @@
+@@ -5958,10 +6125,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
@@ -4255,7 +4273,7 @@
$as_echo "ok" >&6; }
fi
-@@ -5988,7 +6143,7 @@
+@@ -5988,7 +6155,7 @@
# Check whether --enable-libtool-lock was given.
@@ -4264,7 +4282,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -6000,11 +6155,11 @@
+@@ -6000,11 +6167,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4279,13 +4297,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -6018,12 +6173,12 @@
+@@ -6018,12 +6185,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6021 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 6176 "configure"' > conftest.$ac_ext
++ echo '#line 6188 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4296,7 +4314,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -6057,11 +6212,11 @@
+@@ -6057,11 +6224,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4311,7 +4329,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -6110,9 +6265,9 @@
+@@ -6110,9 +6277,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -4323,7 +4341,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -6121,11 +6276,7 @@
+@@ -6121,11 +6288,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4336,7 +4354,7 @@
/* end confdefs.h. */
int
-@@ -6136,38 +6287,13 @@
+@@ -6136,38 +6299,13 @@
return 0;
}
_ACEOF
@@ -4379,7 +4397,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -6175,7 +6301,7 @@
+@@ -6175,7 +6313,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -4388,7 +4406,7 @@
$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -6185,11 +6311,11 @@
+@@ -6185,11 +6323,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4403,7 +4421,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -6215,9 +6341,9 @@
+@@ -6215,9 +6353,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
@@ -4415,7 +4433,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -6228,24 +6354,24 @@
+@@ -6228,24 +6366,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4445,7 +4463,7 @@
$as_echo "no" >&6; }
fi
-@@ -6255,9 +6381,9 @@
+@@ -6255,9 +6393,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
@@ -4457,7 +4475,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -6268,24 +6394,24 @@
+@@ -6268,24 +6406,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4487,7 +4505,7 @@
$as_echo "no" >&6; }
fi
-@@ -6294,7 +6420,7 @@
+@@ -6294,7 +6432,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4496,7 +4514,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6307,9 +6433,9 @@
+@@ -6307,9 +6445,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
@@ -4508,7 +4526,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -6320,24 +6446,24 @@
+@@ -6320,24 +6458,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4538,7 +4556,7 @@
$as_echo "no" >&6; }
fi
-@@ -6347,9 +6473,9 @@
+@@ -6347,9 +6485,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
@@ -4550,7 +4568,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -6360,24 +6486,24 @@
+@@ -6360,24 +6498,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4580,7 +4598,7 @@
$as_echo "no" >&6; }
fi
-@@ -6386,7 +6512,7 @@
+@@ -6386,7 +6524,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4589,7 +4607,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6399,9 +6525,9 @@
+@@ -6399,9 +6537,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
@@ -4601,7 +4619,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -6412,24 +6538,24 @@
+@@ -6412,24 +6550,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4631,7 +4649,7 @@
$as_echo "no" >&6; }
fi
-@@ -6439,9 +6565,9 @@
+@@ -6439,9 +6577,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
@@ -4643,7 +4661,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -6452,24 +6578,24 @@
+@@ -6452,24 +6590,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4673,7 +4691,7 @@
$as_echo "no" >&6; }
fi
-@@ -6478,7 +6604,7 @@
+@@ -6478,7 +6616,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4682,7 +4700,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6491,9 +6617,9 @@
+@@ -6491,9 +6629,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
@@ -4694,7 +4712,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -6504,24 +6630,24 @@
+@@ -6504,24 +6642,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4724,7 +4742,7 @@
$as_echo "no" >&6; }
fi
-@@ -6531,9 +6657,9 @@
+@@ -6531,9 +6669,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
@@ -4736,7 +4754,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -6544,24 +6670,24 @@
+@@ -6544,24 +6682,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4766,7 +4784,7 @@
$as_echo "no" >&6; }
fi
-@@ -6570,7 +6696,7 @@
+@@ -6570,7 +6708,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4775,7 +4793,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6583,9 +6709,9 @@
+@@ -6583,9 +6721,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
@@ -4787,7 +4805,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -6596,24 +6722,24 @@
+@@ -6596,24 +6734,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4817,7 +4835,7 @@
$as_echo "no" >&6; }
fi
-@@ -6623,9 +6749,9 @@
+@@ -6623,9 +6761,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
@@ -4829,7 +4847,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -6636,24 +6762,24 @@
+@@ -6636,24 +6774,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4859,7 +4877,7 @@
$as_echo "no" >&6; }
fi
-@@ -6662,7 +6788,7 @@
+@@ -6662,7 +6800,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4868,7 +4886,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6698,9 +6824,9 @@
+@@ -6698,9 +6836,9 @@
@@ -4880,7 +4898,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -6725,22 +6851,18 @@
+@@ -6725,22 +6863,18 @@
rm -f conftest.*
fi
fi
@@ -4907,7 +4925,7 @@
/* end confdefs.h. */
int
-@@ -6751,42 +6873,17 @@
+@@ -6751,42 +6885,17 @@
return 0;
}
_ACEOF
@@ -4955,7 +4973,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -6828,14 +6925,14 @@
+@@ -6828,14 +6937,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
@@ -4972,7 +4990,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -6850,11 +6947,7 @@
+@@ -6850,11 +6959,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.
@@ -4985,7 +5003,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -6863,78 +6956,34 @@
+@@ -6863,78 +6968,34 @@
#endif
Syntax error
_ACEOF
@@ -5069,7 +5087,7 @@
break
fi
-@@ -6946,7 +6995,7 @@
+@@ -6946,7 +7007,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -5078,7 +5096,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -6957,11 +7006,7 @@
+@@ -6957,11 +7018,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.
@@ -5091,7 +5109,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -6970,87 +7015,40 @@
+@@ -6970,87 +7027,40 @@
#endif
Syntax error
_ACEOF
@@ -5188,7 +5206,7 @@
fi
ac_ext=c
-@@ -7060,16 +7058,12 @@
+@@ -7060,16 +7070,12 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -5208,7 +5226,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -7084,48 +7078,23 @@
+@@ -7084,48 +7090,23 @@
return 0;
}
_ACEOF
@@ -5262,7 +5280,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -7135,18 +7104,14 @@
+@@ -7135,18 +7116,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -5284,7 +5302,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -7156,14 +7121,10 @@
+@@ -7156,14 +7133,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -5301,7 +5319,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -7190,118 +7151,34 @@
+@@ -7190,118 +7163,34 @@
return 0;
}
_ACEOF
@@ -5332,122 +5350,46 @@
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++if ac_fn_c_try_run "$LINENO"; then :
+
-( exit $ac_status )
-ac_cv_header_stdc=no
--fi
++else
++ ac_cv_header_stdc=no
+ fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--
--fi
--fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+
+-
+ fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--$as_echo "$ac_cv_header_stdc" >&6; }
--if test $ac_cv_header_stdc = yes; then
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+ $as_echo "$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
--
--fi
--
--# On IRIX 5.3, sys/types and inttypes.h are conflicting.
--
--
--
--
--
--
--
--
--
--for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-- inttypes.h stdint.h unistd.h
--do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
-+if ac_fn_c_try_run "$LINENO"; then :
-
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- eval "$as_ac_Header=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_header_stdc=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-
-- eval "$as_ac_Header=no"
- fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-+$as_echo "$ac_cv_header_stdc" >&6; }
-+if test $ac_cv_header_stdc = yes; then
-+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+ inttypes.h stdint.h unistd.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -7311,62 +7188,13 @@
- done
-
-
--
- for ac_header in dlfcn.h
+ fi
+
+ # On IRIX 5.3, sys/types and inttypes.h are conflicting.
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -5501,6 +5443,73 @@
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -7311,62 +7200,13 @@
+ done
+
+
+-
+ for ac_header in dlfcn.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- eval "$as_ac_Header=yes"
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_Header=no"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++do :
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
@@ -5510,7 +5519,7 @@
_ACEOF
fi
-@@ -7387,7 +7215,7 @@
+@@ -7387,7 +7227,7 @@
# Check whether --with-pic was given.
@@ -5519,7 +5528,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -7403,7 +7231,7 @@
+@@ -7403,7 +7243,7 @@
# Check whether --enable-fast-install was given.
@@ -5528,7 +5537,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -7484,9 +7312,9 @@
+@@ -7484,9 +7324,9 @@
setopt NO_GLOB_SUBST
fi
@@ -5540,7 +5549,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -7499,7 +7327,7 @@
+@@ -7499,7 +7339,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -5549,7 +5558,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -7592,9 +7420,9 @@
+@@ -7592,9 +7432,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -5561,7 +5570,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -7645,10 +7473,10 @@
+@@ -7645,10 +7485,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -5574,7 +5583,7 @@
$as_echo "no" >&6; }
fi
-@@ -7658,9 +7486,9 @@
+@@ -7658,9 +7498,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -5586,7 +5595,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -7711,10 +7539,10 @@
+@@ -7711,10 +7551,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -5599,7 +5608,7 @@
$as_echo "no" >&6; }
fi
-@@ -7795,9 +7623,9 @@
+@@ -7795,9 +7635,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -5611,21 +5620,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -7813,11 +7641,11 @@
+@@ -7813,11 +7653,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7816: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7644: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7656: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7820: \$? = $ac_status" >&5
-+ echo "$as_me:7648: \$? = $ac_status" >&5
++ echo "$as_me:7660: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -7830,7 +7658,7 @@
+@@ -7830,7 +7670,7 @@
$RM conftest*
fi
@@ -5634,7 +5643,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -7850,7 +7678,7 @@
+@@ -7850,7 +7690,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -5643,7 +5652,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -7982,7 +7810,7 @@
+@@ -7982,7 +7822,7 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -5652,7 +5661,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -8122,7 +7950,7 @@
+@@ -8122,7 +7962,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -5661,7 +5670,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -8134,9 +7962,9 @@
+@@ -8134,9 +7974,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -5673,21 +5682,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -8152,11 +7980,11 @@
+@@ -8152,11 +7992,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8155: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7983: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7995: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8159: \$? = $ac_status" >&5
-+ echo "$as_me:7987: \$? = $ac_status" >&5
++ echo "$as_me:7999: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -8169,7 +7997,7 @@
+@@ -8169,7 +8009,7 @@
$RM conftest*
fi
@@ -5696,7 +5705,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -8193,9 +8021,9 @@
+@@ -8193,9 +8033,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -5708,7 +5717,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -8221,7 +8049,7 @@
+@@ -8221,7 +8061,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -5717,7 +5726,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -8236,9 +8064,9 @@
+@@ -8236,9 +8076,9 @@
@@ -5729,21 +5738,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8257,11 +8085,11 @@
+@@ -8257,11 +8097,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8260: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8088: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8100: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8264: \$? = $ac_status" >&5
-+ echo "$as_me:8092: \$? = $ac_status" >&5
++ echo "$as_me:8104: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -8283,7 +8111,7 @@
+@@ -8283,7 +8123,7 @@
$RM conftest*
fi
@@ -5752,7 +5761,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -8291,9 +8119,9 @@
+@@ -8291,9 +8131,9 @@
@@ -5764,21 +5773,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8312,11 +8140,11 @@
+@@ -8312,11 +8152,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8315: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8143: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8155: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8319: \$? = $ac_status" >&5
-+ echo "$as_me:8147: \$? = $ac_status" >&5
++ echo "$as_me:8159: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -8338,7 +8166,7 @@
+@@ -8338,7 +8178,7 @@
$RM conftest*
fi
@@ -5787,7 +5796,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -8347,7 +8175,7 @@
+@@ -8347,7 +8187,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
@@ -5796,7 +5805,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -8355,10 +8183,10 @@
+@@ -8355,10 +8195,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
@@ -5809,7 +5818,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -8371,7 +8199,7 @@
+@@ -8371,7 +8211,7 @@
@@ -5818,7 +5827,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -8431,6 +8259,9 @@
+@@ -8431,6 +8271,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -5828,7 +5837,7 @@
esac
ld_shlibs=yes
-@@ -8452,6 +8283,7 @@
+@@ -8452,6 +8295,7 @@
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -5836,7 +5845,7 @@
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -8543,7 +8375,7 @@
+@@ -8543,7 +8387,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -5845,7 +5854,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -8613,7 +8445,7 @@
+@@ -8613,7 +8457,7 @@
fi
;;
@@ -5854,7 +5863,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -8788,6 +8620,7 @@
+@@ -8788,6 +8632,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -5862,7 +5871,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -8813,11 +8646,7 @@
+@@ -8813,11 +8658,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -5875,7 +5884,7 @@
/* end confdefs.h. */
int
-@@ -8828,27 +8657,7 @@
+@@ -8828,27 +8669,7 @@
return 0;
}
_ACEOF
@@ -5904,7 +5913,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -8862,16 +8671,9 @@
+@@ -8862,16 +8683,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
@@ -5923,7 +5932,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -8884,11 +8686,7 @@
+@@ -8884,11 +8698,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -5936,7 +5945,7 @@
/* end confdefs.h. */
int
-@@ -8899,27 +8697,7 @@
+@@ -8899,27 +8709,7 @@
return 0;
}
_ACEOF
@@ -5965,7 +5974,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -8933,16 +8711,9 @@
+@@ -8933,16 +8723,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
@@ -5984,7 +5993,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -9154,42 +8925,16 @@
+@@ -9154,42 +8937,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -6032,7 +6041,7 @@
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -9202,7 +8947,7 @@
+@@ -9202,7 +8959,7 @@
link_all_deplibs=yes
;;
@@ -6041,7 +6050,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9445,7 +9190,7 @@
+@@ -9445,7 +9202,7 @@
fi
fi
@@ -6050,7 +6059,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -9482,16 +9227,16 @@
+@@ -9482,16 +9239,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.
@@ -6071,7 +6080,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -9505,11 +9250,11 @@
+@@ -9505,11 +9262,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -6086,7 +6095,7 @@
then
archive_cmds_need_lc=no
else
-@@ -9520,7 +9265,7 @@
+@@ -9520,7 +9277,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -6095,7 +6104,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -9684,7 +9429,7 @@
+@@ -9684,7 +9441,7 @@
@@ -6104,7 +6113,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -10092,7 +9837,7 @@
+@@ -10092,7 +9849,7 @@
;;
# This must be Linux ELF.
@@ -6113,7 +6122,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10106,11 +9851,7 @@
+@@ -10106,11 +9863,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -6126,7 +6135,7 @@
/* end confdefs.h. */
int
-@@ -10121,41 +9862,13 @@
+@@ -10121,41 +9874,13 @@
return 0;
}
_ACEOF
@@ -6172,7 +6181,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -10164,13 +9877,10 @@
+@@ -10164,13 +9889,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -6187,7 +6196,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10182,6 +9892,18 @@
+@@ -10182,6 +9904,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6206,7 +6215,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10370,7 +10092,7 @@
+@@ -10370,7 +10104,7 @@
dynamic_linker=no
;;
esac
@@ -6215,7 +6224,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -10472,7 +10194,7 @@
+@@ -10472,7 +10206,7 @@
@@ -6224,7 +6233,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -10497,7 +10219,7 @@
+@@ -10497,7 +10231,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -6233,7 +6242,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -10542,184 +10264,14 @@
+@@ -10542,18 +10276,14 @@
darwin*)
# if libdl is installed we need to link against it
@@ -6241,32 +6250,24 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl $LIBS"
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char dlopen ();
--int
--main ()
--{
--return dlopen ();
-- ;
-- return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -10571,43 +10301,18 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -6288,34 +6289,35 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_dl_dlopen=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dl_dlopen=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
--fi
++ ac_cv_lib_dl_dlopen=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_dl_dlopen" >&5
--$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
--else
--
-- lt_cv_dlopen="dyld"
-- lt_cv_dlopen_libs=
-- lt_cv_dlopen_self=yes
--
--fi
--
-- ;;
--
-- *)
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+
+@@ -10620,106 +10325,18 @@
+ ;;
+
+ *)
- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-$as_echo_n "checking for shl_load... " >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
@@ -6402,38 +6404,29 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
-if test "x$ac_cv_func_shl_load" = x""yes; then
-- lt_cv_dlopen="shl_load"
--else
++ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
++if test "x$ac_cv_func_shl_load" = x""yes; then :
+ lt_cv_dlopen="shl_load"
+ else
- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--$as_echo_n "checking for shl_load in -ldld... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+ $as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldld $LIBS"
+ LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-ldl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10728,81 +10280,52 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char shl_load ();
-+char dlopen ();
- int
- main ()
- {
--return shl_load ();
-+return dlopen ();
- ;
+@@ -10737,145 +10354,32 @@
return 0;
}
_ACEOF
@@ -6458,15 +6451,14 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_dld_shl_load=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_dl_dlopen=yes
+ ac_cv_lib_dld_shl_load=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dld_shl_load=no
-+ ac_cv_lib_dl_dlopen=no
++ ac_cv_lib_dld_shl_load=no
fi
-
-rm -rf conftest.dSYM
@@ -6477,19 +6469,17 @@
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
-- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
--else
++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
- $as_echo_n "(cached) " >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -6499,46 +6489,26 @@
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+ lt_cv_dlopen="dyld"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+fi
-+
-+ ;;
-
+-
-#undef dlopen
-+ *)
-+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-+if test "x$ac_cv_func_shl_load" = x""yes; then :
-+ lt_cv_dlopen="shl_load"
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-+$as_echo_n "checking for shl_load in -ldld... " >&6; }
-+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -10810,72 +10333,41 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -6547,16 +6517,14 @@
-choke me
-#endif
-
-+char shl_load ();
- int
- main ()
- {
+-int
+-main ()
+-{
-return dlopen ();
-+return shl_load ();
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -6579,31 +6547,20 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_dlopen=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_dld_shl_load=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_dlopen=no
-+ ac_cv_lib_dld_shl_load=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-+else
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = x""yes; then :
lt_cv_dlopen="dlopen"
@@ -6626,7 +6583,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10893,57 +10385,28 @@
+@@ -10893,57 +10397,28 @@
return 0;
}
_ACEOF
@@ -6693,7 +6650,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10961,57 +10424,28 @@
+@@ -10961,57 +10436,28 @@
return 0;
}
_ACEOF
@@ -6760,7 +6717,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11029,43 +10463,18 @@
+@@ -11029,43 +10475,18 @@
return 0;
}
_ACEOF
@@ -6810,7 +6767,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -11104,9 +10513,9 @@
+@@ -11104,9 +10525,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -6822,16 +6779,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11115,7 +10524,7 @@
+@@ -11115,7 +10536,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11118 "configure"
-+#line 10527 "configure"
++#line 10539 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11174,11 +10583,11 @@
+@@ -11174,11 +10595,11 @@
return status;
}
_LT_EOF
@@ -6846,7 +6803,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -11195,14 +10604,14 @@
+@@ -11195,14 +10616,14 @@
fi
@@ -6864,16 +6821,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11211,7 +10620,7 @@
+@@ -11211,7 +10632,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11214 "configure"
-+#line 10623 "configure"
++#line 10635 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11270,11 +10679,11 @@
+@@ -11270,11 +10691,11 @@
return status;
}
_LT_EOF
@@ -6888,7 +6845,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -11291,7 +10700,7 @@
+@@ -11291,7 +10712,7 @@
fi
@@ -6897,7 +6854,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -11330,12 +10739,12 @@
+@@ -11330,12 +10751,12 @@
striplib=
old_striplib=
@@ -6912,7 +6869,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -11344,15 +10753,15 @@
+@@ -11344,15 +10765,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -6931,7 +6888,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -11370,12 +10779,12 @@
+@@ -11370,12 +10791,12 @@
# Report which library types will actually be built
@@ -6947,7 +6904,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -11396,14 +10805,14 @@
+@@ -11396,14 +10817,14 @@
fi
;;
esac
@@ -6965,7 +6922,7 @@
$as_echo "$enable_static" >&6; }
-@@ -11439,17 +10848,13 @@
+@@ -11439,17 +10860,13 @@
@@ -6986,7 +6943,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11474,54 +10879,27 @@
+@@ -11474,54 +10891,27 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -7049,7 +7006,7 @@
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-@@ -11534,9 +10912,9 @@
+@@ -11534,9 +10924,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
@@ -7061,7 +7018,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11547,24 +10925,24 @@
+@@ -11547,24 +10937,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7091,7 +7048,7 @@
$as_echo "no" >&6; }
fi
-@@ -11574,9 +10952,9 @@
+@@ -11574,9 +10964,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
@@ -7103,7 +7060,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -11587,24 +10965,24 @@
+@@ -11587,24 +10977,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7133,7 +7090,7 @@
$as_echo "no" >&6; }
fi
-@@ -11613,7 +10991,7 @@
+@@ -11613,7 +11003,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7142,7 +7099,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -11627,9 +11005,9 @@
+@@ -11627,9 +11017,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
@@ -7154,7 +7111,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11640,24 +11018,24 @@
+@@ -11640,24 +11030,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7184,7 +7141,7 @@
$as_echo "no" >&6; }
fi
-@@ -11667,9 +11045,9 @@
+@@ -11667,9 +11057,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
@@ -7196,7 +7153,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11681,18 +11059,18 @@
+@@ -11681,18 +11071,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7218,7 +7175,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -11711,10 +11089,10 @@
+@@ -11711,10 +11101,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7231,7 +7188,7 @@
$as_echo "no" >&6; }
fi
-@@ -11726,9 +11104,9 @@
+@@ -11726,9 +11116,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
@@ -7243,7 +7200,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11739,24 +11117,24 @@
+@@ -11739,24 +11129,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7273,7 +7230,7 @@
$as_echo "no" >&6; }
fi
-@@ -11770,9 +11148,9 @@
+@@ -11770,9 +11160,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
@@ -7285,7 +7242,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -11783,24 +11161,24 @@
+@@ -11783,24 +11173,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7315,7 +7272,7 @@
$as_echo "no" >&6; }
fi
-@@ -11813,7 +11191,7 @@
+@@ -11813,7 +11203,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7324,660 +7281,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -11824,62 +11202,42 @@
- fi
-
-
--test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
-
- # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
- set X $ac_compile
- ac_compiler=$2
--{ (ac_try="$ac_compiler --version >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compiler --version >&5") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
--{ (ac_try="$ac_compiler -v >&5"
-+for ac_option in --version -v -V -qversion; do
-+ { { ac_try="$ac_compiler $ac_option >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compiler -v >&5") 2>&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
--{ (ac_try="$ac_compiler -V >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compiler -V >&5") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
-+ if test -s conftest.err; then
-+ sed '10a\
-+... rest of stderr output deleted ...
-+ 10q' conftest.err >conftest.er1
-+ cat conftest.er1 >&5
-+ fi
-+ rm -f conftest.er1 conftest.err
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }
-+done
-
--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
- $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
--if test "${ac_cv_c_compiler_gnu+set}" = set; then
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -11893,37 +11251,16 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_compiler_gnu=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_compiler_gnu=no
-+ ac_compiler_gnu=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
- $as_echo "$ac_cv_c_compiler_gnu" >&6; }
- if test $ac_compiler_gnu = yes; then
- GCC=yes
-@@ -11932,20 +11269,16 @@
- fi
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
- $as_echo_n "checking whether $CC accepts -g... " >&6; }
--if test "${ac_cv_prog_cc_g+set}" = set; then
-+if test "${ac_cv_prog_cc_g+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
- ac_cv_prog_cc_g=no
- CFLAGS="-g"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -11956,35 +11289,11 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- CFLAGS=""
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ CFLAGS=""
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -11995,36 +11304,12 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- :
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_compile "$LINENO"; then :
-
-- ac_c_werror_flag=$ac_save_c_werror_flag
-+else
-+ ac_c_werror_flag=$ac_save_c_werror_flag
- CFLAGS="-g"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -12035,42 +11320,17 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
- $as_echo "$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
-@@ -12087,18 +11347,14 @@
- CFLAGS=
- fi
- fi
--{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
- $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
--if test "${ac_cv_prog_cc_c89+set}" = set; then
-+if test "${ac_cv_prog_cc_c89+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <stdarg.h>
- #include <stdio.h>
-@@ -12154,33 +11410,10 @@
- for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
-- CC="$ac_save_CC $ac_arg"
-- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_cv_prog_cc_c89=$ac_arg
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
-+ CC="$ac_save_CC $ac_arg"
-+ if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_prog_cc_c89=$ac_arg
- fi
--
- rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
-@@ -12191,17 +11424,19 @@
- # AC_CACHE_VAL
- case "x$ac_cv_prog_cc_c89" in
- x)
-- { $as_echo "$as_me:$LINENO: result: none needed" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
- $as_echo "none needed" >&6; } ;;
- xno)
-- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
- $as_echo "unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
-- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
- $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
- esac
-+if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-+fi
-
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -12211,9 +11446,9 @@
-
- depcc="$CC" am_compiler_list=
-
--{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
- $as_echo_n "checking dependency style of $depcc... " >&6; }
--if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -12321,7 +11556,7 @@
- fi
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
- $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-@@ -12344,9 +11579,9 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -12357,24 +11592,24 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -12384,9 +11619,9 @@
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_CC"; then
-@@ -12397,24 +11632,24 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
- $as_echo "$ac_ct_CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -12423,7 +11658,7 @@
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -12437,9 +11672,9 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -12450,24 +11685,24 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -12477,9 +11712,9 @@
- if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -12491,18 +11726,18 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- if test $ac_prog_rejected = yes; then
-@@ -12521,10 +11756,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -12536,9 +11771,9 @@
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -12549,24 +11784,24 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -12580,9 +11815,9 @@
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_CC"; then
-@@ -12593,24 +11828,24 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
- $as_echo "$ac_ct_CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -12623,7 +11858,7 @@
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -12634,62 +11869,42 @@
+@@ -11824,62 +11214,42 @@
fi
@@ -8062,7 +7366,7 @@
/* end confdefs.h. */
int
-@@ -12703,37 +11918,16 @@
+@@ -11893,37 +11263,16 @@
return 0;
}
_ACEOF
@@ -8103,7 +7407,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -12742,20 +11936,16 @@
+@@ -11932,20 +11281,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -8127,7 +7431,7 @@
/* end confdefs.h. */
int
-@@ -12766,35 +11956,11 @@
+@@ -11956,35 +11301,11 @@
return 0;
}
_ACEOF
@@ -8166,7 +7470,7 @@
/* end confdefs.h. */
int
-@@ -12805,36 +11971,12 @@
+@@ -11995,36 +11316,12 @@
return 0;
}
_ACEOF
@@ -8207,7 +7511,7 @@
/* end confdefs.h. */
int
-@@ -12845,42 +11987,17 @@
+@@ -12035,42 +11332,17 @@
return 0;
}
_ACEOF
@@ -8252,7 +7556,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -12897,18 +12014,14 @@
+@@ -12087,18 +11359,14 @@
CFLAGS=
fi
fi
@@ -8274,7 +7578,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -12965,32 +12078,9 @@
+@@ -12155,32 +11423,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -8308,7 +7612,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -13001,17 +12091,19 @@
+@@ -12191,17 +11436,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -8331,7 +7635,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -13021,9 +12113,9 @@
+@@ -12211,9 +11458,9 @@
depcc="$CC" am_compiler_list=
@@ -8343,7 +7647,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -13131,7 +12223,7 @@
+@@ -12321,7 +11568,7 @@
fi
fi
@@ -8352,7 +7656,657 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -13149,16 +12241,12 @@
+@@ -12344,9 +11591,9 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -12357,24 +11604,24 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -12384,9 +11631,9 @@
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -12397,24 +11644,24 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -12423,7 +11670,7 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -12437,9 +11684,9 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -12450,24 +11697,24 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -12477,9 +11724,9 @@
+ if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -12491,18 +11738,18 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ if test $ac_prog_rejected = yes; then
+@@ -12521,10 +11768,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -12536,9 +11783,9 @@
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -12549,24 +11796,24 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -12580,9 +11827,9 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -12593,24 +11840,24 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -12623,7 +11870,7 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -12634,62 +11881,42 @@
+ fi
+
+
+-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++as_fn_error "no acceptable C compiler found in \$PATH
++See \`config.log' for more details." "$LINENO" 5; }
+
+ # Provide some information about the compiler.
+-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+ set X $ac_compile
+ ac_compiler=$2
+-{ (ac_try="$ac_compiler --version >&5"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compiler --version >&5") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-{ (ac_try="$ac_compiler -v >&5"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compiler -v >&5") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-{ (ac_try="$ac_compiler -V >&5"
++for ac_option in --version -v -V -qversion; do
++ { { ac_try="$ac_compiler $ac_option >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compiler -V >&5") 2>&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
++ if test -s conftest.err; then
++ sed '10a\
++... rest of stderr output deleted ...
++ 10q' conftest.err >conftest.er1
++ cat conftest.er1 >&5
++ fi
++ rm -f conftest.er1 conftest.err
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++done
+
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
++if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -12703,37 +11930,16 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_compiler_gnu=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_compiler_gnu=no
++ ac_compiler_gnu=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+ $as_echo "$ac_cv_c_compiler_gnu" >&6; }
+ if test $ac_compiler_gnu = yes; then
+ GCC=yes
+@@ -12742,20 +11948,16 @@
+ fi
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then
++if test "${ac_cv_prog_cc_g+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -12766,35 +11968,11 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- CFLAGS=""
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ CFLAGS=""
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -12805,36 +11983,12 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- :
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_compile "$LINENO"; then :
+
+- ac_c_werror_flag=$ac_save_c_werror_flag
++else
++ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -12845,42 +11999,17 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+ $as_echo "$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+@@ -12897,18 +12026,14 @@
+ CFLAGS=
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then
++if test "${ac_cv_prog_cc_c89+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -12965,32 +12090,9 @@
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+ do
+ CC="$ac_save_CC $ac_arg"
+- rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_c89=$ac_arg
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+@@ -13001,17 +12103,19 @@
+ # AC_CACHE_VAL
+ case "x$ac_cv_prog_cc_c89" in
+ x)
+- { $as_echo "$as_me:$LINENO: result: none needed" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+ $as_echo "none needed" >&6; } ;;
+ xno)
+- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+ $as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+ $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
++if test "x$ac_cv_prog_cc_c89" != xno; then :
+
++fi
+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -13021,9 +12125,9 @@
+
+ depcc="$CC" am_compiler_list=
+
+-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -13131,7 +12235,7 @@
+ fi
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+ $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+@@ -13149,16 +12253,12 @@
am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
@@ -8372,7 +8326,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -13173,48 +12261,23 @@
+@@ -13173,48 +12273,23 @@
return 0;
}
_ACEOF
@@ -8426,7 +8380,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -13224,18 +12287,14 @@
+@@ -13224,18 +12299,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -8448,7 +8402,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -13245,14 +12304,10 @@
+@@ -13245,14 +12316,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -8465,7 +8419,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -13279,60 +12334,31 @@
+@@ -13279,60 +12346,31 @@
return 0;
}
_ACEOF
@@ -8535,7 +8489,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -13345,14 +12371,14 @@
+@@ -13345,14 +12383,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8553,7 +8507,7 @@
IFS=$as_save_IFS
;;
-@@ -13360,19 +12386,19 @@
+@@ -13360,19 +12398,19 @@
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -8577,7 +8531,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_MKENUMS in
-@@ -13385,14 +12411,14 @@
+@@ -13385,14 +12423,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8595,7 +8549,7 @@
IFS=$as_save_IFS
;;
-@@ -13400,26 +12426,26 @@
+@@ -13400,26 +12438,26 @@
fi
GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
if test -n "$GLIB_MKENUMS"; then
@@ -8627,7 +8581,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -13427,35 +12453,31 @@
+@@ -13427,35 +12465,31 @@
case "$am__api_version" in
1.01234)
@@ -8669,7 +8623,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -13468,14 +12490,14 @@
+@@ -13468,14 +12502,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8687,7 +8641,7 @@
IFS=$as_save_IFS
;;
-@@ -13483,19 +12505,19 @@
+@@ -13483,19 +12517,19 @@
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -8711,7 +8665,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -13508,14 +12530,14 @@
+@@ -13508,14 +12542,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8729,7 +8683,7 @@
IFS=$as_save_IFS
;;
-@@ -13523,19 +12545,19 @@
+@@ -13523,19 +12557,19 @@
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -8753,7 +8707,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -13548,14 +12570,14 @@
+@@ -13548,14 +12582,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8771,7 +8725,7 @@
IFS=$as_save_IFS
;;
-@@ -13563,18 +12585,16 @@
+@@ -13563,18 +12597,16 @@
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -8793,7 +8747,7 @@
fi
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -13696,9 +12716,9 @@
+@@ -13696,9 +12728,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
@@ -8805,7 +8759,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -13711,14 +12731,14 @@
+@@ -13711,14 +12743,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8823,7 +8777,7 @@
IFS=$as_save_IFS
;;
-@@ -13726,19 +12746,19 @@
+@@ -13726,19 +12758,19 @@
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -8847,7 +8801,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -13751,14 +12771,14 @@
+@@ -13751,14 +12783,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8865,7 +8819,7 @@
IFS=$as_save_IFS
;;
-@@ -13766,19 +12786,19 @@
+@@ -13766,19 +12798,19 @@
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -8889,7 +8843,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -13791,14 +12811,14 @@
+@@ -13791,14 +12823,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8907,7 +8861,7 @@
IFS=$as_save_IFS
;;
-@@ -13806,19 +12826,19 @@
+@@ -13806,19 +12838,19 @@
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -8931,7 +8885,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -13831,14 +12851,14 @@
+@@ -13831,14 +12863,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8949,7 +8903,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -13847,33 +12867,29 @@
+@@ -13847,33 +12879,29 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -8989,7 +8943,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -13886,14 +12902,14 @@
+@@ -13886,14 +12914,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9007,7 +8961,7 @@
IFS=$as_save_IFS
;;
-@@ -13901,41 +12917,35 @@
+@@ -13901,41 +12929,35 @@
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -9058,7 +9012,7 @@
fi
fi
-@@ -13945,11 +12955,7 @@
+@@ -13945,11 +12967,7 @@
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -9071,7 +9025,7 @@
/* end confdefs.h. */
int
-@@ -13961,120 +12967,13 @@
+@@ -13961,120 +12979,13 @@
return 0;
}
_ACEOF
@@ -9196,7 +9150,7 @@
DATADIRNAME=share
else
DATADIRNAME=lib
-@@ -14086,10 +12985,8 @@
+@@ -14086,10 +12997,8 @@
;;
esac
fi
@@ -9209,7 +9163,7 @@
fi
-@@ -14103,9 +13000,9 @@
+@@ -14103,9 +13012,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
@@ -9221,7 +9175,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -14118,14 +13015,14 @@
+@@ -14118,14 +13027,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9239,7 +9193,7 @@
IFS=$as_save_IFS
;;
-@@ -14133,10 +13030,10 @@
+@@ -14133,10 +13042,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -9252,7 +9206,7 @@
$as_echo "no" >&6; }
fi
-@@ -14146,9 +13043,9 @@
+@@ -14146,9 +13055,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
@@ -9264,7 +9218,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -14161,14 +13058,14 @@
+@@ -14161,14 +13070,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9282,7 +9236,7 @@
IFS=$as_save_IFS
;;
-@@ -14176,10 +13073,10 @@
+@@ -14176,10 +13085,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -9295,7 +9249,7 @@
$as_echo "no" >&6; }
fi
-@@ -14188,7 +13085,7 @@
+@@ -14188,7 +13097,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9304,7 +9258,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -14201,13 +13098,13 @@
+@@ -14201,13 +13110,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -9321,7 +9275,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -14216,7 +13113,7 @@
+@@ -14216,7 +13125,7 @@
# Check whether --enable-debug was given.
@@ -9330,7 +9284,7 @@
enableval=$enable_debug;
else
enable_debug=no
-@@ -14225,16 +13122,14 @@
+@@ -14225,16 +13134,14 @@
if test x$enable_debug = xyes ; then
@@ -9349,7 +9303,7 @@
enableval=$enable_compile_warnings;
else
enable_compile_warnings="maximum"
-@@ -14265,13 +13160,9 @@
+@@ -14265,13 +13172,9 @@
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -9365,7 +9319,7 @@
/* end confdefs.h. */
int
-@@ -14282,35 +13173,14 @@
+@@ -14282,35 +13185,14 @@
return 0;
}
_ACEOF
@@ -9404,7 +9358,7 @@
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
-@@ -14324,26 +13194,24 @@
+@@ -14324,26 +13206,24 @@
fi
;;
*)
@@ -9436,7 +9390,7 @@
$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
complCFLAGS=
if test "x$enable_iso_c" != "xno"; then
-@@ -14358,7 +13226,7 @@
+@@ -14358,7 +13238,7 @@
esac
fi
fi
@@ -9445,7 +9399,7 @@
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -14383,9 +13251,7 @@
+@@ -14383,9 +13263,7 @@
if test "$enable_maintainer_mode" = "yes"; then
@@ -9456,7 +9410,7 @@
enable_debug=yes
DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
-@@ -14403,11 +13269,11 @@
+@@ -14403,11 +13281,11 @@
GNOME_KEYRING_REQUIRED=2.26.0
if test -n "$PKG_CONFIG" && \
@@ -9471,7 +9425,7 @@
have_libnotify=yes
else
have_libnotify=no
-@@ -14417,24 +13283,22 @@
+@@ -14417,24 +13295,22 @@
if test "$have_libnotify" = "yes"; then
LIBNOTIFY_PACKAGE="libnotify >= $LIBNOTIFY_REQUIRED"
@@ -9500,7 +9454,7 @@
$as_echo "$enable_tests" >&6; }
if test "$enable_tests" = "yes"; then
-@@ -14448,14 +13312,15 @@
+@@ -14448,14 +13324,15 @@
pkg_failed=no
@@ -9522,7 +9476,7 @@
glib-2.0 >= \$GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14473,7 +13338,7 @@
+@@ -14473,7 +13350,7 @@
webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
@@ -9531,7 +9485,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14494,8 +13359,8 @@
+@@ -14494,8 +13371,8 @@
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
") 2>&5
ac_status=$?
@@ -9542,7 +9496,7 @@
pkg_cv_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14518,14 +13383,16 @@
+@@ -14518,14 +13395,16 @@
else
pkg_failed=yes
fi
@@ -9566,7 +9520,7 @@
glib-2.0 >= \$GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14543,7 +13410,7 @@
+@@ -14543,7 +13422,7 @@
webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
@@ -9575,7 +9529,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14564,8 +13431,8 @@
+@@ -14564,8 +13443,8 @@
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
") 2>&5
ac_status=$?
@@ -9586,7 +9540,7 @@
pkg_cv_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14588,8 +13455,9 @@
+@@ -14588,8 +13467,9 @@
else
pkg_failed=yes
fi
@@ -9598,7 +9552,7 @@
fi
-@@ -14602,7 +13470,7 @@
+@@ -14602,7 +13482,7 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9607,7 +9561,7 @@
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14620,9 +13488,9 @@
+@@ -14620,9 +13500,9 @@
webkit-1.0 >= $WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
@@ -9619,7 +9573,7 @@
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14640,41 +13508,12 @@
+@@ -14640,12 +13520,12 @@
webkit-1.0 >= $WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
@@ -9630,6 +9584,16 @@
echo "$DEPENDENCIES_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (
++ as_fn_error "Package requirements (
+ glib-2.0 >= $GLIB_REQUIRED
+ gmodule-2.0
+ gthread-2.0
+@@ -14673,51 +13553,11 @@
+ Alternatively, you may set the environment variables DEPENDENCIES_CFLAGS
+ and DEPENDENCIES_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (
- glib-2.0 >= $GLIB_REQUIRED
- gmodule-2.0
- gthread-2.0
@@ -9657,16 +9621,6 @@
-Alternatively, you may set the environment variables DEPENDENCIES_CFLAGS
-and DEPENDENCIES_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements (
-+ as_fn_error "Package requirements (
- glib-2.0 >= $GLIB_REQUIRED
- gmodule-2.0
- gthread-2.0
-@@ -14702,22 +13541,11 @@
- Alternatively, you may set the environment variables DEPENDENCIES_CFLAGS
- and DEPENDENCIES_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
+" "$LINENO" 5
@@ -9689,7 +9643,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14726,12 +13554,11 @@
+@@ -14726,12 +13566,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -9704,7 +9658,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14742,40 +13569,44 @@
+@@ -14742,40 +13581,44 @@
pkg_failed=no
@@ -9768,7 +9722,7 @@
fi
-@@ -14788,25 +13619,14 @@
+@@ -14788,14 +13631,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9782,6 +9736,16 @@
echo "$DBUS_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
++ as_fn_error "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
+
+ $DBUS_PKG_ERRORS
+
+@@ -14805,23 +13648,11 @@
+ Alternatively, you may set the environment variables DBUS_CFLAGS
+ and DBUS_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
-
-$DBUS_PKG_ERRORS
-
@@ -9791,16 +9755,6 @@
-Alternatively, you may set the environment variables DBUS_CFLAGS
-and DBUS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
-+ as_fn_error "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
-
- $DBUS_PKG_ERRORS
-
-@@ -14816,22 +13636,11 @@
- Alternatively, you may set the environment variables DBUS_CFLAGS
- and DBUS_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
+" "$LINENO" 5
@@ -9809,6 +9763,16 @@
+ { { $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
++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.
+
+@@ -14830,31 +13661,20 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
@@ -9817,16 +9781,6 @@
-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.
-
-@@ -14840,21 +13649,20 @@
- See the pkg-config man page for more details.
-
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
@@ -9849,7 +9803,7 @@
$as_echo_n "(cached) " >&6
else
case $DBUS_BINDING_TOOL in
-@@ -14867,14 +13675,14 @@
+@@ -14867,14 +13687,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9867,7 +9821,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_DBUS_BINDING_TOOL" && ac_cv_path_DBUS_BINDING_TOOL="no"
-@@ -14883,19 +13691,17 @@
+@@ -14883,19 +13703,17 @@
fi
DBUS_BINDING_TOOL=$ac_cv_path_DBUS_BINDING_TOOL
if test -n "$DBUS_BINDING_TOOL"; then
@@ -9890,7 +9844,7 @@
fi
# *****
-@@ -14911,13 +13717,13 @@
+@@ -14911,13 +13729,13 @@
# Check whether --with-gconf-source was given.
@@ -9906,7 +9860,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -14926,22 +13732,20 @@
+@@ -14926,22 +13744,20 @@
# Check whether --with-gconf-schema-file-dir was given.
@@ -9933,7 +9887,7 @@
esac
fi
-@@ -14957,9 +13761,9 @@
+@@ -14957,9 +13773,9 @@
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -9945,7 +9899,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -14972,14 +13776,14 @@
+@@ -14972,14 +13788,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9963,7 +9917,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-@@ -14988,134 +13792,29 @@
+@@ -14988,134 +13804,29 @@
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -10106,7 +10060,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -15125,150 +13824,12 @@
+@@ -15125,150 +13836,12 @@
# for backtrace()
@@ -10262,7 +10216,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -15277,18 +13838,14 @@
+@@ -15277,18 +13850,14 @@
done
@@ -10284,7 +10238,7 @@
/* end confdefs.h. */
#ifndef __cplusplus
typedef int foo_t;
-@@ -15297,41 +13854,17 @@
+@@ -15297,41 +13866,17 @@
#endif
_ACEOF
@@ -10328,7 +10282,7 @@
case $ac_cv_c_inline in
inline | yes) ;;
*)
-@@ -15347,16 +13880,12 @@
+@@ -15347,16 +13892,12 @@
;;
esac
@@ -10348,7 +10302,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/time.h>
-@@ -15371,190 +13900,31 @@
+@@ -15371,308 +13912,38 @@
return 0;
}
_ACEOF
@@ -10390,12 +10344,13 @@
-cat >>confdefs.h <<\_ACEOF
-#define TIME_WITH_SYS_TIME 1
-_ACEOF
--
--fi
--
--
--
--
++$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+
+ fi
+
+
+
+
-
-for ac_header in $ac_header_list
-do
@@ -10445,11 +10400,10 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
-
+-
- ac_header_compiler=no
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
@@ -10489,11 +10443,11 @@
-
- ac_header_preproc=no
-fi
-
+-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
+-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -10535,7 +10489,7 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
+-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
@@ -10550,10 +10504,18 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -15570,100 +13940,12 @@
-
-
-
+
+ fi
+
+-done
+-
+-
+-
+-
+-
+-
+-
+-
-
-for ac_func in $ac_func_list
-do
@@ -10648,31 +10610,40 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-
+-
++done
+
+
+
+@@ -15681,25 +13952,32 @@
+
+
+
+ for ac_func in $ac_func_list
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -15675,31 +13957,15 @@
-
-
-
--
--
--
--
--
--
--
--
--
--
--
--
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+
++fi
++done
+
+
+
+
+
-{ $as_echo "$as_me:$LINENO: checking for working mktime" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5
$as_echo_n "checking for working mktime... " >&6; }
@@ -10693,7 +10664,7 @@
/* end confdefs.h. */
/* Test program from Paul Eggert and Tony Leneis. */
#ifdef TIME_WITH_SYS_TIME
-@@ -15896,44 +14162,17 @@
+@@ -15896,44 +14174,17 @@
return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
}
_ACEOF
@@ -10743,7 +10714,7 @@
$as_echo "$ac_cv_func_working_mktime" >&6; }
if test $ac_cv_func_working_mktime = no; then
case " $LIBOBJS " in
-@@ -15944,19 +14183,15 @@
+@@ -15944,19 +14195,15 @@
fi
@@ -10767,15 +10738,10 @@
/* end confdefs.h. */
$ac_includes_default
-@@ -15984,156 +14219,44 @@
- strtod (string, &term);
- if (term != string && *(term - 1) == 0)
- return 1;
-- }
-- return 0;
--}
--
--_ACEOF
+@@ -15989,44 +14236,17 @@
+ }
+
+ _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -10798,30 +10764,34 @@
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_func_strtod=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
+ ac_cv_func_strtod=yes
+ else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_strtod=no
--fi
++ ac_cv_func_strtod=no
+ fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--
--fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+
+-
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strtod" >&5
--$as_echo "$ac_cv_func_strtod" >&6; }
--if test $ac_cv_func_strtod = no; then
-- case " $LIBOBJS " in
-- *" strtod.$ac_objext "* ) ;;
-- *) LIBOBJS="$LIBOBJS strtod.$ac_objext"
-- ;;
--esac
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5
+ $as_echo "$ac_cv_func_strtod" >&6; }
+ if test $ac_cv_func_strtod = no; then
+ case " $LIBOBJS " in
+@@ -16035,105 +14255,20 @@
+ ;;
+ esac
+
-{ $as_echo "$as_me:$LINENO: checking for pow" >&5
-$as_echo_n "checking for pow... " >&6; }
-if test "${ac_cv_func_pow+set}" = set; then
@@ -10894,33 +10864,12 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_pow=yes
-+ }
-+ return 0;
-+}
-+
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ ac_cv_func_strtod=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_func_strtod=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-
+-
- ac_cv_func_pow=no
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5
-+$as_echo "$ac_cv_func_strtod" >&6; }
-+if test $ac_cv_func_strtod = no; then
-+ case " $LIBOBJS " in
-+ *" strtod.$ac_objext "* ) ;;
-+ *) LIBOBJS="$LIBOBJS strtod.$ac_objext"
-+ ;;
-+esac
-+
+-fi
+ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
+if test "x$ac_cv_func_pow" = x""yes; then :
@@ -10950,7 +10899,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16151,46 +14274,21 @@
+@@ -16151,46 +14286,21 @@
return 0;
}
_ACEOF
@@ -11004,7 +10953,7 @@
$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
fi
-@@ -16198,102 +14296,9 @@
+@@ -16198,102 +14308,9 @@
fi
@@ -11109,7 +11058,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -16317,48 +14322,23 @@
+@@ -16317,48 +14334,23 @@
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $_FLAGS"
@@ -11164,7 +11113,7 @@
$as_echo "$ac_cv_have_declaration_after_statement" >&6; }
if test "$ac_cv_have_declaration_after_statement" = "yes"; then
-@@ -16377,151 +14357,12 @@
+@@ -16377,151 +14369,12 @@
# Multimedia keys
# ***************
@@ -11320,7 +11269,7 @@
_ACEOF
fi
-@@ -16539,62 +14380,59 @@
+@@ -16539,62 +14392,59 @@
# Check whether --enable-introspection was given.
@@ -11409,7 +11358,7 @@
$as_echo "$found_introspection" >&6; }
INTROSPECTION_SCANNER=
-@@ -16635,9 +14473,7 @@
+@@ -16635,9 +14485,7 @@
if test "$found_introspection" = "yes"; then
EPIPHANY_FEATURES="$EPIPHANY_FEATURES introspection"
@@ -11420,7 +11369,7 @@
fi
-@@ -16645,22 +14481,20 @@
+@@ -16645,22 +14493,20 @@
# Seed
# ****
@@ -11447,7 +11396,7 @@
fi
if test "$enable_seed" = "yes"; then
-@@ -16669,40 +14503,44 @@
+@@ -16669,40 +14515,44 @@
SEED_REQUIRED=2.27.91
pkg_failed=no
@@ -11511,7 +11460,7 @@
fi
-@@ -16715,25 +14553,14 @@
+@@ -16715,25 +14565,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11540,7 +11489,7 @@
$SEED_PKG_ERRORS
-@@ -16743,22 +14570,11 @@
+@@ -16743,22 +14582,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.
@@ -11566,7 +11515,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -16767,20 +14583,17 @@
+@@ -16767,20 +14595,17 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11590,7 +11539,7 @@
fi
-@@ -16797,55 +14610,59 @@
+@@ -16797,55 +14622,59 @@
# NSS
# ***
@@ -11672,7 +11621,7 @@
fi
-@@ -16858,25 +14675,14 @@
+@@ -16858,25 +14687,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11701,7 +11650,7 @@
$NSS_PKG_ERRORS
-@@ -16886,22 +14692,11 @@
+@@ -16886,22 +14704,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.
@@ -11727,7 +11676,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -16910,20 +14705,17 @@
+@@ -16910,20 +14717,17 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11751,7 +11700,7 @@
fi
-@@ -16944,16 +14736,16 @@
+@@ -16944,16 +14748,16 @@
# Zeroconf bookmarks sites
@@ -11771,7 +11720,7 @@
$as_echo "$enable_zeroconf" >&6; }
if test "$enable_zeroconf" != "no"; then
-@@ -16961,52 +14753,56 @@
+@@ -16961,52 +14765,56 @@
pkg_failed=no
@@ -11849,7 +11798,7 @@
fi
-@@ -17019,18 +14815,18 @@
+@@ -17019,18 +14827,18 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11873,7 +11822,7 @@
$as_echo "no" >&6; }
have_avahi=no
elif test $pkg_failed = untried; then
-@@ -17038,15 +14834,13 @@
+@@ -17038,15 +14846,13 @@
else
AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS
AVAHI_LIBS=$pkg_cv_AVAHI_LIBS
@@ -11891,7 +11840,7 @@
elif test "$have_avahi" = "yes"; then
enable_zeroconf=yes
else
-@@ -17056,9 +14850,7 @@
+@@ -17056,9 +14862,7 @@
if test "$enable_zeroconf" = "yes"; then
@@ -11902,7 +11851,7 @@
fi
-@@ -17073,55 +14865,59 @@
+@@ -17073,55 +14877,59 @@
# NetworkManager
@@ -11984,7 +11933,7 @@
fi
-@@ -17134,14 +14930,14 @@
+@@ -17134,14 +14942,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12002,7 +11951,7 @@
$as_echo "no" >&6; }
have_network_manager=no
elif test $pkg_failed = untried; then
-@@ -17149,26 +14945,22 @@
+@@ -17149,26 +14957,22 @@
else
NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS
NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS
@@ -12033,7 +11982,7 @@
fi
-@@ -17209,18 +15001,18 @@
+@@ -17209,18 +15013,18 @@
ISO_CODES_REQUIRED=0.35
if test -n "$PKG_CONFIG" && \
@@ -12056,7 +12005,7 @@
$as_echo_n "checking whether iso-codes has iso-639 and iso-3166 domains... " >&6; }
if $PKG_CONFIG --variable=domains iso-codes | grep -q 639 && \
$PKG_CONFIG --variable=domains iso-codes | grep -q 3166 ; then
-@@ -17229,7 +15021,7 @@
+@@ -17229,7 +15033,7 @@
result=no
have_iso_codes=no
fi
@@ -12065,7 +12014,7 @@
$as_echo "$result" >&6; }
fi
-@@ -17240,14 +15032,10 @@
+@@ -17240,14 +15044,10 @@
_ACEOF
@@ -12082,7 +12031,7 @@
fi
GETTEXT_PACKAGE=epiphany
-@@ -17258,151 +15046,12 @@
+@@ -17258,151 +15058,12 @@
_ACEOF
@@ -12239,7 +12188,7 @@
_ACEOF
fi
-@@ -17410,16 +15059,12 @@
+@@ -17410,16 +15071,12 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -12259,7 +12208,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -17430,46 +15075,19 @@
+@@ -17430,207 +15087,45 @@
return 0;
}
_ACEOF
@@ -12291,31 +12240,31 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- am_cv_val_LC_MESSAGES=no
-+ am_cv_val_LC_MESSAGES=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
- $as_echo "$am_cv_val_LC_MESSAGES" >&6; }
- if test $am_cv_val_LC_MESSAGES = yes; then
-
+-$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
+- if test $am_cv_val_LC_MESSAGES = yes; then
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LC_MESSAGES 1
-_ACEOF
-+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
-
- fi
- fi
-@@ -17482,155 +15100,20 @@
- XGETTEXT=:
- INTLLIBS=
-
+-
+- fi
+- fi
+- USE_NLS=yes
+-
+-
+- gt_cv_have_gettext=no
+-
+- CATOBJEXT=NONE
+- XGETTEXT=:
+- INTLLIBS=
+-
- if test "${ac_cv_header_libintl_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
-$as_echo_n "checking for libintl.h... " >&6; }
@@ -12401,7 +12350,8 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
--fi
++ am_cv_val_LC_MESSAGES=no
+ fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
@@ -12443,12 +12393,30 @@
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_libintl_h=$ac_header_preproc
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-$as_echo "$ac_cv_header_libintl_h" >&6; }
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
++$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
++ if test $am_cv_val_LC_MESSAGES = yes; then
+
-fi
-if test "x$ac_cv_header_libintl_h" = x""yes; then
++$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
++
++ fi
++ fi
++ USE_NLS=yes
++
++
++ gt_cv_have_gettext=no
++
++ CATOBJEXT=NONE
++ XGETTEXT=:
++ INTLLIBS=
++
+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
gt_cv_func_dgettext_libintl="no"
@@ -12473,7 +12441,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -17643,54 +15126,25 @@
+@@ -17643,54 +15138,25 @@
return 0;
}
_ACEOF
@@ -12536,7 +12504,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -17703,141 +15157,26 @@
+@@ -17703,141 +15169,26 @@
return 0;
}
_ACEOF
@@ -12563,23 +12531,27 @@
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
gt_cv_func_dgettext_libc=yes
--else
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_func_dgettext_libc=no
--fi
++ gt_cv_func_dgettext_libc=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
+ fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
--$as_echo "$gt_cv_func_dgettext_libc" >&6; }
-- fi
--
-- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
+ $as_echo "$gt_cv_func_dgettext_libc" >&6; }
+ fi
+
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-
-for ac_func in bind_textdomain_codeset
-do
@@ -12661,16 +12633,12 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-+else
-+ gt_cv_func_dgettext_libc=no
- fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-
+-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
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -12678,11 +12646,6 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
-+$as_echo "$gt_cv_func_dgettext_libc" >&6; }
-+ fi
-+
-+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+ for ac_func in bind_textdomain_codeset
+do :
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
@@ -12693,7 +12656,7 @@
_ACEOF
fi
-@@ -17852,18 +15191,14 @@
+@@ -17852,18 +15203,14 @@
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -12715,7 +12678,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17881,55 +15216,26 @@
+@@ -17881,55 +15228,26 @@
return 0;
}
_ACEOF
@@ -12780,7 +12743,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17947,55 +15253,26 @@
+@@ -17947,55 +15265,26 @@
return 0;
}
_ACEOF
@@ -12845,7 +12808,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18013,43 +15290,18 @@
+@@ -18013,43 +15302,18 @@
return 0;
}
_ACEOF
@@ -12895,7 +12858,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -18059,22 +15311,18 @@
+@@ -18059,22 +15323,18 @@
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -12923,7 +12886,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18092,55 +15340,26 @@
+@@ -18092,55 +15352,26 @@
return 0;
}
_ACEOF
@@ -12988,7 +12951,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18158,43 +15377,18 @@
+@@ -18158,160 +15389,45 @@
return 0;
}
_ACEOF
@@ -13031,19 +12994,189 @@
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
+-$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
+- gt_cv_func_dgettext_libintl=yes
+- libintl_extra_libs=-liconv
+-else
+- :
+-fi
+-
+-else
+- :
+-fi
+-
+- fi
+-
+- #
+- # If we found libintl, then check in it for bind_textdomain_codeset();
+- # we'll prefer libc if neither have bind_textdomain_codeset(),
+- # and both have dgettext and ngettext
+- #
+- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
+- glib_save_LIBS="$LIBS"
+- LIBS="$LIBS -lintl $libintl_extra_libs"
+- unset ac_cv_func_bind_textdomain_codeset
+-
+-for ac_func in bind_textdomain_codeset
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
- $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
--if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
++$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
- gt_cv_func_dgettext_libintl=yes
- libintl_extra_libs=-liconv
- else
-@@ -18216,102 +15410,12 @@
++ gt_cv_func_dgettext_libintl=yes
++ libintl_extra_libs=-liconv
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
++ :
+ fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++else
++ :
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++
++ fi
++
++ #
++ # If we found libintl, then check in it for bind_textdomain_codeset();
++ # we'll prefer libc if neither have bind_textdomain_codeset(),
++ # and both have dgettext and ngettext
++ #
++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
++ glib_save_LIBS="$LIBS"
++ LIBS="$LIBS -lintl $libintl_extra_libs"
++ unset ac_cv_func_bind_textdomain_codeset
++ for ac_func in bind_textdomain_codeset
++do :
++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+ _ACEOF
+
+ fi
+@@ -18341,15 +15457,13 @@
+
+ if test "$gt_cv_have_gettext" = "yes"; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETTEXT 1
+-_ACEOF
++$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+
+ # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGFMT+set}" = set; then
++if test "${ac_cv_path_MSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case "$MSGFMT" in
+@@ -18374,118 +15488,28 @@
+ fi
+ MSGFMT="$ac_cv_path_MSGFMT"
+ if test "$MSGFMT" != "no"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+ $as_echo "$MSGFMT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ if test "$MSGFMT" != "no"; then
glib_save_LIBS="$LIBS"
- LIBS="$LIBS -lintl $libintl_extra_libs"
- unset ac_cv_func_bind_textdomain_codeset
--
--for ac_func in bind_textdomain_codeset
+ LIBS="$LIBS $INTLLIBS"
+-
+-for ac_func in dcgettext
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -13136,57 +13269,158 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+ for ac_func in bind_textdomain_codeset
++ for ac_func in dcgettext
+do :
-+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
++ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
++if test "x$ac_cv_func_dcgettext" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
++#define HAVE_DCGETTEXT 1
_ACEOF
fi
-@@ -18341,15 +15445,13 @@
-
- if test "$gt_cv_have_gettext" = "yes"; then
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETTEXT 1
--_ACEOF
-+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
-
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
+ done
+
+ MSGFMT_OPTS=
+- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
+ $as_echo_n "checking if msgfmt accepts -c... " >&6; }
+ cat >conftest.foo <<_ACEOF
+
+@@ -18500,14 +15524,14 @@
+ "Content-Transfer-Encoding: 8bit\n"
+
+ _ACEOF
+-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
++if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
+ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-else { $as_echo "$as_me:$LINENO: result: no" >&5
++else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ echo "$as_me: failed input was:" >&5
+ sed 's/^/| /' conftest.foo >&5
+@@ -18515,9 +15539,9 @@
+
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_MSGFMT+set}" = set; then
-+if test "${ac_cv_path_MSGFMT+set}" = set; then :
+-if test "${ac_cv_path_GMSGFMT+set}" = set; then
++if test "${ac_cv_path_GMSGFMT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- case "$MSGFMT" in
-@@ -18374,118 +15476,28 @@
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
- if test "$MSGFMT" != "no"; then
-- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
- $as_echo "$MSGFMT" >&6; }
+ case $GMSGFMT in
+@@ -18530,14 +15554,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+@@ -18546,19 +15570,19 @@
+ fi
+ GMSGFMT=$ac_cv_path_GMSGFMT
+ if test -n "$GMSGFMT"; then
+- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+ $as_echo "$GMSGFMT" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- if test "$MSGFMT" != "no"; then
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS $INTLLIBS"
--
--for ac_func in dcgettext
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+
+
+ # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XGETTEXT+set}" = set; then
++if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case "$XGETTEXT" in
+@@ -18583,18 +15607,14 @@
+ fi
+ XGETTEXT="$ac_cv_path_XGETTEXT"
+ if test "$XGETTEXT" != ":"; then
+- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+ $as_echo "$XGETTEXT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -18606,121 +15626,14 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ CATOBJEXT=.gmo
+ DATADIRNAME=share
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- case $host in
++ case $host in
+ *-*-solaris*)
+- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
+-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
@@ -13195,12 +13429,12 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
+-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
-
-/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
+- which can conflict with char bind_textdomain_codeset (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
@@ -13210,7 +13444,7 @@
-# include <assert.h>
-#endif
-
--#undef $ac_func
+-#undef bind_textdomain_codeset
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -13218,18 +13452,18 @@
-#ifdef __cplusplus
-extern "C"
-#endif
--char $ac_func ();
+-char bind_textdomain_codeset ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
+-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
-choke me
-#endif
-
-int
-main ()
-{
--return $ac_func ();
+-return bind_textdomain_codeset ();
- ;
- return 0;
-}
@@ -13255,256 +13489,8 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- eval "$as_ac_var=yes"
+- ac_cv_func_bind_textdomain_codeset=yes
-else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ for ac_func in dcgettext
-+do :
-+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
-+if test "x$ac_cv_func_dcgettext" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_DCGETTEXT 1
- _ACEOF
-
- fi
- done
-
- MSGFMT_OPTS=
-- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
- $as_echo_n "checking if msgfmt accepts -c... " >&6; }
- cat >conftest.foo <<_ACEOF
-
-@@ -18500,14 +15512,14 @@
- "Content-Transfer-Encoding: 8bit\n"
-
- _ACEOF
--if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
-+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
- ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
--else { $as_echo "$as_me:$LINENO: result: no" >&5
-+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- echo "$as_me: failed input was:" >&5
- sed 's/^/| /' conftest.foo >&5
-@@ -18515,9 +15527,9 @@
-
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GMSGFMT+set}" = set; then
-+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $GMSGFMT in
-@@ -18530,14 +15542,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -18546,19 +15558,19 @@
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
- if test -n "$GMSGFMT"; then
-- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
- $as_echo "$GMSGFMT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_XGETTEXT+set}" = set; then
-+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case "$XGETTEXT" in
-@@ -18583,144 +15595,33 @@
- fi
- XGETTEXT="$ac_cv_path_XGETTEXT"
- if test "$XGETTEXT" != ":"; then
-- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
- $as_echo "$XGETTEXT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
--fi
--
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--extern int _nl_msg_cat_cntr;
-- return _nl_msg_cat_cntr
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- CATOBJEXT=.gmo
-- DATADIRNAME=share
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- case $host in
-- *-*-solaris*)
-- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
--$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
--if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char bind_textdomain_codeset (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef bind_textdomain_codeset
-+fi
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char bind_textdomain_codeset ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
--choke me
--#endif
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
- int
- main ()
- {
--return bind_textdomain_codeset ();
-+extern int _nl_msg_cat_cntr;
-+ return _nl_msg_cat_cntr
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_bind_textdomain_codeset=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ CATOBJEXT=.gmo
-+ DATADIRNAME=share
- else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -13518,14 +13504,12 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-+ case $host in
-+ *-*-solaris*)
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -18735,10 +15636,8 @@
+@@ -18735,10 +15648,8 @@
;;
esac
fi
@@ -13538,7 +13522,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -18752,9 +15651,7 @@
+@@ -18752,9 +15663,7 @@
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -13549,7 +13533,7 @@
fi
-@@ -18762,7 +15659,7 @@
+@@ -18762,7 +15671,7 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -13558,7 +13542,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -18795,7 +15692,7 @@
+@@ -18795,7 +15704,7 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -13567,7 +13551,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -18820,7 +15717,7 @@
+@@ -18820,7 +15729,7 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -13576,7 +13560,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -18868,7 +15765,7 @@
+@@ -18868,7 +15777,7 @@
# Check whether --with-distributor-name was given.
@@ -13585,7 +13569,7 @@
withval=$with_distributor_name; LSB_DISTRIBUTOR="$withval"
fi
-@@ -18878,9 +15775,9 @@
+@@ -18878,9 +15787,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
@@ -13597,7 +13581,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LSB_RELEASE"; then
-@@ -18891,24 +15788,24 @@
+@@ -18891,24 +15800,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13627,7 +13611,7 @@
$as_echo "no" >&6; }
fi
-@@ -18938,35 +15835,33 @@
+@@ -18938,35 +15847,33 @@
gdu_cv_version_required=0.3.2
@@ -13671,7 +13655,7 @@
withval=$with_help_dir;
else
with_help_dir='${datadir}/gnome/help'
-@@ -18977,7 +15872,7 @@
+@@ -18977,7 +15884,7 @@
# Check whether --with-omf-dir was given.
@@ -13680,7 +13664,7 @@
withval=$with_omf_dir;
else
with_omf_dir='${datadir}/omf'
-@@ -18988,7 +15883,7 @@
+@@ -18988,7 +15895,7 @@
# Check whether --with-help-formats was given.
@@ -13689,7 +13673,7 @@
withval=$with_help_formats;
else
with_help_formats=''
-@@ -18998,7 +15893,7 @@
+@@ -18998,7 +15905,7 @@
# Check whether --enable-scrollkeeper was given.
@@ -13698,16 +13682,147 @@
enableval=$enable_scrollkeeper;
else
enable_scrollkeeper=yes
-@@ -19029,7 +15924,7 @@
-
-
+@@ -19027,9 +15934,137 @@
+
+
+
+-
++
++ # Extract the first word of "gtkdoc-check", so it can be a program name with args.
++set dummy gtkdoc-check; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ case $GTKDOC_CHECK in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
++if test -n "$GTKDOC_CHECK"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
++$as_echo "$GTKDOC_CHECK" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++ for ac_prog in gtkdoc-rebase
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ case $GTKDOC_REBASE in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
++if test -n "$GTKDOC_REBASE"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5
++$as_echo "$GTKDOC_REBASE" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++ test -n "$GTKDOC_REBASE" && break
++done
++test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true"
++
++ # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
++set dummy gtkdoc-mkpdf; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ case $GTKDOC_MKPDF in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
++if test -n "$GTKDOC_MKPDF"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5
++$as_echo "$GTKDOC_MKPDF" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++
++
# Check whether --with-html-dir was given.
-if test "${with_html_dir+set}" = set; then
+if test "${with_html_dir+set}" = set; then :
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -19039,7 +15934,7 @@
+@@ -19039,7 +16074,7 @@
# Check whether --enable-gtk-doc was given.
@@ -13716,7 +13831,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -19048,31 +15943,29 @@
+@@ -19048,68 +16083,40 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -13733,7 +13848,7 @@
- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&5
-$as_echo "$as_me: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "You need to have gtk-doc >= 1.0 installed to build gtk-doc" "$LINENO" 5
++ as_fn_error "You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" "$LINENO" 5
fi
fi
@@ -13744,50 +13859,104 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
$as_echo "$enable_gtk_doc" >&6; }
- for ac_prog in gtkdoc-check
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
+- for ac_prog in gtkdoc-check
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
+-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
-+if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $GTKDOC_CHECK in
-@@ -19085,14 +15978,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+- $as_echo_n "(cached) " >&6
++ # Check whether --enable-gtk-doc-html was given.
++if test "${enable_gtk_doc_html+set}" = set; then :
++ enableval=$enable_gtk_doc_html;
+ else
+- case $GTKDOC_CHECK in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
+- break 2
+- fi
-done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -19100,10 +15993,10 @@
- fi
- GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
- if test -n "$GTKDOC_CHECK"; then
+-done
+-IFS=$as_save_IFS
+-
+- ;;
+-esac
++ enable_gtk_doc_html=yes
+ fi
+-GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
+-if test -n "$GTKDOC_CHECK"; then
- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
- $as_echo "$GTKDOC_CHECK" >&6; }
+-$as_echo "$GTKDOC_CHECK" >&6; }
++
++ # Check whether --enable-gtk-doc-pdf was given.
++if test "${enable_gtk_doc_pdf+set}" = set; then :
++ enableval=$enable_gtk_doc_pdf;
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -19135,9 +16028,7 @@
+-$as_echo "no" >&6; }
++ enable_gtk_doc_pdf=no
+ fi
+
+
+- test -n "$GTKDOC_CHECK" && break
+-done
++ if test -z "$GTKDOC_MKPDF"; then
++ enable_gtk_doc_pdf=no
++ fi
+
+
+ if test x$enable_gtk_doc = xyes; then
+@@ -19120,6 +16127,22 @@
+ ENABLE_GTK_DOC_FALSE=
+ fi
+
++ if test x$enable_gtk_doc_html = xyes; then
++ GTK_DOC_BUILD_HTML_TRUE=
++ GTK_DOC_BUILD_HTML_FALSE='#'
++else
++ GTK_DOC_BUILD_HTML_TRUE='#'
++ GTK_DOC_BUILD_HTML_FALSE=
++fi
++
++ if test x$enable_gtk_doc_pdf = xyes; then
++ GTK_DOC_BUILD_PDF_TRUE=
++ GTK_DOC_BUILD_PDF_FALSE='#'
++else
++ GTK_DOC_BUILD_PDF_TRUE='#'
++ GTK_DOC_BUILD_PDF_FALSE=
++fi
++
+ if test -n "$LIBTOOL"; then
+ GTK_DOC_USE_LIBTOOL_TRUE=
+ GTK_DOC_USE_LIBTOOL_FALSE='#'
+@@ -19128,6 +16151,14 @@
+ GTK_DOC_USE_LIBTOOL_FALSE=
+ fi
+
++ if test -n "$GTKDOC_REBASE"; then
++ GTK_DOC_USE_REBASE_TRUE=
++ GTK_DOC_USE_REBASE_FALSE='#'
++else
++ GTK_DOC_USE_REBASE_TRUE='#'
++ GTK_DOC_USE_REBASE_FALSE=
++fi
++
+
+
+ # ************
+@@ -19135,9 +16166,7 @@
# ************
@@ -13798,7 +13967,7 @@
ac_config_files="$ac_config_files Makefile data/Makefile data/epiphany-${EPIPHANY_API_VERSION}.pc:data/epiphany.pc.in data/epiphany.desktop.in data/bme.desktop.in data/glade/Makefile data/icons/Makefile data/art/Makefile data/ui/Makefile doc/Makefile doc/reference/Makefile lib/Makefile lib/egg/Makefile lib/widgets/Makefile embed/Makefile src/Makefile src/bookmarks/Makefile src/epiphany.h help/Makefile po/Makefile.in tests/Makefile"
-@@ -19170,13 +16061,13 @@
+@@ -19170,13 +16199,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -13814,7 +13983,7 @@
esac ;;
esac
done
-@@ -19184,8 +16075,8 @@
+@@ -19184,8 +16213,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -13825,7 +13994,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -19208,11 +16099,11 @@
+@@ -19208,11 +16237,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" &&
@@ -13839,7 +14008,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -19232,8 +16123,8 @@
+@@ -19232,8 +16261,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.
@@ -13850,7 +14019,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -19249,136 +16140,86 @@
+@@ -19249,136 +16278,98 @@
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -14000,6 +14169,14 @@
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
++if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
++ as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
++if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
++ as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
@@ -14008,6 +14185,10 @@
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
++if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
++ as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -14024,7 +14205,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -19388,17 +16229,18 @@
+@@ -19388,17 +16379,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -14050,7 +14231,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -19406,23 +16248,15 @@
+@@ -19406,23 +16398,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -14079,7 +14260,7 @@
as_nl='
'
export as_nl
-@@ -19430,7 +16264,13 @@
+@@ -19430,7 +16414,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
@@ -14094,7 +14275,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -19441,7 +16281,7 @@
+@@ -19441,7 +16431,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -14103,7 +14284,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -19464,13 +16304,6 @@
+@@ -19464,13 +16454,6 @@
}
fi
@@ -14117,7 +14298,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -19480,15 +16313,15 @@
+@@ -19480,15 +16463,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -14136,7 +14317,7 @@
IFS=$as_save_IFS
;;
-@@ -19500,12 +16333,16 @@
+@@ -19500,12 +16483,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -14157,7 +14338,7 @@
done
PS1='$ '
PS2='> '
-@@ -19517,7 +16354,89 @@
+@@ -19517,7 +16504,89 @@
LANGUAGE=C
export LANGUAGE
@@ -14248,7 +14429,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -19531,8 +16450,12 @@
+@@ -19531,8 +16600,12 @@
as_basename=false
fi
@@ -14262,7 +14443,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -19552,76 +16475,25 @@
+@@ -19552,76 +16625,25 @@
}
s/.*/./; q'`
@@ -14350,7 +14531,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -19650,8 +16522,56 @@
+@@ -19650,8 +16672,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -14408,7 +14589,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -19670,10 +16590,10 @@
+@@ -19670,10 +16740,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -14421,7 +14602,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -19688,13 +16608,19 @@
+@@ -19688,13 +16758,19 @@
exec 6>&1
@@ -14443,7 +14624,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -19726,13 +16652,15 @@
+@@ -19726,13 +16802,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -14462,7 +14643,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -19751,16 +16679,17 @@
+@@ -19751,16 +16829,17 @@
Configuration commands:
$config_commands
@@ -14484,7 +14665,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -19796,6 +16725,8 @@
+@@ -19796,6 +16875,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -14493,7 +14674,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -19803,20 +16734,19 @@
+@@ -19803,20 +16884,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -14518,7 +14699,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -19824,11 +16754,10 @@
+@@ -19824,11 +16904,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -14533,7 +14714,7 @@
ac_need_defaults=false ;;
esac
-@@ -20163,9 +17092,7 @@
+@@ -20163,9 +17242,7 @@
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -14544,7 +14725,7 @@
esac
done
-@@ -20192,7 +17119,7 @@
+@@ -20192,7 +17269,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -14553,7 +14734,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -20203,11 +17130,7 @@
+@@ -20203,11 +17280,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -14566,7 +14747,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -20215,10 +17138,16 @@
+@@ -20215,10 +17288,16 @@
if test -n "$CONFIG_FILES"; then
@@ -14585,7 +14766,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -20232,24 +17161,18 @@
+@@ -20232,24 +17311,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -14613,7 +14794,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -20271,7 +17194,7 @@
+@@ -20271,7 +17344,7 @@
t delim
:nl
h
@@ -14622,7 +14803,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -20285,7 +17208,7 @@
+@@ -20285,7 +17358,7 @@
t nl
:delim
h
@@ -14631,7 +14812,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -20338,9 +17261,7 @@
+@@ -20338,9 +17411,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -14642,7 +14823,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -20381,9 +17302,7 @@
+@@ -20381,9 +17452,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -14653,7 +14834,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -20468,9 +17387,7 @@
+@@ -20468,9 +17537,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -14664,7 +14845,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -20483,9 +17400,7 @@
+@@ -20483,9 +17550,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -14675,7 +14856,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -20513,12 +17428,10 @@
+@@ -20513,12 +17578,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -14690,7 +14871,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -20529,7 +17442,7 @@
+@@ -20529,7 +17592,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -14699,7 +14880,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -20542,9 +17455,7 @@
+@@ -20542,9 +17605,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -14710,7 +14891,7 @@
esac
;;
esac
-@@ -20572,47 +17483,7 @@
+@@ -20572,47 +17633,7 @@
q
}
s/.*/./; q'`
@@ -14759,7 +14940,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -20669,7 +17540,6 @@
+@@ -20669,7 +17690,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=
@@ -14767,7 +14948,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -20679,12 +17549,11 @@
+@@ -20679,12 +17699,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -14782,7 +14963,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -20694,7 +17563,7 @@
+@@ -20694,7 +17713,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -14791,7 +14972,7 @@
esac
_ACEOF
-@@ -20723,14 +17592,12 @@
+@@ -20723,14 +17742,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -14808,7 +14989,7 @@
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
-@@ -20740,9 +17607,7 @@
+@@ -20740,9 +17757,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -14819,7 +15000,7 @@
;;
:H)
#
-@@ -20753,25 +17618,19 @@
+@@ -20753,25 +17768,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -14849,7 +15030,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -20809,7 +17668,7 @@
+@@ -20809,7 +17818,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -14858,7 +15039,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -20904,47 +17763,7 @@
+@@ -20904,47 +17913,7 @@
q
}
s/.*/./; q'`
@@ -14907,7 +15088,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -21591,9 +18410,7 @@
+@@ -21591,9 +18560,7 @@
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -14918,7 +15099,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -21616,15 +18433,12 @@
+@@ -21616,15 +18583,12 @@
done # for ac_tag
@@ -14936,7 +15117,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -21645,10 +18459,10 @@
+@@ -21645,10 +18609,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.
@@ -14949,16 +15130,25 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/data/art/Makefile.in epiphany-browser-2.29.5/data/art/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/data/art/Makefile.in epiphany-browser-2.29.5/data/art/Makefile.in
--- epiphany-browser-2.29.5.old/data/art/Makefile.in 2010-01-11 21:37:19.000000000 +0100
-+++ epiphany-browser-2.29.5/data/art/Makefile.in 2010-01-13 10:10:37.142518346 +0100
++++ epiphany-browser-2.29.5/data/art/Makefile.in 2010-01-14 18:15:48.724690412 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -194,6 +194,7 @@
+@@ -141,6 +141,8 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+ INSTALL = @INSTALL@
+@@ -194,6 +196,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -14966,16 +15156,25 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/data/glade/Makefile.in epiphany-browser-2.29.5/data/glade/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/data/glade/Makefile.in epiphany-browser-2.29.5/data/glade/Makefile.in
--- epiphany-browser-2.29.5.old/data/glade/Makefile.in 2010-01-11 21:37:20.000000000 +0100
-+++ epiphany-browser-2.29.5/data/glade/Makefile.in 2010-01-13 10:10:37.266519920 +0100
++++ epiphany-browser-2.29.5/data/glade/Makefile.in 2010-01-14 18:15:48.784689799 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -194,6 +194,7 @@
+@@ -141,6 +141,8 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+ INSTALL = @INSTALL@
+@@ -194,6 +196,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -14983,16 +15182,25 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/data/icons/Makefile.in epiphany-browser-2.29.5/data/icons/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/data/icons/Makefile.in epiphany-browser-2.29.5/data/icons/Makefile.in
--- epiphany-browser-2.29.5.old/data/icons/Makefile.in 2010-01-11 21:37:20.000000000 +0100
-+++ epiphany-browser-2.29.5/data/icons/Makefile.in 2010-01-13 10:10:37.410520137 +0100
++++ epiphany-browser-2.29.5/data/icons/Makefile.in 2010-01-14 18:15:48.840689378 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -172,6 +172,7 @@
+@@ -119,6 +119,8 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+ INSTALL = @INSTALL@
+@@ -172,6 +174,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15000,16 +15208,25 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/data/Makefile.in epiphany-browser-2.29.5/data/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/data/Makefile.in epiphany-browser-2.29.5/data/Makefile.in
--- epiphany-browser-2.29.5.old/data/Makefile.in 2010-01-11 21:37:19.000000000 +0100
-+++ epiphany-browser-2.29.5/data/Makefile.in 2010-01-13 10:10:37.010520212 +0100
++++ epiphany-browser-2.29.5/data/Makefile.in 2010-01-14 18:15:48.668690066 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -244,6 +244,7 @@
+@@ -191,6 +191,8 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+ INSTALL = @INSTALL@
+@@ -244,6 +246,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15017,7 +15234,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -625,7 +626,7 @@
+@@ -625,7 +628,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -15026,7 +15243,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -650,7 +651,7 @@
+@@ -650,7 +653,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -15035,16 +15252,25 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/data/ui/Makefile.in epiphany-browser-2.29.5/data/ui/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/data/ui/Makefile.in epiphany-browser-2.29.5/data/ui/Makefile.in
--- epiphany-browser-2.29.5.old/data/ui/Makefile.in 2010-01-11 21:37:20.000000000 +0100
-+++ epiphany-browser-2.29.5/data/ui/Makefile.in 2010-01-13 10:10:37.562523264 +0100
++++ epiphany-browser-2.29.5/data/ui/Makefile.in 2010-01-14 18:15:48.900689956 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -194,6 +194,7 @@
+@@ -141,6 +141,8 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+ INSTALL = @INSTALL@
+@@ -194,6 +196,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15052,16 +15278,25 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/doc/Makefile.in epiphany-browser-2.29.5/doc/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/doc/Makefile.in epiphany-browser-2.29.5/doc/Makefile.in
--- epiphany-browser-2.29.5.old/doc/Makefile.in 2010-01-11 21:37:20.000000000 +0100
-+++ epiphany-browser-2.29.5/doc/Makefile.in 2010-01-13 10:10:37.706523474 +0100
++++ epiphany-browser-2.29.5/doc/Makefile.in 2010-01-14 18:15:48.960689622 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -235,6 +235,7 @@
+@@ -182,6 +182,8 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+ INSTALL = @INSTALL@
+@@ -235,6 +237,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15069,7 +15304,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -400,7 +401,7 @@
+@@ -400,7 +403,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -15078,7 +15313,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -425,7 +426,7 @@
+@@ -425,7 +428,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -15087,16 +15322,25 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/doc/reference/Makefile.in epiphany-browser-2.29.5/doc/reference/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/doc/reference/Makefile.in epiphany-browser-2.29.5/doc/reference/Makefile.in
--- epiphany-browser-2.29.5.old/doc/reference/Makefile.in 2010-01-11 21:37:20.000000000 +0100
-+++ epiphany-browser-2.29.5/doc/reference/Makefile.in 2010-01-13 10:10:37.874520309 +0100
++++ epiphany-browser-2.29.5/doc/reference/Makefile.in 2010-01-14 18:15:49.028691209 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -176,6 +176,7 @@
+@@ -123,6 +123,8 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+ INSTALL = @INSTALL@
+@@ -176,6 +178,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15104,16 +15348,34 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/embed/Makefile.in epiphany-browser-2.29.5/embed/Makefile.in
+@@ -667,7 +670,7 @@
+ @ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ @ENABLE_GTK_DOC_TRUE@ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ @ENABLE_GTK_DOC_TRUE@ @echo '-- Fixing Crossreferences'
+- at ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
++ at ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ @ENABLE_GTK_DOC_TRUE@ touch html-build.stamp
+
+ ##############
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/embed/Makefile.in epiphany-browser-2.29.5/embed/Makefile.in
--- epiphany-browser-2.29.5.old/embed/Makefile.in 2010-01-11 21:37:20.000000000 +0100
-+++ epiphany-browser-2.29.5/embed/Makefile.in 2010-01-13 10:10:38.106520476 +0100
++++ epiphany-browser-2.29.5/embed/Makefile.in 2010-01-14 18:15:49.172690435 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -249,6 +249,7 @@
+@@ -196,6 +196,8 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+ INSTALL = @INSTALL@
+@@ -249,6 +251,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15121,10 +15383,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/gtk-doc.make epiphany-browser-2.29.5/gtk-doc.make
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/gtk-doc.make epiphany-browser-2.29.5/gtk-doc.make
--- epiphany-browser-2.29.5.old/gtk-doc.make 1970-01-01 01:00:00.000000000 +0100
-+++ epiphany-browser-2.29.5/gtk-doc.make 2010-01-13 10:10:30.614522331 +0100
-@@ -0,0 +1,196 @@
++++ epiphany-browser-2.29.5/gtk-doc.make 2010-01-14 18:15:44.164691233 +0100
+@@ -0,0 +1,224 @@
+# -*- mode: makefile -*-
+
+####################################
@@ -15132,13 +15394,13 @@
+####################################
+
+if GTK_DOC_USE_LIBTOOL
-+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
++GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_RUN = $(LIBTOOL) --mode=execute
+else
+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+GTKDOC_RUN = sh -c
++GTKDOC_RUN =
+endif
+
+# We set GPATH here; this gives us semantics for GNU make
@@ -15158,7 +15420,9 @@
+ $(DOC_MODULE)-overrides.txt
+
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-+ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
++ pdf-build.stamp \
++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
++ $(srcdir)/pdf.stamp
+
+SCANOBJ_FILES = \
+ $(DOC_MODULE).args \
@@ -15175,12 +15439,23 @@
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+
+if ENABLE_GTK_DOC
-+all-local: html-build.stamp
++if GTK_DOC_BUILD_HTML
++HTML_BUILD_STAMP=html-build.stamp
++else
++HTML_BUILD_STAMP=
++endif
++if GTK_DOC_BUILD_PDF
++PDF_BUILD_STAMP=pdf-build.stamp
++else
++PDF_BUILD_STAMP=
++endif
++
++all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+else
+all-local:
+endif
+
-+docs: html-build.stamp
++docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+
+$(REPORT_FILES): sgml-build.stamp
+
@@ -15189,9 +15464,9 @@
+scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+ @echo 'gtk-doc: Scanning header files'
+ @-chmod -R u+w $(srcdir)
-+ cd $(srcdir) && \
++ @cd $(srcdir) && \
+ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-+ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
++ @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+ else \
+ cd $(srcdir) ; \
@@ -15199,7 +15474,7 @@
+ test -f $$i || touch $$i ; \
+ done \
+ fi
-+ touch scan-build.stamp
++ @touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+ @true
@@ -15209,24 +15484,23 @@
+tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+ @echo 'gtk-doc: Rebuilding template files'
+ @-chmod -R u+w $(srcdir)
-+ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-+ touch tmpl-build.stamp
++ @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
++ @touch tmpl-build.stamp
+
+tmpl.stamp: tmpl-build.stamp
+ @true
+
-+tmpl/*.sgml:
++$(srcdir)/tmpl/*.sgml:
+ @true
-+
+
+#### xml ####
+
-+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
++sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+ @echo 'gtk-doc: Building XML'
+ @-chmod -R u+w $(srcdir)
-+ cd $(srcdir) && \
++ @cd $(srcdir) && \
+ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
-+ touch sgml-build.stamp
++ @touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
+ @true
@@ -15236,18 +15510,37 @@
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ @echo 'gtk-doc: Building HTML'
+ @-chmod -R u+w $(srcdir)
-+ rm -rf $(srcdir)/html
-+ mkdir $(srcdir)/html
-+ mkhtml_options=""; \
++ @rm -rf $(srcdir)/html
++ @mkdir $(srcdir)/html
++ @mkhtml_options=""; \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
+ if test "$(?)" = "0"; then \
+ mkhtml_options=--path="$(srcdir)"; \
-+ fi
-+ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-+ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
++ fi; \
++ cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
++ @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ @echo 'gtk-doc: Fixing cross-references'
-+ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-+ touch html-build.stamp
++ @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
++ @touch html-build.stamp
++
++#### pdf ####
++
++pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
++ @echo 'gtk-doc: Building PDF'
++ @-chmod -R u+w $(srcdir)
++ @rm -rf $(srcdir)/$(DOC_MODULE).pdf
++ @mkpdf_imgdirs=""; \
++ if test "x$(HTML_IMAGES)" != "x"; then \
++ for img in $(HTML_IMAGES); do \
++ part=`dirname $$img`; \
++ echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
++ if test $$? != 0; then \
++ mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
++ fi; \
++ done; \
++ fi; \
++ cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
++ @touch pdf-build.stamp
+
+##############
+
@@ -15257,14 +15550,14 @@
+
+distclean-local:
+ cd $(srcdir) && \
-+ rm -rf xml $(REPORT_FILES) \
++ rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
+ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+maintainer-clean-local: clean
+ cd $(srcdir) && rm -rf xml html
+
+install-data-local:
-+ installfiles=`echo $(srcdir)/html/*`; \
++ @installfiles=`echo $(srcdir)/html/*`; \
+ if test "$$installfiles" = '$(srcdir)/html/*'; \
+ then echo '-- Nothing to install' ; \
+ else \
@@ -15284,12 +15577,11 @@
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
-+ ! which gtkdoc-rebase >/dev/null 2>&1 || \
-+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
++ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
+ fi
+
+uninstall-local:
-+ if test -n "$(DOC_MODULE_VERSION)"; then \
++ @if test -n "$(DOC_MODULE_VERSION)"; then \
+ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+ else \
+ installdir="$(DESTDIR)$(TARGET_DIR)"; \
@@ -15309,28 +15601,35 @@
+
+dist-hook: dist-check-gtkdoc dist-hook-local
+ mkdir $(distdir)/tmpl
-+ mkdir $(distdir)/xml
+ mkdir $(distdir)/html
+ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-+ -cp $(srcdir)/xml/*.xml $(distdir)/xml
+ cp $(srcdir)/html/* $(distdir)/html
++ -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
-+ ! which gtkdoc-rebase >/dev/null 2>&1 || \
-+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/help/Makefile.in epiphany-browser-2.29.5/help/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/help/Makefile.in epiphany-browser-2.29.5/help/Makefile.in
--- epiphany-browser-2.29.5.old/help/Makefile.in 2010-01-11 21:37:20.000000000 +0100
-+++ epiphany-browser-2.29.5/help/Makefile.in 2010-01-13 10:10:38.194519855 +0100
++++ epiphany-browser-2.29.5/help/Makefile.in 2010-01-14 18:15:49.256690011 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -195,6 +195,7 @@
+@@ -142,6 +142,8 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+ INSTALL = @INSTALL@
+@@ -195,6 +197,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15338,16 +15637,25 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/lib/egg/Makefile.in epiphany-browser-2.29.5/lib/egg/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/lib/egg/Makefile.in epiphany-browser-2.29.5/lib/egg/Makefile.in
--- epiphany-browser-2.29.5.old/lib/egg/Makefile.in 2010-01-11 21:37:21.000000000 +0100
-+++ epiphany-browser-2.29.5/lib/egg/Makefile.in 2010-01-13 10:10:38.550520620 +0100
++++ epiphany-browser-2.29.5/lib/egg/Makefile.in 2010-01-14 18:15:49.716689535 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -218,6 +218,7 @@
+@@ -165,6 +165,8 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+ INSTALL = @INSTALL@
+@@ -218,6 +220,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15355,16 +15663,25 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/lib/Makefile.in epiphany-browser-2.29.5/lib/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/lib/Makefile.in epiphany-browser-2.29.5/lib/Makefile.in
--- epiphany-browser-2.29.5.old/lib/Makefile.in 2010-01-11 21:37:21.000000000 +0100
-+++ epiphany-browser-2.29.5/lib/Makefile.in 2010-01-13 10:10:38.418520037 +0100
++++ epiphany-browser-2.29.5/lib/Makefile.in 2010-01-14 18:15:49.584689381 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -328,6 +328,7 @@
+@@ -275,6 +275,8 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+ INSTALL = @INSTALL@
+@@ -328,6 +330,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15372,7 +15689,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -444,7 +445,7 @@
+@@ -444,7 +447,7 @@
-I$(top_srcdir)/lib/egg \
-DDATADIR="\"$(datadir)\"" \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -15381,7 +15698,7 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-@@ -822,7 +823,7 @@
+@@ -822,7 +825,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -15390,7 +15707,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -847,7 +848,7 @@
+@@ -847,7 +850,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -15399,16 +15716,25 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/lib/widgets/Makefile.in epiphany-browser-2.29.5/lib/widgets/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/lib/widgets/Makefile.in epiphany-browser-2.29.5/lib/widgets/Makefile.in
--- epiphany-browser-2.29.5.old/lib/widgets/Makefile.in 2010-01-11 21:37:21.000000000 +0100
-+++ epiphany-browser-2.29.5/lib/widgets/Makefile.in 2010-01-13 10:10:38.670519041 +0100
++++ epiphany-browser-2.29.5/lib/widgets/Makefile.in 2010-01-14 18:15:49.824690206 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -213,6 +213,7 @@
+@@ -160,6 +160,8 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+ INSTALL = @INSTALL@
+@@ -213,6 +215,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15416,9 +15742,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/ltmain.sh epiphany-browser-2.29.5/ltmain.sh
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/ltmain.sh epiphany-browser-2.29.5/ltmain.sh
--- epiphany-browser-2.29.5.old/ltmain.sh 2010-01-05 19:51:24.000000000 +0100
-+++ epiphany-browser-2.29.5/ltmain.sh 2010-01-13 10:10:29.794518588 +0100
++++ epiphany-browser-2.29.5/ltmain.sh 2010-01-14 18:15:43.704713426 +0100
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -15497,9 +15823,58 @@
esac
;;
no)
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/m4/libtool.m4 epiphany-browser-2.29.5/m4/libtool.m4
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/m4/gtk-doc.m4 epiphany-browser-2.29.5/m4/gtk-doc.m4
+--- epiphany-browser-2.29.5.old/m4/gtk-doc.m4 2010-01-05 19:51:24.000000000 +0100
++++ epiphany-browser-2.29.5/m4/gtk-doc.m4 2010-01-14 18:15:44.164691233 +0100
+@@ -8,6 +8,12 @@
+ [
+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
++
++ dnl check for tools we added during development
++ AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
++ AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
++ AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
++
+ dnl for overriding the documentation installation directory
+ AC_ARG_WITH([html-dir],
+ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+@@ -26,14 +32,30 @@
+ [PKG_CHECK_EXISTS([gtk-doc],,
+ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
+ [PKG_CHECK_EXISTS([gtk-doc >= $1],,
+- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
++ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
+ fi
+
+ AC_MSG_CHECKING([whether to build gtk-doc documentation])
+ AC_MSG_RESULT($enable_gtk_doc)
+
+- AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
++ dnl enable/disable output formats
++ AC_ARG_ENABLE([gtk-doc-html],
++ AS_HELP_STRING([--enable-gtk-doc-html],
++ [build documentation in html format [[default=yes]]]),,
++ [enable_gtk_doc_html=yes])
++ AC_ARG_ENABLE([gtk-doc-pdf],
++ AS_HELP_STRING([--enable-gtk-doc-pdf],
++ [build documentation in pdf format [[default=no]]]),,
++ [enable_gtk_doc_pdf=no])
++
++ if test -z "$GTKDOC_MKPDF"; then
++ enable_gtk_doc_pdf=no
++ fi
++
+
+ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
++ AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
++ AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
++ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
+ ])
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/m4/libtool.m4 epiphany-browser-2.29.5/m4/libtool.m4
--- epiphany-browser-2.29.5.old/m4/libtool.m4 2010-01-05 19:51:24.000000000 +0100
-+++ epiphany-browser-2.29.5/m4/libtool.m4 2010-01-13 10:10:29.898518891 +0100
++++ epiphany-browser-2.29.5/m4/libtool.m4 2010-01-14 18:15:43.752717784 +0100
@@ -2445,7 +2445,7 @@
;;
@@ -15656,16 +16031,25 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/Makefile.in epiphany-browser-2.29.5/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/Makefile.in epiphany-browser-2.29.5/Makefile.in
--- epiphany-browser-2.29.5.old/Makefile.in 2010-01-11 21:37:22.000000000 +0100
-+++ epiphany-browser-2.29.5/Makefile.in 2010-01-13 10:10:39.434545747 +0100
++++ epiphany-browser-2.29.5/Makefile.in 2010-01-14 18:15:50.368689658 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -231,6 +231,7 @@
+@@ -178,6 +178,8 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+ INSTALL = @INSTALL@
+@@ -231,6 +233,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15673,7 +16057,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -399,7 +400,7 @@
+@@ -399,7 +402,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -15682,7 +16066,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -424,7 +425,7 @@
+@@ -424,7 +427,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -15691,7 +16075,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -588,8 +589,7 @@
+@@ -588,8 +591,7 @@
fi; \
done
-test -n "$(am__skip_mode_fix)" \
@@ -15701,7 +16085,7 @@
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -632,17 +632,17 @@
+@@ -632,17 +634,17 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
@@ -15723,9 +16107,9 @@
*.zip*) \
unzip $(distdir).zip ;;\
esac
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/po/Makefile.in.in epiphany-browser-2.29.5/po/Makefile.in.in
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/po/Makefile.in.in epiphany-browser-2.29.5/po/Makefile.in.in
--- epiphany-browser-2.29.5.old/po/Makefile.in.in 2010-01-05 19:51:24.000000000 +0100
-+++ epiphany-browser-2.29.5/po/Makefile.in.in 2010-01-13 10:10:30.558520869 +0100
++++ epiphany-browser-2.29.5/po/Makefile.in.in 2010-01-14 18:15:44.132698760 +0100
@@ -129,7 +129,7 @@
done
@@ -15735,16 +16119,25 @@
# Define this as empty until I found a useful application.
install-exec installcheck:
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/src/bookmarks/Makefile.in epiphany-browser-2.29.5/src/bookmarks/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/src/bookmarks/Makefile.in epiphany-browser-2.29.5/src/bookmarks/Makefile.in
--- epiphany-browser-2.29.5.old/src/bookmarks/Makefile.in 2010-01-11 21:37:22.000000000 +0100
-+++ epiphany-browser-2.29.5/src/bookmarks/Makefile.in 2010-01-13 10:10:39.206521518 +0100
++++ epiphany-browser-2.29.5/src/bookmarks/Makefile.in 2010-01-14 18:15:50.224690971 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -261,6 +261,7 @@
+@@ -208,6 +208,8 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+ INSTALL = @INSTALL@
+@@ -261,6 +263,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15752,16 +16145,25 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/src/Makefile.in epiphany-browser-2.29.5/src/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/src/Makefile.in epiphany-browser-2.29.5/src/Makefile.in
--- epiphany-browser-2.29.5.old/src/Makefile.in 2010-01-11 21:37:21.000000000 +0100
-+++ epiphany-browser-2.29.5/src/Makefile.in 2010-01-13 10:10:38.994520412 +0100
++++ epiphany-browser-2.29.5/src/Makefile.in 2010-01-14 18:15:50.072689743 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -384,6 +384,7 @@
+@@ -331,6 +331,8 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+ INSTALL = @INSTALL@
+@@ -384,6 +386,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15769,7 +16171,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -511,8 +512,8 @@
+@@ -511,8 +514,8 @@
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
@@ -15780,7 +16182,7 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
-@@ -1181,7 +1182,7 @@
+@@ -1181,7 +1184,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -15789,7 +16191,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -1206,7 +1207,7 @@
+@@ -1206,7 +1209,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -15798,16 +16200,25 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.5.old/tests/Makefile.in epiphany-browser-2.29.5/tests/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/tests/Makefile.in epiphany-browser-2.29.5/tests/Makefile.in
--- epiphany-browser-2.29.5.old/tests/Makefile.in 2010-01-11 21:37:22.000000000 +0100
-+++ epiphany-browser-2.29.5/tests/Makefile.in 2010-01-13 10:10:39.322520751 +0100
++++ epiphany-browser-2.29.5/tests/Makefile.in 2010-01-14 18:15:50.300689738 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -222,6 +222,7 @@
+@@ -169,6 +169,8 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+ INSTALL = @INSTALL@
+@@ -222,6 +224,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=22788&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series [utf-8] Thu Jan 14 17:19:37 2010
@@ -7,5 +7,6 @@
10_smart_bookmarks.patch
12_safetypes.patch
90_schemas-syntax-error.patch
+91_gtk-doc-1.13.patch
99_autoreconf.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list