r24277 - /desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed May 5 18:00:40 UTC 2010
Author: joss
Date: Wed May 5 18:00:29 2010
New Revision: 24277
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24277
Log:
oops, forgot autoconf
Modified:
desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch
Modified: desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch?rev=24277&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch [utf-8] Wed May 5 18:00:29 2010
@@ -6,8 +6,8 @@
Index: gnome-panel-2.30.0/aclocal.m4
===================================================================
---- gnome-panel-2.30.0.orig/aclocal.m4 2010-03-30 02:52:39.000000000 +0200
-+++ gnome-panel-2.30.0/aclocal.m4 2010-05-05 19:51:55.315835236 +0200
+--- gnome-panel-2.30.0.orig/aclocal.m4 2010-05-05 19:55:21.691337726 +0200
++++ gnome-panel-2.30.0/aclocal.m4 2010-05-05 19:59:13.911337106 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
@@ -4002,8 +4002,8 @@
m4_include([m4/gnome-doc-utils.m4])
Index: gnome-panel-2.30.0/applets/clock/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/applets/clock/Makefile.in 2010-03-30 02:52:45.000000000 +0200
-+++ gnome-panel-2.30.0/applets/clock/Makefile.in 2010-05-05 19:54:01.611335860 +0200
+--- gnome-panel-2.30.0.orig/applets/clock/Makefile.in 2010-05-05 19:55:21.667338654 +0200
++++ gnome-panel-2.30.0/applets/clock/Makefile.in 2010-05-05 19:59:13.911337106 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -4038,8 +4038,8 @@
*=* | --[!k]*);; \
Index: gnome-panel-2.30.0/applets/clock/pixmaps/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/applets/clock/pixmaps/Makefile.in 2010-03-30 02:52:45.000000000 +0200
-+++ gnome-panel-2.30.0/applets/clock/pixmaps/Makefile.in 2010-05-05 19:54:01.711336636 +0200
+--- gnome-panel-2.30.0.orig/applets/clock/pixmaps/Makefile.in 2010-05-05 19:55:21.635340870 +0200
++++ gnome-panel-2.30.0/applets/clock/pixmaps/Makefile.in 2010-05-05 19:59:13.911337106 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -4056,8 +4056,8 @@
PANEL_LIBS = @PANEL_LIBS@
Index: gnome-panel-2.30.0/applets/fish/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/applets/fish/Makefile.in 2010-03-30 02:52:45.000000000 +0200
-+++ gnome-panel-2.30.0/applets/fish/Makefile.in 2010-05-05 19:54:01.855334959 +0200
+--- gnome-panel-2.30.0.orig/applets/fish/Makefile.in 2010-05-05 19:55:21.607340241 +0200
++++ gnome-panel-2.30.0/applets/fish/Makefile.in 2010-05-05 19:59:13.915337684 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -4074,8 +4074,8 @@
PANEL_LIBS = @PANEL_LIBS@
Index: gnome-panel-2.30.0/applets/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/applets/Makefile.in 2010-03-30 02:52:44.000000000 +0200
-+++ gnome-panel-2.30.0/applets/Makefile.in 2010-05-05 19:54:01.243334000 +0200
+--- gnome-panel-2.30.0.orig/applets/Makefile.in 2010-05-05 19:55:21.579338637 +0200
++++ gnome-panel-2.30.0/applets/Makefile.in 2010-05-05 19:59:13.915337684 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -4110,8 +4110,8 @@
*=* | --[!k]*);; \
Index: gnome-panel-2.30.0/applets/notification_area/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/applets/notification_area/Makefile.in 2010-03-30 02:52:45.000000000 +0200
-+++ gnome-panel-2.30.0/applets/notification_area/Makefile.in 2010-05-05 19:54:02.067835427 +0200
+--- gnome-panel-2.30.0.orig/applets/notification_area/Makefile.in 2010-05-05 19:55:21.555338100 +0200
++++ gnome-panel-2.30.0/applets/notification_area/Makefile.in 2010-05-05 19:59:13.919337773 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -4128,8 +4128,8 @@
PANEL_LIBS = @PANEL_LIBS@
Index: gnome-panel-2.30.0/applets/wncklet/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/applets/wncklet/Makefile.in 2010-03-30 02:52:45.000000000 +0200
-+++ gnome-panel-2.30.0/applets/wncklet/Makefile.in 2010-05-05 19:54:02.271835596 +0200
+--- gnome-panel-2.30.0.orig/applets/wncklet/Makefile.in 2010-05-05 19:55:21.527337474 +0200
++++ gnome-panel-2.30.0/applets/wncklet/Makefile.in 2010-05-05 19:59:13.919337773 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -4146,8 +4146,8 @@
PANEL_LIBS = @PANEL_LIBS@
Index: gnome-panel-2.30.0/compile
===================================================================
---- gnome-panel-2.30.0.orig/compile 2010-03-30 02:52:44.000000000 +0200
-+++ gnome-panel-2.30.0/compile 2010-05-05 19:51:55.323840793 +0200
+--- gnome-panel-2.30.0.orig/compile 2010-05-05 19:55:21.499341736 +0200
++++ gnome-panel-2.30.0/compile 2010-05-05 19:59:13.919337773 +0200
@@ -1,7 +1,7 @@
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
@@ -4171,8 +4171,8 @@
rmdir "$lockdir"
Index: gnome-panel-2.30.0/config.h.in
===================================================================
---- gnome-panel-2.30.0.orig/config.h.in 2010-03-30 02:52:43.000000000 +0200
-+++ gnome-panel-2.30.0/config.h.in 2010-05-05 19:51:55.323840793 +0200
+--- gnome-panel-2.30.0.orig/config.h.in 2010-05-05 19:55:21.471343553 +0200
++++ gnome-panel-2.30.0/config.h.in 2010-05-05 19:59:13.919337773 +0200
@@ -135,6 +135,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -4185,8 +4185,8 @@
Index: gnome-panel-2.30.0/configure
===================================================================
---- gnome-panel-2.30.0.orig/configure 2010-03-30 02:52:43.000000000 +0200
-+++ gnome-panel-2.30.0/configure 2010-05-05 19:51:55.363834840 +0200
+--- gnome-panel-2.30.0.orig/configure 2010-05-05 19:55:21.443339504 +0200
++++ gnome-panel-2.30.0/configure 2010-05-05 19:59:36.791334163 +0200
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -5004,16 +5004,7 @@
# Factoring default headers for most tests.
ac_includes_default="\
-@@ -866,6 +824,8 @@ FISH_LIBS
- FISH_CFLAGS
- LIBPANEL_APPLET_LIBS
- LIBPANEL_APPLET_CFLAGS
-+LOGOUT_LIBS
-+LOGOUT_CFLAGS
- PANEL_LIBS
- PANEL_CFLAGS
- EGG_SMCLIENT_LIBS
-@@ -1021,6 +981,7 @@ bindir
+@@ -1021,6 +979,7 @@ bindir
program_transform_name
prefix
exec_prefix
@@ -5021,16 +5012,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1076,6 +1037,8 @@ EGG_SMCLIENT_CFLAGS
- EGG_SMCLIENT_LIBS
- PANEL_CFLAGS
- PANEL_LIBS
-+LOGOUT_CFLAGS
-+LOGOUT_LIBS
- LIBPANEL_APPLET_CFLAGS
- LIBPANEL_APPLET_LIBS
- FISH_CFLAGS
-@@ -1203,8 +1166,7 @@ do
+@@ -1203,8 +1162,7 @@ do
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 &&
@@ -5040,7 +5022,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1230,8 +1192,7 @@ do
+@@ -1230,8 +1188,7 @@ do
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 &&
@@ -5050,7 +5032,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1435,8 +1396,7 @@ do
+@@ -1435,8 +1392,7 @@ do
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 &&
@@ -5060,7 +5042,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1452,8 +1412,7 @@ do
+@@ -1452,8 +1408,7 @@ do
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 &&
@@ -5070,7 +5052,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1483,17 +1442,17 @@ do
+@@ -1483,17 +1438,17 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -5094,7 +5076,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1510,15 +1469,13 @@ done
+@@ -1510,15 +1465,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -5112,7 +5094,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1541,8 +1498,7 @@ do
+@@ -1541,8 +1494,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -5122,7 +5104,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1572,11 +1528,9 @@ test "$silent" = yes && exec 6>/dev/null
+@@ -1572,11 +1524,9 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -5136,7 +5118,7 @@
# Find the source files, if location was not specified.
-@@ -1615,13 +1569,11 @@ else
+@@ -1615,13 +1565,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -5152,7 +5134,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1750,11 +1702,12 @@ Optional Features:
+@@ -1750,11 +1698,12 @@ Optional Features:
--enable-polkit Enable PolicyKit support (auto)
--enable-network-manager
Enable NetworkManager support (auto)
@@ -5169,7 +5151,7 @@
--disable-rebuilds disable all source autogeneration rules
Optional Packages:
-@@ -1784,7 +1737,7 @@ Some influential environment variables:
+@@ -1784,7 +1733,7 @@ Some influential environment variables:
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>
@@ -5178,17 +5160,7 @@
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
-@@ -1795,6 +1748,9 @@ Some influential environment variables:
- PANEL_CFLAGS
- C compiler flags for PANEL, overriding pkg-config
- PANEL_LIBS linker flags for PANEL, overriding pkg-config
-+ LOGOUT_CFLAGS
-+ C compiler flags for LOGOUT, overriding pkg-config
-+ LOGOUT_LIBS linker flags for LOGOUT, overriding pkg-config
- LIBPANEL_APPLET_CFLAGS
- C compiler flags for LIBPANEL_APPLET, overriding pkg-config
- LIBPANEL_APPLET_LIBS
-@@ -1894,21 +1850,378 @@ test -n "$ac_init_help" && exit $ac_stat
+@@ -1894,21 +1843,378 @@ test -n "$ac_init_help" && exit $ac_stat
if $ac_init_version; then
cat <<\_ACEOF
gnome-panel configure 2.30.0
@@ -5571,7 +5543,7 @@
$ $0 $@
-@@ -1944,8 +2257,8 @@ for as_dir in $PATH
+@@ -1944,8 +2250,8 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5582,7 +5554,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1982,9 +2295,9 @@ do
+@@ -1982,9 +2288,9 @@ do
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -5594,7 +5566,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -2000,13 +2313,13 @@ do
+@@ -2000,13 +2306,13 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -5611,7 +5583,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -2031,13 +2344,13 @@ _ASBOX
+@@ -2031,13 +2337,13 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -5627,7 +5599,7 @@
esac ;;
esac
done
-@@ -2109,39 +2422,41 @@ _ASBOX
+@@ -2109,39 +2415,41 @@ _ASBOX
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -5674,7 +5646,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2159,8 +2474,8 @@ fi
+@@ -2159,8 +2467,8 @@ fi
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -5685,7 +5657,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2168,10 +2483,10 @@ $as_echo "$as_me: loading site script $a
+@@ -2168,10 +2476,10 @@ $as_echo "$as_me: loading site script $a
done
if test -r "$cache_file"; then
@@ -5700,7 +5672,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2179,7 +2494,7 @@ $as_echo "$as_me: loading cache $cache_f
+@@ -2179,7 +2487,7 @@ $as_echo "$as_me: loading cache $cache_f
esac
fi
else
@@ -5709,7 +5681,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2194,11 +2509,11 @@ for ac_var in $ac_precious_vars; do
+@@ -2194,11 +2502,11 @@ for ac_var in $ac_precious_vars; do
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -5723,7 +5695,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2208,17 +2523,17 @@ $as_echo "$as_me: error: \`$ac_var' was
+@@ -2208,17 +2516,17 @@ $as_echo "$as_me: error: \`$ac_var' was
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
@@ -5745,7 +5717,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2230,43 +2545,20 @@ $as_echo "$as_me: current value: \`$ac
+@@ -2230,43 +2538,20 @@ $as_echo "$as_me: current value: \`$ac
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -5796,7 +5768,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2281,24 +2573,16 @@ am__api_version='1.11'
+@@ -2281,24 +2566,16 @@ am__api_version='1.11'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -5829,7 +5801,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2324,10 +2608,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
+@@ -2324,10 +2601,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
# 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.
@@ -5842,7 +5814,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2335,11 +2619,11 @@ for as_dir in $PATH
+@@ -2335,11 +2612,11 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5858,7 +5830,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2376,7 +2660,7 @@ case $as_dir/ in
+@@ -2376,7 +2653,7 @@ case $as_dir/ in
;;
esac
@@ -5867,7 +5839,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2392,7 +2676,7 @@ fi
+@@ -2392,7 +2669,7 @@ fi
INSTALL=$ac_install_sh
fi
fi
@@ -5876,7 +5848,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2403,7 +2687,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+@@ -2403,7 +2680,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -5885,7 +5857,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2414,15 +2698,11 @@ am_lf='
+@@ -2414,15 +2691,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -5903,7 +5875,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2444,11 +2724,8 @@ if (
+@@ -2444,11 +2717,8 @@ if (
# 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".
@@ -5917,7 +5889,7 @@
fi
test "$2" = conftest.file
-@@ -2457,13 +2734,10 @@ then
+@@ -2457,13 +2727,10 @@ then
# Ok.
:
else
@@ -5934,7 +5906,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2491,7 +2765,7 @@ if eval "$MISSING --run true"; then
+@@ -2491,7 +2758,7 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -5943,7 +5915,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2512,9 +2786,9 @@ if test "$cross_compiling" != no; then
+@@ -2512,9 +2779,9 @@ if test "$cross_compiling" != no; then
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
@@ -5955,7 +5927,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2525,24 +2799,24 @@ for as_dir in $PATH
+@@ -2525,24 +2792,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5985,7 +5957,7 @@
$as_echo "no" >&6; }
fi
-@@ -2552,9 +2826,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -2552,9 +2819,9 @@ if test -z "$ac_cv_prog_STRIP"; then
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
@@ -5997,7 +5969,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2565,24 +2839,24 @@ for as_dir in $PATH
+@@ -2565,24 +2832,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6027,7 +5999,7 @@
$as_echo "no" >&6; }
fi
-@@ -2591,7 +2865,7 @@ fi
+@@ -2591,7 +2858,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6036,7 +6008,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2604,10 +2878,10 @@ fi
+@@ -2604,10 +2871,10 @@ fi
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -6049,7 +6021,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2615,7 +2889,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
+@@ -2615,7 +2882,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6058,7 +6030,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 #(
-@@ -2627,11 +2901,12 @@ do
+@@ -2627,11 +2894,12 @@ do
esac
done
done
@@ -6072,7 +6044,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2639,11 +2914,10 @@ fi
+@@ -2639,11 +2907,10 @@ fi
# 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.
@@ -6085,7 +6057,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2656,9 +2930,9 @@ for ac_prog in gawk mawk nawk awk
+@@ -2656,9 +2923,9 @@ for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -6097,7 +6069,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2669,24 +2943,24 @@ for as_dir in $PATH
+@@ -2669,24 +2936,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6127,7 +6099,7 @@
$as_echo "no" >&6; }
fi
-@@ -2694,11 +2968,11 @@ fi
+@@ -2694,11 +2961,11 @@ fi
test -n "$AWK" && break
done
@@ -6141,7 +6113,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2716,11 +2990,11 @@ esac
+@@ -2716,11 +2983,11 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -6155,7 +6127,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2740,9 +3014,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
+@@ -2740,9 +3007,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -6166,7 +6138,7 @@
fi
fi
-@@ -2799,7 +3071,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+@@ -2799,7 +3064,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
# Check whether --enable-silent-rules was given.
@@ -6175,7 +6147,7 @@
enableval=$enable_silent_rules;
fi
-@@ -2835,16 +3107,16 @@ LIB_PANEL_APPLET_LT_VERSION=2:67:2
+@@ -2835,16 +3100,16 @@ LIB_PANEL_APPLET_LT_VERSION=2:67:2
@@ -6195,7 +6167,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2872,16 +3144,16 @@ fi
+@@ -2872,16 +3137,16 @@ fi
@@ -6215,7 +6187,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -2897,7 +3169,7 @@ am__doit:
+@@ -2897,7 +3162,7 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -6224,7 +6196,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -2925,12 +3197,12 @@ if test "$am__include" = "#"; then
+@@ -2925,12 +3190,12 @@ if test "$am__include" = "#"; then
fi
@@ -6239,7 +6211,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -2955,9 +3227,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -2955,9 +3220,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
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
@@ -6251,7 +6223,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2968,24 +3240,24 @@ for as_dir in $PATH
+@@ -2968,24 +3233,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6281,7 +6253,7 @@
$as_echo "no" >&6; }
fi
-@@ -2995,9 +3267,9 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -2995,9 +3260,9 @@ if test -z "$ac_cv_prog_CC"; then
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
@@ -6293,7 +6265,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3008,24 +3280,24 @@ for as_dir in $PATH
+@@ -3008,24 +3273,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6323,7 +6295,7 @@
$as_echo "no" >&6; }
fi
-@@ -3034,7 +3306,7 @@ fi
+@@ -3034,7 +3299,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6332,7 +6304,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3048,9 +3320,9 @@ if test -z "$CC"; then
+@@ -3048,9 +3313,9 @@ if test -z "$CC"; then
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
@@ -6344,7 +6316,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3061,24 +3333,24 @@ for as_dir in $PATH
+@@ -3061,24 +3326,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6374,7 +6346,7 @@
$as_echo "no" >&6; }
fi
-@@ -3088,9 +3360,9 @@ fi
+@@ -3088,9 +3353,9 @@ fi
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
@@ -6386,7 +6358,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3102,18 +3374,18 @@ for as_dir in $PATH
+@@ -3102,18 +3367,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6408,7 +6380,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3132,10 +3404,10 @@ fi
+@@ -3132,10 +3397,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -6421,7 +6393,7 @@
$as_echo "no" >&6; }
fi
-@@ -3147,9 +3419,9 @@ if test -z "$CC"; then
+@@ -3147,9 +3412,9 @@ if test -z "$CC"; then
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
@@ -6433,7 +6405,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3160,24 +3432,24 @@ for as_dir in $PATH
+@@ -3160,24 +3425,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6463,7 +6435,7 @@
$as_echo "no" >&6; }
fi
-@@ -3191,9 +3463,9 @@ if test -z "$CC"; then
+@@ -3191,9 +3456,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -6475,7 +6447,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3204,24 +3476,24 @@ for as_dir in $PATH
+@@ -3204,24 +3469,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6505,7 +6477,7 @@
$as_echo "no" >&6; }
fi
-@@ -3234,7 +3506,7 @@ done
+@@ -3234,7 +3499,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6514,7 +6486,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3245,57 +3517,37 @@ fi
+@@ -3245,57 +3510,37 @@ fi
fi
@@ -6592,7 +6564,7 @@
/* end confdefs.h. */
int
-@@ -3311,8 +3563,8 @@ ac_clean_files="$ac_clean_files a.out a.
+@@ -3311,8 +3556,8 @@ ac_clean_files="$ac_clean_files a.out a.
# 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.
@@ -6603,7 +6575,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3328,17 +3580,17 @@ do
+@@ -3328,17 +3573,17 @@ do
done
rm -f $ac_rmfiles
@@ -6626,7 +6598,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,
-@@ -3355,7 +3607,7 @@ do
+@@ -3355,7 +3600,7 @@ do
# certainly right.
break;;
*.* )
@@ -6635,7 +6607,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3374,84 +3626,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
+@@ -3374,84 +3619,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
else
ac_file=''
fi
@@ -6741,7 +6713,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
-@@ -3466,32 +3676,83 @@ for ac_file in conftest.exe conftest con
+@@ -3466,32 +3669,83 @@ for ac_file in conftest.exe conftest con
esac
done
else
@@ -6841,7 +6813,7 @@
/* end confdefs.h. */
int
-@@ -3503,17 +3764,17 @@ main ()
+@@ -3503,17 +3757,17 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -6864,7 +6836,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3526,31 +3787,23 @@ else
+@@ -3526,31 +3780,23 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -6903,7 +6875,7 @@
/* end confdefs.h. */
int
-@@ -3564,37 +3817,16 @@ main ()
+@@ -3564,37 +3810,16 @@ main ()
return 0;
}
_ACEOF
@@ -6944,7 +6916,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3603,20 +3835,16 @@ else
+@@ -3603,20 +3828,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -6968,7 +6940,7 @@
/* end confdefs.h. */
int
-@@ -3627,35 +3855,11 @@ main ()
+@@ -3627,35 +3848,11 @@ main ()
return 0;
}
_ACEOF
@@ -7007,7 +6979,7 @@
/* end confdefs.h. */
int
-@@ -3666,36 +3870,12 @@ main ()
+@@ -3666,36 +3863,12 @@ main ()
return 0;
}
_ACEOF
@@ -7048,7 +7020,7 @@
/* end confdefs.h. */
int
-@@ -3706,42 +3886,17 @@ main ()
+@@ -3706,42 +3879,17 @@ main ()
return 0;
}
_ACEOF
@@ -7093,7 +7065,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3758,18 +3913,14 @@ else
+@@ -3758,18 +3906,14 @@ else
CFLAGS=
fi
fi
@@ -7115,7 +7087,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3826,32 +3977,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
+@@ -3826,32 +3970,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -7149,7 +7121,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3862,17 +3990,19 @@ fi
+@@ -3862,17 +3983,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -7172,7 +7144,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3882,9 +4012,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -3882,9 +4005,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -7184,7 +7156,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3992,7 +4122,7 @@ else
+@@ -3992,7 +4115,7 @@ else
fi
fi
@@ -7193,7 +7165,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4012,35 +4142,31 @@ fi
+@@ -4012,35 +4135,31 @@ fi
case "$am__api_version" in
1.01234)
@@ -7235,7 +7207,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -4053,14 +4179,14 @@ for as_dir in $PATH
+@@ -4053,14 +4172,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7253,7 +7225,7 @@
IFS=$as_save_IFS
;;
-@@ -4068,19 +4194,19 @@ esac
+@@ -4068,19 +4187,19 @@ esac
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -7277,7 +7249,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -4093,14 +4219,14 @@ for as_dir in $PATH
+@@ -4093,14 +4212,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7295,7 +7267,7 @@
IFS=$as_save_IFS
;;
-@@ -4108,19 +4234,19 @@ esac
+@@ -4108,19 +4227,19 @@ esac
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -7319,7 +7291,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -4133,14 +4259,14 @@ for as_dir in $PATH
+@@ -4133,14 +4252,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7337,7 +7309,7 @@
IFS=$as_save_IFS
;;
-@@ -4148,18 +4274,16 @@ esac
+@@ -4148,18 +4267,16 @@ esac
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -7359,7 +7331,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 $< $@'
-@@ -4281,9 +4405,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+@@ -4281,9 +4398,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
# 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
@@ -7371,7 +7343,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -4296,14 +4420,14 @@ for as_dir in $PATH
+@@ -4296,14 +4413,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7389,7 +7361,7 @@
IFS=$as_save_IFS
;;
-@@ -4311,19 +4435,19 @@ esac
+@@ -4311,19 +4428,19 @@ esac
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -7413,7 +7385,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -4336,14 +4460,14 @@ for as_dir in $PATH
+@@ -4336,14 +4453,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7431,7 +7403,7 @@
IFS=$as_save_IFS
;;
-@@ -4351,19 +4475,19 @@ esac
+@@ -4351,19 +4468,19 @@ esac
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -7455,7 +7427,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -4376,14 +4500,14 @@ for as_dir in $PATH
+@@ -4376,14 +4493,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7473,7 +7445,7 @@
IFS=$as_save_IFS
;;
-@@ -4391,19 +4515,19 @@ esac
+@@ -4391,19 +4508,19 @@ esac
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -7497,7 +7469,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -4416,14 +4540,14 @@ for as_dir in $PATH
+@@ -4416,14 +4533,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7515,7 +7487,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -4432,33 +4556,29 @@ esac
+@@ -4432,33 +4549,29 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -7555,7 +7527,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -4471,14 +4591,14 @@ for as_dir in $PATH
+@@ -4471,14 +4584,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7573,7 +7545,7 @@
IFS=$as_save_IFS
;;
-@@ -4486,41 +4606,35 @@ esac
+@@ -4486,41 +4599,35 @@ esac
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -7624,7 +7596,7 @@
fi
fi
-@@ -4530,11 +4644,7 @@ fi
+@@ -4530,11 +4637,7 @@ fi
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -7637,7 +7609,7 @@
/* end confdefs.h. */
int
-@@ -4546,61 +4656,41 @@ extern int _nl_msg_cat_cntr;
+@@ -4546,61 +4649,41 @@ extern int _nl_msg_cat_cntr;
return 0;
}
_ACEOF
@@ -7727,7 +7699,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -4608,104 +4698,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -4608,104 +4691,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -7834,7 +7806,7 @@
;
return 0;
}
-@@ -4717,54 +4714,27 @@ for ac_lib in '' cposix; do
+@@ -4717,54 +4707,27 @@ for ac_lib in '' cposix; do
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -7897,7 +7869,7 @@
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-@@ -4777,9 +4747,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -4777,9 +4740,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
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
@@ -7909,7 +7881,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4790,24 +4760,24 @@ for as_dir in $PATH
+@@ -4790,24 +4753,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7939,7 +7911,7 @@
$as_echo "no" >&6; }
fi
-@@ -4817,9 +4787,9 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -4817,9 +4780,9 @@ if test -z "$ac_cv_prog_CC"; then
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
@@ -7951,7 +7923,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -4830,24 +4800,24 @@ for as_dir in $PATH
+@@ -4830,24 +4793,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7981,7 +7953,7 @@
$as_echo "no" >&6; }
fi
-@@ -4856,7 +4826,7 @@ fi
+@@ -4856,7 +4819,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7990,7 +7962,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4870,9 +4840,9 @@ if test -z "$CC"; then
+@@ -4870,9 +4833,9 @@ if test -z "$CC"; then
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
@@ -8002,7 +7974,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4883,24 +4853,24 @@ for as_dir in $PATH
+@@ -4883,24 +4846,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8032,7 +8004,7 @@
$as_echo "no" >&6; }
fi
-@@ -4910,9 +4880,9 @@ fi
+@@ -4910,9 +4873,9 @@ fi
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
@@ -8044,7 +8016,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4924,18 +4894,18 @@ for as_dir in $PATH
+@@ -4924,18 +4887,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8066,7 +8038,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -4954,10 +4924,10 @@ fi
+@@ -4954,10 +4917,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -8079,7 +8051,7 @@
$as_echo "no" >&6; }
fi
-@@ -4969,9 +4939,9 @@ if test -z "$CC"; then
+@@ -4969,9 +4932,9 @@ if test -z "$CC"; then
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
@@ -8091,7 +8063,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4982,24 +4952,24 @@ for as_dir in $PATH
+@@ -4982,24 +4945,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8121,7 +8093,7 @@
$as_echo "no" >&6; }
fi
-@@ -5013,9 +4983,9 @@ if test -z "$CC"; then
+@@ -5013,9 +4976,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -8133,7 +8105,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -5026,24 +4996,24 @@ for as_dir in $PATH
+@@ -5026,24 +4989,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8163,7 +8135,7 @@
$as_echo "no" >&6; }
fi
-@@ -5056,7 +5026,7 @@ done
+@@ -5056,7 +5019,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8172,7 +8144,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5067,62 +5037,42 @@ fi
+@@ -5067,62 +5030,42 @@ fi
fi
@@ -8257,7 +8229,7 @@
/* end confdefs.h. */
int
-@@ -5136,37 +5086,16 @@ main ()
+@@ -5136,37 +5079,16 @@ main ()
return 0;
}
_ACEOF
@@ -8298,7 +8270,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -5175,20 +5104,16 @@ else
+@@ -5175,20 +5097,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -8322,7 +8294,7 @@
/* end confdefs.h. */
int
-@@ -5199,35 +5124,11 @@ main ()
+@@ -5199,35 +5117,11 @@ main ()
return 0;
}
_ACEOF
@@ -8361,7 +8333,7 @@
/* end confdefs.h. */
int
-@@ -5238,36 +5139,12 @@ main ()
+@@ -5238,36 +5132,12 @@ main ()
return 0;
}
_ACEOF
@@ -8402,7 +8374,7 @@
/* end confdefs.h. */
int
-@@ -5278,42 +5155,17 @@ main ()
+@@ -5278,42 +5148,17 @@ main ()
return 0;
}
_ACEOF
@@ -8447,7 +8419,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -5330,18 +5182,14 @@ else
+@@ -5330,18 +5175,14 @@ else
CFLAGS=
fi
fi
@@ -8469,7 +8441,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -5398,32 +5246,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
+@@ -5398,32 +5239,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -8503,7 +8475,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -5434,17 +5259,19 @@ fi
+@@ -5434,17 +5252,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -8526,7 +8498,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5454,9 +5281,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -5454,9 +5274,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -8538,7 +8510,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5564,7 +5391,7 @@ else
+@@ -5564,7 +5384,7 @@ else
fi
fi
@@ -8547,7 +8519,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -5584,14 +5411,14 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -5584,14 +5404,14 @@ ac_cpp='$CPP $CPPFLAGS'
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
@@ -8564,7 +8536,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -5606,11 +5433,7 @@ do
+@@ -5606,11 +5426,7 @@ do
# <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.
@@ -8577,7 +8549,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5619,78 +5442,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5619,78 +5435,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -8661,7 +8633,7 @@
break
fi
-@@ -5702,7 +5481,7 @@ fi
+@@ -5702,7 +5474,7 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
@@ -8670,7 +8642,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -5713,11 +5492,7 @@ do
+@@ -5713,11 +5485,7 @@ do
# <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.
@@ -8683,7 +8655,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5726,87 +5501,40 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5726,87 +5494,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -8780,7 +8752,7 @@
fi
ac_ext=c
-@@ -5816,9 +5544,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -5816,9 +5537,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -8792,7 +8764,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -5829,7 +5557,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -5829,7 +5550,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8801,7 +8773,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
-@@ -5849,7 +5577,7 @@ case `"$ac_path_GREP" --version 2>&1` in
+@@ -5849,7 +5570,7 @@ case `"$ac_path_GREP" --version 2>&1` in
$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
@@ -8810,7 +8782,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"
-@@ -5864,26 +5592,24 @@ esac
+@@ -5864,26 +5585,24 @@ esac
$ac_path_GREP_found && break 3
done
done
@@ -8842,7 +8814,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -5897,7 +5623,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -5897,7 +5616,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8851,7 +8823,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
-@@ -5917,7 +5643,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
+@@ -5917,7 +5636,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
$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
@@ -8860,7 +8832,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"
-@@ -5932,12 +5658,10 @@ esac
+@@ -5932,12 +5651,10 @@ esac
$ac_path_EGREP_found && break 3
done
done
@@ -8875,7 +8847,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -5945,21 +5669,17 @@ fi
+@@ -5945,21 +5662,17 @@ fi
fi
fi
@@ -8901,7 +8873,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -5974,48 +5694,23 @@ main ()
+@@ -5974,48 +5687,23 @@ main ()
return 0;
}
_ACEOF
@@ -8955,7 +8927,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -6025,18 +5720,14 @@ fi
+@@ -6025,18 +5713,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -8977,7 +8949,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -6046,14 +5737,10 @@ fi
+@@ -6046,14 +5730,10 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -8994,7 +8966,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -6080,85 +5767,48 @@ main ()
+@@ -6080,85 +5760,48 @@ main ()
return 0;
}
_ACEOF
@@ -9094,7 +9066,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -6174,28 +5824,24 @@ IFS=$ac_save_IFS
+@@ -6174,28 +5817,24 @@ IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -9128,7 +9100,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -6218,9 +5864,9 @@ case $host in
+@@ -6218,9 +5857,9 @@ case $host in
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
set dummy ${ac_tool_prefix}as; ac_word=$2
@@ -9140,7 +9112,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AS"; then
-@@ -6231,24 +5877,24 @@ for as_dir in $PATH
+@@ -6231,24 +5870,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9170,7 +9142,7 @@
$as_echo "no" >&6; }
fi
-@@ -6258,9 +5904,9 @@ if test -z "$ac_cv_prog_AS"; then
+@@ -6258,9 +5897,9 @@ if test -z "$ac_cv_prog_AS"; then
ac_ct_AS=$AS
# Extract the first word of "as", so it can be a program name with args.
set dummy as; ac_word=$2
@@ -9182,7 +9154,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AS"; then
-@@ -6271,24 +5917,24 @@ for as_dir in $PATH
+@@ -6271,24 +5910,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9212,7 +9184,7 @@
$as_echo "no" >&6; }
fi
-@@ -6297,7 +5943,7 @@ fi
+@@ -6297,7 +5936,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9221,7 +9193,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6310,9 +5956,9 @@ fi
+@@ -6310,9 +5949,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
set dummy ${ac_tool_prefix}dlltool; ac_word=$2
@@ -9233,7 +9205,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DLLTOOL"; then
-@@ -6323,24 +5969,24 @@ for as_dir in $PATH
+@@ -6323,24 +5962,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9263,7 +9235,7 @@
$as_echo "no" >&6; }
fi
-@@ -6350,9 +5996,9 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
+@@ -6350,9 +5989,9 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
ac_ct_DLLTOOL=$DLLTOOL
# Extract the first word of "dlltool", so it can be a program name with args.
set dummy dlltool; ac_word=$2
@@ -9275,7 +9247,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DLLTOOL"; then
-@@ -6363,24 +6009,24 @@ for as_dir in $PATH
+@@ -6363,24 +6002,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9305,7 +9277,7 @@
$as_echo "no" >&6; }
fi
-@@ -6389,7 +6035,7 @@ fi
+@@ -6389,7 +6028,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9314,7 +9286,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6402,9 +6048,9 @@ fi
+@@ -6402,9 +6041,9 @@ fi
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
@@ -9326,7 +9298,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -6415,24 +6061,24 @@ for as_dir in $PATH
+@@ -6415,24 +6054,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9356,7 +9328,7 @@
$as_echo "no" >&6; }
fi
-@@ -6442,9 +6088,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -6442,9 +6081,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
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
@@ -9368,7 +9340,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -6455,24 +6101,24 @@ for as_dir in $PATH
+@@ -6455,24 +6094,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9398,7 +9370,7 @@
$as_echo "no" >&6; }
fi
-@@ -6481,7 +6127,7 @@ fi
+@@ -6481,7 +6120,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9407,7 +9379,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6516,14 +6162,14 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -6516,14 +6155,14 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
case `pwd` in
*\ * | *\ *)
@@ -9425,7 +9397,7 @@
-@@ -6539,9 +6185,9 @@ macro_revision='1.3012'
+@@ -6539,9 +6178,9 @@ macro_revision='1.3012'
ltmain="$ac_aux_dir/ltmain.sh"
@@ -9437,7 +9409,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -6549,7 +6195,7 @@ else
+@@ -6549,7 +6188,7 @@ else
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -9446,7 +9418,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -6558,7 +6204,7 @@ for as_dir in $PATH
+@@ -6558,7 +6197,7 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9455,7 +9427,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
-@@ -6578,7 +6224,7 @@ case `"$ac_path_SED" --version 2>&1` in
+@@ -6578,7 +6217,7 @@ case `"$ac_path_SED" --version 2>&1` in
$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
@@ -9464,7 +9436,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"
-@@ -6593,19 +6239,17 @@ esac
+@@ -6593,19 +6232,17 @@ esac
$ac_path_SED_found && break 3
done
done
@@ -9487,7 +9459,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -6623,9 +6267,9 @@ Xsed="$SED -e 1s/^X//"
+@@ -6623,9 +6260,9 @@ Xsed="$SED -e 1s/^X//"
@@ -9499,7 +9471,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -6639,7 +6283,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -6639,7 +6276,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9508,7 +9480,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
-@@ -6659,7 +6303,7 @@ case `"$ac_path_FGREP" --version 2>&1` i
+@@ -6659,7 +6296,7 @@ case `"$ac_path_FGREP" --version 2>&1` i
$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
@@ -9517,7 +9489,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"
-@@ -6674,12 +6318,10 @@ esac
+@@ -6674,12 +6311,10 @@ esac
$ac_path_FGREP_found && break 3
done
done
@@ -9532,7 +9504,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -6687,7 +6329,7 @@ fi
+@@ -6687,7 +6322,7 @@ fi
fi
fi
@@ -9541,7 +9513,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -6713,7 +6355,7 @@ test -z "$GREP" && GREP=grep
+@@ -6713,7 +6348,7 @@ test -z "$GREP" && GREP=grep
# Check whether --with-gnu-ld was given.
@@ -9550,7 +9522,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -6722,7 +6364,7 @@ fi
+@@ -6722,7 +6357,7 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -9559,7 +9531,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -6752,13 +6394,13 @@ $as_echo_n "checking for ld used by $CC.
+@@ -6752,13 +6387,13 @@ $as_echo_n "checking for ld used by $CC.
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -9576,7 +9548,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -6789,18 +6431,16 @@ fi
+@@ -6789,18 +6424,16 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -9600,7 +9572,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -6813,7 +6453,7 @@ case `$LD -v 2>&1 </dev/null` in
+@@ -6813,7 +6446,7 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
@@ -9609,7 +9581,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -6825,9 +6465,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -6825,9 +6458,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -9621,7 +9593,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -6874,7 +6514,7 @@ else
+@@ -6874,7 +6507,7 @@ else
: ${lt_cv_path_NM=no}
fi
fi
@@ -9630,7 +9602,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -6885,9 +6525,9 @@ else
+@@ -6885,9 +6518,9 @@ else
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
@@ -9642,7 +9614,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -6898,24 +6538,24 @@ for as_dir in $PATH
+@@ -6898,24 +6531,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9672,7 +9644,7 @@
$as_echo "no" >&6; }
fi
-@@ -6929,9 +6569,9 @@ if test -z "$DUMPBIN"; then
+@@ -6929,9 +6562,9 @@ if test -z "$DUMPBIN"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -9684,7 +9656,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -6942,24 +6582,24 @@ for as_dir in $PATH
+@@ -6942,24 +6575,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9714,7 +9686,7 @@
$as_echo "no" >&6; }
fi
-@@ -6972,7 +6612,7 @@ done
+@@ -6972,7 +6605,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9723,7 +9695,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6992,44 +6632,44 @@ test -z "$NM" && NM=nm
+@@ -6992,44 +6625,44 @@ test -z "$NM" && NM=nm
@@ -9737,15 +9709,15 @@
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:7002: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6642: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6635: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:7005: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6645: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6638: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:7008: output\"" >&5)
-+ (eval echo "\"\$as_me:6648: output\"" >&5)
++ (eval echo "\"\$as_me:6641: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -9779,7 +9751,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -7147,10 +6787,10 @@ else
+@@ -7147,10 +6780,10 @@ else
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -9792,7 +9764,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -7164,7 +6804,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
+@@ -7164,7 +6797,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -9801,7 +9773,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -7174,17 +6814,17 @@ xsi_shell=no
+@@ -7174,17 +6807,17 @@ xsi_shell=no
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -9822,7 +9794,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -7219,14 +6859,14 @@ esac
+@@ -7219,14 +6852,14 @@ esac
@@ -9840,7 +9812,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -7255,9 +6895,9 @@ esac
+@@ -7255,9 +6888,9 @@ esac
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
@@ -9852,7 +9824,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -7268,24 +6908,24 @@ for as_dir in $PATH
+@@ -7268,24 +6901,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9882,7 +9854,7 @@
$as_echo "no" >&6; }
fi
-@@ -7295,9 +6935,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -7295,9 +6928,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
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
@@ -9894,7 +9866,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -7308,24 +6948,24 @@ for as_dir in $PATH
+@@ -7308,24 +6941,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9924,7 +9896,7 @@
$as_echo "no" >&6; }
fi
-@@ -7334,7 +6974,7 @@ fi
+@@ -7334,7 +6967,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9933,7 +9905,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7351,9 +6991,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -7351,9 +6984,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
@@ -9945,7 +9917,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -7468,11 +7108,11 @@ irix5* | irix6* | nonstopux*)
+@@ -7468,11 +7101,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
@@ -9959,7 +9931,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
-@@ -7547,7 +7187,7 @@ tpf*)
+@@ -7547,7 +7180,7 @@ tpf*)
esac
fi
@@ -9968,7 +9940,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
-@@ -7567,9 +7207,9 @@ test -z "$deplibs_check_method" && depli
+@@ -7567,9 +7200,9 @@ test -z "$deplibs_check_method" && depli
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
@@ -9980,7 +9952,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -7580,24 +7220,24 @@ for as_dir in $PATH
+@@ -7580,24 +7213,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10010,7 +9982,7 @@
$as_echo "no" >&6; }
fi
-@@ -7607,9 +7247,9 @@ if test -z "$ac_cv_prog_AR"; then
+@@ -7607,9 +7240,9 @@ if test -z "$ac_cv_prog_AR"; then
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
@@ -10022,7 +9994,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -7620,24 +7260,24 @@ for as_dir in $PATH
+@@ -7620,24 +7253,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10052,7 +10024,7 @@
$as_echo "no" >&6; }
fi
-@@ -7646,7 +7286,7 @@ fi
+@@ -7646,7 +7279,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10061,7 +10033,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7672,9 +7312,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+@@ -7672,9 +7305,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
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
@@ -10073,7 +10045,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -7685,24 +7325,24 @@ for as_dir in $PATH
+@@ -7685,24 +7318,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10103,7 +10075,7 @@
$as_echo "no" >&6; }
fi
-@@ -7712,9 +7352,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -7712,9 +7345,9 @@ if test -z "$ac_cv_prog_STRIP"; then
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
@@ -10115,7 +10087,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -7725,24 +7365,24 @@ for as_dir in $PATH
+@@ -7725,24 +7358,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10145,7 +10117,7 @@
$as_echo "no" >&6; }
fi
-@@ -7751,7 +7391,7 @@ fi
+@@ -7751,7 +7384,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10154,7 +10126,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7771,9 +7411,9 @@ test -z "$STRIP" && STRIP=:
+@@ -7771,9 +7404,9 @@ test -z "$STRIP" && STRIP=:
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
@@ -10166,7 +10138,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -7784,24 +7424,24 @@ for as_dir in $PATH
+@@ -7784,24 +7417,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10196,7 +10168,7 @@
$as_echo "no" >&6; }
fi
-@@ -7811,9 +7451,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
+@@ -7811,9 +7444,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
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
@@ -10208,7 +10180,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -7824,24 +7464,24 @@ for as_dir in $PATH
+@@ -7824,24 +7457,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10238,7 +10210,7 @@
$as_echo "no" >&6; }
fi
-@@ -7850,7 +7490,7 @@ fi
+@@ -7850,7 +7483,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10247,7 +10219,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7928,9 +7568,9 @@ compiler=$CC
+@@ -7928,9 +7561,9 @@ compiler=$CC
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -10259,7 +10231,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -8046,18 +7686,18 @@ void nm_test_func(void){}
+@@ -8046,18 +7679,18 @@ void nm_test_func(void){}
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -10284,7 +10256,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -8110,11 +7750,11 @@ _LT_EOF
+@@ -8110,11 +7743,11 @@ _LT_EOF
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -10299,7 +10271,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -8148,10 +7788,10 @@ if test -z "$lt_cv_sys_global_symbol_pip
+@@ -8148,10 +7781,10 @@ if test -z "$lt_cv_sys_global_symbol_pip
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
@@ -10312,7 +10284,7 @@
$as_echo "ok" >&6; }
fi
-@@ -8177,7 +7817,7 @@ fi
+@@ -8177,7 +7810,7 @@ fi
# Check whether --enable-libtool-lock was given.
@@ -10321,7 +10293,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -8189,11 +7829,11 @@ case $host in
+@@ -8189,11 +7822,11 @@ case $host in
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -10336,13 +10308,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -8207,12 +7847,12 @@ ia64-*-hpux*)
+@@ -8207,12 +7840,12 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8210 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 7850 "configure"' > conftest.$ac_ext
++ echo '#line 7843 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10353,7 +10325,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -8246,11 +7886,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
+@@ -8246,11 +7879,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -10368,7 +10340,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -8299,9 +7939,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -8299,9 +7932,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -10380,7 +10352,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -8310,11 +7950,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
+@@ -8310,11 +7943,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -10393,7 +10365,7 @@
/* end confdefs.h. */
int
-@@ -8325,38 +7961,13 @@ main ()
+@@ -8325,38 +7954,13 @@ main ()
return 0;
}
_ACEOF
@@ -10436,7 +10408,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -8364,7 +7975,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -8364,7 +7968,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -10445,7 +10417,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
-@@ -8374,11 +7985,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+@@ -8374,11 +7978,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -10460,7 +10432,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -8404,9 +8015,9 @@ need_locks="$enable_libtool_lock"
+@@ -8404,9 +8008,9 @@ need_locks="$enable_libtool_lock"
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
@@ -10472,7 +10444,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -8417,24 +8028,24 @@ for as_dir in $PATH
+@@ -8417,24 +8021,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10502,7 +10474,7 @@
$as_echo "no" >&6; }
fi
-@@ -8444,9 +8055,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+@@ -8444,9 +8048,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
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
@@ -10514,7 +10486,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -8457,24 +8068,24 @@ for as_dir in $PATH
+@@ -8457,24 +8061,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10544,7 +10516,7 @@
$as_echo "no" >&6; }
fi
-@@ -8483,7 +8094,7 @@ fi
+@@ -8483,7 +8087,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10553,7 +10525,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8496,9 +8107,9 @@ fi
+@@ -8496,9 +8100,9 @@ fi
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
@@ -10565,7 +10537,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -8509,24 +8120,24 @@ for as_dir in $PATH
+@@ -8509,24 +8113,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10595,7 +10567,7 @@
$as_echo "no" >&6; }
fi
-@@ -8536,9 +8147,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+@@ -8536,9 +8140,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
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
@@ -10607,7 +10579,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -8549,24 +8160,24 @@ for as_dir in $PATH
+@@ -8549,24 +8153,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10637,7 +10609,7 @@
$as_echo "no" >&6; }
fi
-@@ -8575,7 +8186,7 @@ fi
+@@ -8575,7 +8179,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10646,7 +10618,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8588,9 +8199,9 @@ fi
+@@ -8588,9 +8192,9 @@ fi
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
@@ -10658,7 +10630,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -8601,24 +8212,24 @@ for as_dir in $PATH
+@@ -8601,24 +8205,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10688,7 +10660,7 @@
$as_echo "no" >&6; }
fi
-@@ -8628,9 +8239,9 @@ if test -z "$ac_cv_prog_LIPO"; then
+@@ -8628,9 +8232,9 @@ if test -z "$ac_cv_prog_LIPO"; then
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
@@ -10700,7 +10672,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -8641,24 +8252,24 @@ for as_dir in $PATH
+@@ -8641,24 +8245,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10730,7 +10702,7 @@
$as_echo "no" >&6; }
fi
-@@ -8667,7 +8278,7 @@ fi
+@@ -8667,7 +8271,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10739,7 +10711,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8680,9 +8291,9 @@ fi
+@@ -8680,9 +8284,9 @@ fi
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
@@ -10751,7 +10723,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -8693,24 +8304,24 @@ for as_dir in $PATH
+@@ -8693,24 +8297,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10781,7 +10753,7 @@
$as_echo "no" >&6; }
fi
-@@ -8720,9 +8331,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
+@@ -8720,9 +8324,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
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
@@ -10793,7 +10765,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -8733,24 +8344,24 @@ for as_dir in $PATH
+@@ -8733,24 +8337,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10823,7 +10795,7 @@
$as_echo "no" >&6; }
fi
-@@ -8759,7 +8370,7 @@ fi
+@@ -8759,7 +8363,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10832,7 +10804,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8772,9 +8383,9 @@ fi
+@@ -8772,9 +8376,9 @@ fi
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
@@ -10844,7 +10816,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -8785,24 +8396,24 @@ for as_dir in $PATH
+@@ -8785,24 +8389,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10874,7 +10846,7 @@
$as_echo "no" >&6; }
fi
-@@ -8812,9 +8423,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
+@@ -8812,9 +8416,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
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
@@ -10886,7 +10858,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -8825,24 +8436,24 @@ for as_dir in $PATH
+@@ -8825,24 +8429,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10916,7 +10888,7 @@
$as_echo "no" >&6; }
fi
-@@ -8851,7 +8462,7 @@ fi
+@@ -8851,7 +8455,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10925,7 +10897,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8887,9 +8498,9 @@ fi
+@@ -8887,9 +8491,9 @@ fi
@@ -10937,7 +10909,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -8914,22 +8525,18 @@ else
+@@ -8914,22 +8518,18 @@ else
rm -f conftest.*
fi
fi
@@ -10964,7 +10936,7 @@
/* end confdefs.h. */
int
-@@ -8940,42 +8547,17 @@ main ()
+@@ -8940,42 +8540,17 @@ main ()
return 0;
}
_ACEOF
@@ -11012,7 +10984,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -9013,69 +8595,14 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
+@@ -9013,69 +8588,14 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
esac
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
@@ -11088,7 +11060,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -9085,62 +8612,13 @@ fi
+@@ -9085,62 +8605,13 @@ fi
done
@@ -11156,7 +11128,7 @@
_ACEOF
fi
-@@ -9158,7 +8636,7 @@ done
+@@ -9158,7 +8629,7 @@ done
# Check whether --enable-shared was given.
@@ -11165,7 +11137,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -9189,7 +8667,7 @@ fi
+@@ -9189,7 +8660,7 @@ fi
# Check whether --enable-static was given.
@@ -11174,7 +11146,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -9221,7 +8699,7 @@ fi
+@@ -9221,7 +8692,7 @@ fi
# Check whether --with-pic was given.
@@ -11183,7 +11155,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -9237,7 +8715,7 @@ test -z "$pic_mode" && pic_mode=default
+@@ -9237,7 +8708,7 @@ test -z "$pic_mode" && pic_mode=default
# Check whether --enable-fast-install was given.
@@ -11192,7 +11164,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -9318,9 +8796,9 @@ if test -n "${ZSH_VERSION+set}" ; then
+@@ -9318,9 +8789,9 @@ if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
fi
@@ -11204,7 +11176,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -9333,7 +8811,7 @@ else
+@@ -9333,7 +8804,7 @@ else
fi
rmdir .libs 2>/dev/null
fi
@@ -11213,7 +11185,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -9426,9 +8904,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
+@@ -9426,9 +8897,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -11225,7 +11197,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9479,10 +8957,10 @@ fi
+@@ -9479,10 +8950,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -11238,7 +11210,7 @@
$as_echo "no" >&6; }
fi
-@@ -9492,9 +8970,9 @@ fi
+@@ -9492,9 +8963,9 @@ fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -11250,7 +11222,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9545,10 +9023,10 @@ fi
+@@ -9545,10 +9016,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -11263,7 +11235,7 @@
$as_echo "no" >&6; }
fi
-@@ -9629,9 +9107,9 @@ lt_prog_compiler_no_builtin_flag=
+@@ -9629,9 +9100,9 @@ lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -11275,21 +11247,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9647,11 +9125,11 @@ else
+@@ -9647,11 +9118,11 @@ else
-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:9650: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9128: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9121: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9654: \$? = $ac_status" >&5
-+ echo "$as_me:9132: \$? = $ac_status" >&5
++ echo "$as_me:9125: \$? = $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.
-@@ -9664,7 +9142,7 @@ else
+@@ -9664,7 +9135,7 @@ else
$RM conftest*
fi
@@ -11298,7 +11270,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -9684,7 +9162,7 @@ fi
+@@ -9684,7 +9155,7 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -11307,7 +11279,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -9816,7 +9294,7 @@ $as_echo_n "checking for $compiler optio
+@@ -9816,7 +9287,7 @@ $as_echo_n "checking for $compiler optio
lt_prog_compiler_static='-non_shared'
;;
@@ -11316,7 +11288,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -9956,7 +9434,7 @@ case $host_os in
+@@ -9956,7 +9427,7 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -11325,7 +11297,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -9968,9 +9446,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
+@@ -9968,9 +9439,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -11337,21 +11309,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -9986,11 +9464,11 @@ else
+@@ -9986,11 +9457,11 @@ else
-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:9989: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9467: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9460: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9993: \$? = $ac_status" >&5
-+ echo "$as_me:9471: \$? = $ac_status" >&5
++ echo "$as_me:9464: \$? = $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.
-@@ -10003,7 +9481,7 @@ else
+@@ -10003,7 +9474,7 @@ else
$RM conftest*
fi
@@ -11360,7 +11332,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -10027,9 +9505,9 @@ fi
+@@ -10027,9 +9498,9 @@ fi
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -11372,7 +11344,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -10055,7 +9533,7 @@ else
+@@ -10055,7 +9526,7 @@ else
LDFLAGS="$save_LDFLAGS"
fi
@@ -11381,7 +11353,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -10070,9 +9548,9 @@ fi
+@@ -10070,9 +9541,9 @@ fi
@@ -11393,21 +11365,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10091,11 +9569,11 @@ else
+@@ -10091,11 +9562,11 @@ else
-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:10094: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9572: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9565: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10098: \$? = $ac_status" >&5
-+ echo "$as_me:9576: \$? = $ac_status" >&5
++ echo "$as_me:9569: \$? = $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
-@@ -10117,7 +9595,7 @@ else
+@@ -10117,7 +9588,7 @@ else
$RM conftest*
fi
@@ -11416,7 +11388,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10125,9 +9603,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -10125,9 +9596,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
@@ -11428,21 +11400,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10146,11 +9624,11 @@ else
+@@ -10146,11 +9617,11 @@ else
-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:10149: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9627: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9620: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10153: \$? = $ac_status" >&5
-+ echo "$as_me:9631: \$? = $ac_status" >&5
++ echo "$as_me:9624: \$? = $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
-@@ -10172,7 +9650,7 @@ else
+@@ -10172,7 +9643,7 @@ else
$RM conftest*
fi
@@ -11451,7 +11423,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10181,7 +9659,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -10181,7 +9652,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
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
@@ -11460,7 +11432,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -10189,10 +9667,10 @@ $as_echo_n "checking if we can lock with
+@@ -10189,10 +9660,10 @@ $as_echo_n "checking if we can lock with
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -11473,7 +11445,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -10205,7 +9683,7 @@ fi
+@@ -10205,7 +9676,7 @@ fi
@@ -11482,7 +11454,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -10265,6 +9743,9 @@ $as_echo_n "checking whether the $compil
+@@ -10265,6 +9736,9 @@ $as_echo_n "checking whether the $compil
openbsd*)
with_gnu_ld=no
;;
@@ -11492,7 +11464,7 @@
esac
ld_shlibs=yes
-@@ -10286,6 +9767,7 @@ $as_echo_n "checking whether the $compil
+@@ -10286,6 +9760,7 @@ $as_echo_n "checking whether the $compil
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -11500,7 +11472,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 ...
-@@ -10377,7 +9859,7 @@ _LT_EOF
+@@ -10377,7 +9852,7 @@ _LT_EOF
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'
;;
@@ -11509,7 +11481,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -10447,7 +9929,7 @@ _LT_EOF
+@@ -10447,7 +9922,7 @@ _LT_EOF
fi
;;
@@ -11518,7 +11490,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10622,6 +10104,7 @@ _LT_EOF
+@@ -10622,6 +10097,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -11526,7 +11498,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10647,11 +10130,7 @@ _LT_EOF
+@@ -10647,11 +10123,7 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -11539,7 +11511,7 @@
/* end confdefs.h. */
int
-@@ -10662,27 +10141,7 @@ main ()
+@@ -10662,27 +10134,7 @@ main ()
return 0;
}
_ACEOF
@@ -11568,7 +11540,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10696,16 +10155,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -10696,16 +10148,9 @@ aix_libpath=`dump -H conftest$ac_exeext
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -11587,7 +11559,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10718,11 +10170,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10718,11 +10163,7 @@ if test -z "$aix_libpath"; then aix_libp
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -11600,7 +11572,7 @@
/* end confdefs.h. */
int
-@@ -10733,27 +10181,7 @@ main ()
+@@ -10733,27 +10174,7 @@ main ()
return 0;
}
_ACEOF
@@ -11629,7 +11601,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10767,16 +10195,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -10767,16 +10188,9 @@ aix_libpath=`dump -H conftest$ac_exeext
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -11648,7 +11620,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10988,42 +10409,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10988,42 +10402,16 @@ if test -z "$aix_libpath"; then aix_libp
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -11696,7 +11668,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'
-@@ -11036,7 +10431,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11036,7 +10424,7 @@ rm -f core conftest.err conftest.$ac_obj
link_all_deplibs=yes
;;
@@ -11705,7 +11677,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11279,7 +10674,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11279,7 +10667,7 @@ rm -f core conftest.err conftest.$ac_obj
fi
fi
@@ -11714,7 +11686,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -11316,16 +10711,16 @@ x|xyes)
+@@ -11316,16 +10704,16 @@ x|xyes)
# 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.
@@ -11735,7 +11707,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -11339,11 +10734,11 @@ $as_echo_n "checking whether -lc should
+@@ -11339,11 +10727,11 @@ $as_echo_n "checking whether -lc should
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -11750,7 +11722,7 @@
then
archive_cmds_need_lc=no
else
-@@ -11354,7 +10749,7 @@ $as_echo_n "checking whether -lc should
+@@ -11354,7 +10742,7 @@ $as_echo_n "checking whether -lc should
cat conftest.err 1>&5
fi
$RM conftest*
@@ -11759,7 +11731,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -11518,7 +10913,7 @@ esac
+@@ -11518,7 +10906,7 @@ esac
@@ -11768,7 +11740,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -11926,7 +11321,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -11926,7 +11314,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -11777,7 +11749,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -11940,11 +11335,7 @@ linux* | k*bsd*-gnu)
+@@ -11940,11 +11328,7 @@ linux* | k*bsd*-gnu)
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -11790,7 +11762,7 @@
/* end confdefs.h. */
int
-@@ -11955,41 +11346,13 @@ main ()
+@@ -11955,41 +11339,13 @@ main ()
return 0;
}
_ACEOF
@@ -11836,7 +11808,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -12013,6 +11376,18 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -12013,6 +11369,18 @@ rm -f core conftest.err conftest.$ac_obj
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11855,7 +11827,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -12201,7 +11576,7 @@ uts4*)
+@@ -12201,7 +11569,7 @@ uts4*)
dynamic_linker=no
;;
esac
@@ -11864,7 +11836,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -12303,7 +11678,7 @@ fi
+@@ -12303,7 +11671,7 @@ fi
@@ -11873,7 +11845,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -12328,7 +11703,7 @@ else
+@@ -12328,7 +11696,7 @@ else
# directories.
hardcode_action=unsupported
fi
@@ -11882,7 +11854,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -12373,18 +11748,14 @@ else
+@@ -12373,18 +11741,14 @@ else
darwin*)
# if libdl is installed we need to link against it
@@ -11904,7 +11876,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12402,43 +11773,18 @@ return dlopen ();
+@@ -12402,43 +11766,18 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -11954,7 +11926,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -12451,106 +11797,18 @@ fi
+@@ -12451,106 +11790,18 @@ fi
;;
*)
@@ -12066,7 +12038,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12568,145 +11826,32 @@ return shl_load ();
+@@ -12568,145 +11819,32 @@ return shl_load ();
return 0;
}
_ACEOF
@@ -12223,7 +12195,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12724,57 +11869,28 @@ return dlopen ();
+@@ -12724,57 +11862,28 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -12290,7 +12262,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12792,57 +11908,28 @@ return dlopen ();
+@@ -12792,57 +11901,28 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -12357,7 +12329,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12860,43 +11947,18 @@ return dld_link ();
+@@ -12860,43 +11940,18 @@ return dld_link ();
return 0;
}
_ACEOF
@@ -12407,7 +12379,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -12935,9 +11997,9 @@ fi
+@@ -12935,9 +11990,9 @@ fi
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -12419,16 +12391,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12946,7 +12008,7 @@ else
+@@ -12946,7 +12001,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12949 "configure"
-+#line 12011 "configure"
++#line 12004 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13005,11 +12067,11 @@ int main ()
+@@ -13005,11 +12060,11 @@ int main ()
return status;
}
_LT_EOF
@@ -12443,7 +12415,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13026,14 +12088,14 @@ rm -fr conftest*
+@@ -13026,14 +12081,14 @@ rm -fr conftest*
fi
@@ -12461,16 +12433,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -13042,7 +12104,7 @@ else
+@@ -13042,7 +12097,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13045 "configure"
-+#line 12107 "configure"
++#line 12100 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13101,11 +12163,11 @@ int main ()
+@@ -13101,11 +12156,11 @@ int main ()
return status;
}
_LT_EOF
@@ -12485,7 +12457,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13122,7 +12184,7 @@ rm -fr conftest*
+@@ -13122,7 +12177,7 @@ rm -fr conftest*
fi
@@ -12494,7 +12466,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -13161,12 +12223,12 @@ fi
+@@ -13161,12 +12216,12 @@ fi
striplib=
old_striplib=
@@ -12509,7 +12481,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -13175,15 +12237,15 @@ else
+@@ -13175,15 +12230,15 @@ else
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -12528,7 +12500,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -13201,12 +12263,12 @@ fi
+@@ -13201,12 +12256,12 @@ fi
# Report which library types will actually be built
@@ -12544,7 +12516,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -13227,14 +12289,14 @@ $as_echo_n "checking whether to build sh
+@@ -13227,14 +12282,14 @@ $as_echo_n "checking whether to build sh
fi
;;
esac
@@ -12562,7 +12534,7 @@
$as_echo "$enable_static" >&6; }
-@@ -13271,22 +12333,18 @@ CC="$lt_save_CC"
+@@ -13271,22 +12326,18 @@ CC="$lt_save_CC"
#AC_PROG_SED available in 2.59b
if test "x$CC" != xcc; then
@@ -12589,7 +12561,7 @@
/* end confdefs.h. */
int
-@@ -13302,63 +12360,63 @@ _ACEOF
+@@ -13302,63 +12353,63 @@ _ACEOF
# existing .o file with -o, though they will create one.
ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
rm -f conftest2.*
@@ -12678,7 +12650,7 @@
then
# cc works too.
:
-@@ -13375,15 +12433,13 @@ rm -f core conftest*
+@@ -13375,15 +12426,13 @@ rm -f core conftest*
fi
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -12697,7 +12669,7 @@
fi
-@@ -13413,9 +12469,9 @@ fi
+@@ -13413,9 +12462,9 @@ fi
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -12709,7 +12681,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -13428,14 +12484,14 @@ for as_dir in $PATH
+@@ -13428,14 +12477,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12727,7 +12699,7 @@
IFS=$as_save_IFS
;;
-@@ -13443,10 +12499,10 @@ esac
+@@ -13443,10 +12492,10 @@ esac
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -12740,7 +12712,7 @@
$as_echo "no" >&6; }
fi
-@@ -13460,20 +12516,18 @@ test -n "$PYTHON" || PYTHON=":"
+@@ -13460,20 +12509,18 @@ test -n "$PYTHON" || PYTHON=":"
if test "$PYTHON" = :; then
@@ -12765,7 +12737,7 @@
$as_echo "$am_cv_python_version" >&6; }
PYTHON_VERSION=$am_cv_python_version
-@@ -13485,23 +12539,23 @@ $as_echo "$am_cv_python_version" >&6; }
+@@ -13485,23 +12532,23 @@ $as_echo "$am_cv_python_version" >&6; }
@@ -12794,7 +12766,7 @@
$as_echo_n "(cached) " >&6
else
if test "x$prefix" = xNONE
-@@ -13517,10 +12571,18 @@ else
+@@ -13517,10 +12564,18 @@ else
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
;;
@@ -12814,7 +12786,7 @@
$as_echo "$am_cv_python_pythondir" >&6; }
pythondir=$am_cv_python_pythondir
-@@ -13529,9 +12591,9 @@ $as_echo "$am_cv_python_pythondir" >&6;
+@@ -13529,9 +12584,9 @@ $as_echo "$am_cv_python_pythondir" >&6;
pkgpythondir=\${pythondir}/$PACKAGE
@@ -12826,7 +12798,7 @@
$as_echo_n "(cached) " >&6
else
if test "x$exec_prefix" = xNONE
-@@ -13547,10 +12609,18 @@ else
+@@ -13547,10 +12602,18 @@ else
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
;;
@@ -12846,7 +12818,7 @@
$as_echo "$am_cv_python_pyexecdir" >&6; }
pyexecdir=$am_cv_python_pyexecdir
-@@ -13565,9 +12635,9 @@ $as_echo "$am_cv_python_pyexecdir" >&6;
+@@ -13565,9 +12628,9 @@ $as_echo "$am_cv_python_pyexecdir" >&6;
# Extract the first word of "glib-genmarshal", so it can be a program name with args.
set dummy glib-genmarshal; ac_word=$2
@@ -12858,7 +12830,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -13580,14 +12650,14 @@ for as_dir in $PATH
+@@ -13580,14 +12643,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12876,7 +12848,7 @@
IFS=$as_save_IFS
;;
-@@ -13595,19 +12665,19 @@ esac
+@@ -13595,19 +12658,19 @@ esac
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -12900,7 +12872,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -13620,14 +12690,14 @@ for as_dir in $PATH
+@@ -13620,14 +12683,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12918,7 +12890,7 @@
IFS=$as_save_IFS
;;
-@@ -13635,10 +12705,10 @@ esac
+@@ -13635,10 +12698,10 @@ esac
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -12931,7 +12903,7 @@
$as_echo "no" >&6; }
fi
-@@ -13647,7 +12717,7 @@ fi
+@@ -13647,7 +12710,7 @@ fi
# Check whether --enable-compile-warnings was given.
@@ -12940,7 +12912,7 @@
enableval=$enable_compile_warnings;
else
enable_compile_warnings="maximum"
-@@ -13678,13 +12748,9 @@ fi
+@@ -13678,13 +12741,9 @@ fi
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -12956,7 +12928,7 @@
/* end confdefs.h. */
int
-@@ -13695,35 +12761,14 @@ main ()
+@@ -13695,35 +12754,14 @@ main ()
return 0;
}
_ACEOF
@@ -12995,7 +12967,7 @@
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
-@@ -13737,26 +12782,24 @@ $as_echo "$has_option" >&6; }
+@@ -13737,26 +12775,24 @@ $as_echo "$has_option" >&6; }
fi
;;
*)
@@ -13027,7 +12999,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
-@@ -13771,7 +12814,7 @@ $as_echo_n "checking what language compl
+@@ -13771,7 +12807,7 @@ $as_echo_n "checking what language compl
esac
fi
fi
@@ -13036,7 +13008,7 @@
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -13779,7 +12822,7 @@ $as_echo "$complCFLAGS" >&6; }
+@@ -13779,7 +12815,7 @@ $as_echo "$complCFLAGS" >&6; }
# Check whether --enable-deprecations was given.
@@ -13045,7 +13017,7 @@
enableval=$enable_deprecations;
else
enable_deprecations=no
-@@ -13791,253 +12834,24 @@ if test "x$enable_deprecations" = "xyes"
+@@ -13791,253 +12827,24 @@ if test "x$enable_deprecations" = "xyes"
fi
@@ -13308,7 +13280,7 @@
_ACEOF
fi
-@@ -14068,9 +12882,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
+@@ -14068,9 +12875,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
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
@@ -13320,7 +13292,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -14083,14 +12897,14 @@ for as_dir in $PATH
+@@ -14083,14 +12890,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13338,7 +13310,7 @@
IFS=$as_save_IFS
;;
-@@ -14098,10 +12912,10 @@ esac
+@@ -14098,10 +12905,10 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -13351,7 +13323,7 @@
$as_echo "no" >&6; }
fi
-@@ -14111,9 +12925,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
+@@ -14111,9 +12918,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
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
@@ -13363,7 +13335,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -14126,14 +12940,14 @@ for as_dir in $PATH
+@@ -14126,14 +12933,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13381,7 +13353,7 @@
IFS=$as_save_IFS
;;
-@@ -14141,10 +12955,10 @@ esac
+@@ -14141,10 +12948,10 @@ esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -13394,7 +13366,7 @@
$as_echo "no" >&6; }
fi
-@@ -14153,7 +12967,7 @@ fi
+@@ -14153,7 +12960,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -13403,7 +13375,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -14166,13 +12980,13 @@ fi
+@@ -14166,13 +12973,13 @@ fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -13420,7 +13392,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -14180,40 +12994,44 @@ $as_echo "no" >&6; }
+@@ -14180,40 +12987,44 @@ $as_echo "no" >&6; }
fi
pkg_failed=no
@@ -13484,7 +13456,7 @@
fi
-@@ -14226,25 +13044,14 @@ else
+@@ -14226,25 +13037,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13513,7 +13485,7 @@
$EGG_SMCLIENT_PKG_ERRORS
-@@ -14254,22 +13061,11 @@ installed software in a non-standard pre
+@@ -14254,22 +13054,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS
and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -13539,7 +13511,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14278,52 +13074,55 @@ and EGG_SMCLIENT_LIBS to avoid the need
+@@ -14278,52 +13067,55 @@ and EGG_SMCLIENT_LIBS to avoid the need
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13617,7 +13589,7 @@
fi
-@@ -14336,25 +13135,14 @@ else
+@@ -14336,25 +13128,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13646,7 +13618,7 @@
$PANEL_PKG_ERRORS
-@@ -14364,22 +13152,11 @@ installed software in a non-standard pre
+@@ -14364,22 +13145,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables PANEL_CFLAGS
and PANEL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -13672,7 +13644,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14388,12 +13165,11 @@ and PANEL_LIBS to avoid the need to call
+@@ -14388,12 +13158,11 @@ and PANEL_LIBS to avoid the need to call
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13687,36 +13659,32 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14402,40 +13178,44 @@ fi
+@@ -14402,40 +13171,44 @@ fi
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for LIBPANEL_APPLET" >&5
--$as_echo_n "checking for LIBPANEL_APPLET... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOGOUT" >&5
-+$as_echo_n "checking for LOGOUT... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPANEL_APPLET" >&5
+ $as_echo_n "checking for LIBPANEL_APPLET... " >&6; }
-if test -n "$LIBPANEL_APPLET_CFLAGS"; then
- pkg_cv_LIBPANEL_APPLET_CFLAGS="$LIBPANEL_APPLET_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED\"") >&5
-- ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED") 2>&5
-- ac_status=$?
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBPANEL_APPLET_CFLAGS"; then
++ pkg_cv_LIBPANEL_APPLET_CFLAGS="$LIBPANEL_APPLET_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED") 2>&5
+ ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_LIBPANEL_APPLET_CFLAGS=`$PKG_CONFIG --cflags "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$LOGOUT_CFLAGS"; then
-+ pkg_cv_LOGOUT_CFLAGS="$LOGOUT_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
-+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
-+ pkg_cv_LOGOUT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
+ pkg_cv_LIBPANEL_APPLET_CFLAGS=`$PKG_CONFIG --cflags "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -13731,22 +13699,19 @@
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED\"") >&5
-- ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED") 2>&5
-- ac_status=$?
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBPANEL_APPLET_LIBS"; then
++ pkg_cv_LIBPANEL_APPLET_LIBS="$LIBPANEL_APPLET_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED") 2>&5
+ ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_LIBPANEL_APPLET_LIBS=`$PKG_CONFIG --libs "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$LOGOUT_LIBS"; then
-+ pkg_cv_LOGOUT_LIBS="$LOGOUT_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
-+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
-+ pkg_cv_LOGOUT_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
+ pkg_cv_LIBPANEL_APPLET_LIBS=`$PKG_CONFIG --libs "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -13758,44 +13723,38 @@
fi
-@@ -14448,64 +13228,41 @@ else
+@@ -14448,25 +13221,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>&1`
-+ LOGOUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
++ LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED"`
else
- LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>&1`
-+ LOGOUT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
++ LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED"`
fi
# Put the nasty error message in config.log where it belongs
-- echo "$LIBPANEL_APPLET_PKG_ERRORS" >&5
--
+ echo "$LIBPANEL_APPLET_PKG_ERRORS" >&5
+
- { { $as_echo "$as_me:$LINENO: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED) were not met:
-
-$LIBPANEL_APPLET_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-+ echo "$LOGOUT_PKG_ERRORS" >&5
-
+-
-Alternatively, you may set the environment variables LIBPANEL_APPLET_CFLAGS
-and LIBPANEL_APPLET_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 (ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED) were not met:
-+ as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
-
--$LIBPANEL_APPLET_PKG_ERRORS
-+$LOGOUT_PKG_ERRORS
-
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
-
--Alternatively, you may set the environment variables LIBPANEL_APPLET_CFLAGS
--and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
-+Alternatively, you may set the environment variables LOGOUT_CFLAGS
-+and LOGOUT_LIBS to avoid the need to call pkg-config.
++ as_fn_error "Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED) were not met:
+
+ $LIBPANEL_APPLET_PKG_ERRORS
+
+@@ -14476,22 +13238,11 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables LIBPANEL_APPLET_CFLAGS
+ and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
@@ -13819,10 +13778,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
--Alternatively, you may set the environment variables LIBPANEL_APPLET_CFLAGS
--and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
-+Alternatively, you may set the environment variables LOGOUT_CFLAGS
-+and LOGOUT_LIBS to avoid the need to call pkg-config.
+@@ -14500,12 +13251,11 @@ and LIBPANEL_APPLET_LIBS to avoid the ne
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13830,206 +13786,107 @@
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
else
-- LIBPANEL_APPLET_CFLAGS=$pkg_cv_LIBPANEL_APPLET_CFLAGS
-- LIBPANEL_APPLET_LIBS=$pkg_cv_LIBPANEL_APPLET_LIBS
+ LIBPANEL_APPLET_CFLAGS=$pkg_cv_LIBPANEL_APPLET_CFLAGS
+ LIBPANEL_APPLET_LIBS=$pkg_cv_LIBPANEL_APPLET_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ LOGOUT_CFLAGS=$pkg_cv_LOGOUT_CFLAGS
-+ LOGOUT_LIBS=$pkg_cv_LOGOUT_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
:
fi
-@@ -14514,40 +13271,44 @@ fi
+@@ -14514,40 +13264,44 @@ fi
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for FISH" >&5
--$as_echo_n "checking for FISH... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPANEL_APPLET" >&5
-+$as_echo_n "checking for LIBPANEL_APPLET... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FISH" >&5
+ $as_echo_n "checking for FISH... " >&6; }
-if test -n "$FISH_CFLAGS"; then
- pkg_cv_FISH_CFLAGS="$FISH_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED cairo >= \$CAIRO_REQUIRED\"") >&5
-- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED") 2>&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$LIBPANEL_APPLET_CFLAGS"; then
-+ pkg_cv_LIBPANEL_APPLET_CFLAGS="$LIBPANEL_APPLET_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_FISH_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>/dev/null`
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_LIBPANEL_APPLET_CFLAGS=`$PKG_CONFIG --cflags "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$FISH_LIBS"; then
-- pkg_cv_FISH_LIBS="$FISH_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED cairo >= \$CAIRO_REQUIRED\"") >&5
-- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED") 2>&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$LIBPANEL_APPLET_LIBS"; then
-+ pkg_cv_LIBPANEL_APPLET_LIBS="$LIBPANEL_APPLET_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_FISH_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>/dev/null`
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_LIBPANEL_APPLET_LIBS=`$PKG_CONFIG --libs "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -14560,27 +13321,109 @@ else
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- FISH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>&1`
-+ LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED"`
- else
-- FISH_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>&1`
-+ LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED"`
- fi
- # Put the nasty error message in config.log where it belongs
-- echo "$FISH_PKG_ERRORS" >&5
-+ echo "$LIBPANEL_APPLET_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED) were not met:
-+ as_fn_error "Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED) were not met:
-
--$FISH_PKG_ERRORS
-+$LIBPANEL_APPLET_PKG_ERRORS
-
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
-
--Alternatively, you may set the environment variables FISH_CFLAGS
--and FISH_LIBS to avoid the need to call pkg-config.
-+Alternatively, you may set the environment variables LIBPANEL_APPLET_CFLAGS
-+and LIBPANEL_APPLET_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 (gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED) were not met:
--
--$FISH_PKG_ERRORS
-+" "$LINENO" 5
-+elif test $pkg_failed = untried; then
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables LIBPANEL_APPLET_CFLAGS
-+and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." "$LINENO" 5; }
-+else
-+ LIBPANEL_APPLET_CFLAGS=$pkg_cv_LIBPANEL_APPLET_CFLAGS
-+ LIBPANEL_APPLET_LIBS=$pkg_cv_LIBPANEL_APPLET_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ :
-+fi
-+
-+
-+
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FISH" >&5
-+$as_echo_n "checking for FISH... " >&6; }
-+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$FISH_CFLAGS"; then
+ pkg_cv_FISH_CFLAGS="$FISH_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED cairo >= \$CAIRO_REQUIRED\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED") 2>&5
-+ ac_status=$?
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
-+ pkg_cv_FISH_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
+ pkg_cv_FISH_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
-+fi
+ fi
+-if test -n "$FISH_LIBS"; then
+- pkg_cv_FISH_LIBS="$FISH_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED cairo >= \$CAIRO_REQUIRED\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$FISH_LIBS"; then
+ pkg_cv_FISH_LIBS="$FISH_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED cairo >= \$CAIRO_REQUIRED\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED") 2>&5
-+ ac_status=$?
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
-+ pkg_cv_FISH_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
+ pkg_cv_FISH_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
+ fi
+
+
+@@ -14560,25 +13314,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- FISH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>&1`
+ FISH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED"`
-+ else
+ else
+- FISH_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>&1`
+ FISH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$FISH_PKG_ERRORS" >&5
-+
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$FISH_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED) were not met:
+-
+-$FISH_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables FISH_CFLAGS
+-and FISH_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 (gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED) were not met:
+ as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED) were not met:
-+
-+$FISH_PKG_ERRORS
-
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
-@@ -14588,22 +13431,11 @@ installed software in a non-standard pre
+
+ $FISH_PKG_ERRORS
+
+@@ -14588,22 +13331,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables FISH_CFLAGS
and FISH_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -14055,7 +13912,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14612,12 +13444,11 @@ and FISH_LIBS to avoid the need to call
+@@ -14612,12 +13344,11 @@ and FISH_LIBS to avoid the need to call
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -14070,7 +13927,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14626,40 +13457,44 @@ fi
+@@ -14626,40 +13357,44 @@ fi
pkg_failed=no
@@ -14134,7 +13991,7 @@
fi
-@@ -14672,25 +13507,14 @@ else
+@@ -14672,25 +13407,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14163,7 +14020,7 @@
$NOTIFICATION_AREA_PKG_ERRORS
-@@ -14700,22 +13524,11 @@ installed software in a non-standard pre
+@@ -14700,12 +13424,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables NOTIFICATION_AREA_CFLAGS
and NOTIFICATION_AREA_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -14175,6 +14032,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.
+
+@@ -14714,22 +13437,11 @@ and NOTIFICATION_AREA_LIBS to avoid the
+ 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.
-
@@ -14183,16 +14050,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.
-
-@@ -14724,12 +13537,11 @@ and NOTIFICATION_AREA_LIBS to avoid the
- 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; }
@@ -14204,7 +14061,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14738,40 +13550,44 @@ fi
+@@ -14738,40 +13450,44 @@ fi
pkg_failed=no
@@ -14268,7 +14125,7 @@
fi
-@@ -14784,25 +13600,14 @@ else
+@@ -14784,25 +13500,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14297,7 +14154,7 @@
$WNCKLET_PKG_ERRORS
-@@ -14812,22 +13617,11 @@ installed software in a non-standard pre
+@@ -14812,22 +13517,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables WNCKLET_CFLAGS
and WNCKLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -14323,7 +14180,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14836,265 +13630,35 @@ and WNCKLET_LIBS to avoid the need to ca
+@@ -14836,265 +13530,35 @@ and WNCKLET_LIBS to avoid the need to ca
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -14599,7 +14456,7 @@
_ACEOF
fi
-@@ -15102,7 +13666,7 @@ done
+@@ -15102,7 +13566,7 @@ done
# Check whether --enable-eds was given.
@@ -14608,7 +14465,7 @@
enableval=$enable_eds;
else
enable_eds=auto
-@@ -15115,25 +13679,23 @@ if test "x$enable_eds" = "xyes"; then
+@@ -15115,25 +13579,23 @@ if test "x$enable_eds" = "xyes"; then
CLOCK_EDS_ICONDIR=`$PKG_CONFIG --variable=datadir evolution-data-server-1.2`/pixmaps/evolution-data-server
else
if test "x$enable_eds" != "xno"; then
@@ -14638,7 +14495,7 @@
fi
if test -n "$LIBECAL_REQUIREMENT"; then
-@@ -15148,40 +13710,44 @@ fi
+@@ -15148,40 +13610,44 @@ fi
pkg_failed=no
@@ -14702,7 +14559,7 @@
fi
-@@ -15194,25 +13760,14 @@ else
+@@ -15194,25 +13660,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14731,7 +14588,7 @@
$CLOCK_PKG_ERRORS
-@@ -15222,22 +13777,11 @@ installed software in a non-standard pre
+@@ -15222,22 +13677,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables CLOCK_CFLAGS
and CLOCK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -14757,7 +14614,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -15246,12 +13790,11 @@ and CLOCK_LIBS to avoid the need to call
+@@ -15246,12 +13690,11 @@ and CLOCK_LIBS to avoid the need to call
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -14772,7 +14629,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -15260,40 +13803,44 @@ fi
+@@ -15260,40 +13703,44 @@ fi
pkg_failed=no
@@ -14836,7 +14693,7 @@
fi
-@@ -15306,25 +13853,14 @@ else
+@@ -15306,25 +13753,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14865,7 +14722,7 @@
$CLOCK_MECHANISM_PKG_ERRORS
-@@ -15334,22 +13870,11 @@ installed software in a non-standard pre
+@@ -15334,22 +13770,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables CLOCK_MECHANISM_CFLAGS
and CLOCK_MECHANISM_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -14891,7 +14748,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -15358,12 +13883,11 @@ and CLOCK_MECHANISM_LIBS to avoid the ne
+@@ -15358,12 +13783,11 @@ and CLOCK_MECHANISM_LIBS to avoid the ne
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -14906,7 +14763,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -15380,7 +13904,7 @@ NETWORK_MANAGER_REQUIRED=0.6
+@@ -15380,7 +13804,7 @@ NETWORK_MANAGER_REQUIRED=0.6
POLKIT_CFLAGS=
POLKIT_LIBS=
# Check whether --enable-polkit was given.
@@ -14915,7 +14772,7 @@
enableval=$enable_polkit; enable_polkit=$enableval
else
enable_polkit=auto
-@@ -15392,40 +13916,44 @@ else
+@@ -15392,40 +13816,44 @@ else
HAVE_POLKIT=no
pkg_failed=no
@@ -14979,7 +14836,7 @@
fi
-@@ -15438,14 +13966,14 @@ else
+@@ -15438,14 +13866,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14997,7 +14854,7 @@
$as_echo "no" >&6; }
HAVE_POLKIT=no
elif test $pkg_failed = untried; then
-@@ -15453,22 +13981,18 @@ elif test $pkg_failed = untried; then
+@@ -15453,22 +13881,18 @@ elif test $pkg_failed = untried; then
else
POLKIT_CFLAGS=$pkg_cv_POLKIT_CFLAGS
POLKIT_LIBS=$pkg_cv_POLKIT_LIBS
@@ -15023,7 +14880,7 @@
fi
fi
-@@ -15484,7 +14008,7 @@ fi
+@@ -15484,7 +13908,7 @@ fi
# Check whether --enable-network_manager was given.
@@ -15032,7 +14889,7 @@
enableval=$enable_network_manager; enable_network_manager=$enableval
else
enable_network_manager=auto
-@@ -15495,40 +14019,44 @@ if test "x$enable_network_manager" = "xn
+@@ -15495,40 +13919,44 @@ if test "x$enable_network_manager" = "xn
else
pkg_failed=no
@@ -15096,7 +14953,7 @@
fi
-@@ -15541,14 +14069,14 @@ else
+@@ -15541,14 +13969,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15114,7 +14971,7 @@
$as_echo "no" >&6; }
HAVE_NETWORK_MANAGER=no
elif test $pkg_failed = untried; then
-@@ -15556,16 +14084,14 @@ elif test $pkg_failed = untried; then
+@@ -15556,16 +13984,14 @@ elif test $pkg_failed = untried; then
else
NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS
NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS
@@ -15133,7 +14990,7 @@
fi
-@@ -15575,7 +14101,7 @@ PANEL_INPROCESS_ALL=
+@@ -15575,7 +14001,7 @@ PANEL_INPROCESS_ALL=
PANEL_INPROCESS_APPLETS=
# Check whether --with-in-process-applets was given.
@@ -15142,7 +14999,7 @@
withval=$with_in_process_applets; for i in `echo $withval | tr , ' '`; do
if test $i = "none"; then
PANEL_INPROCESS_NONE=1
-@@ -15606,30 +14132,22 @@ for i in $PANEL_INPROCESS_APPLETS; do
+@@ -15606,30 +14032,22 @@ for i in $PANEL_INPROCESS_APPLETS; do
if test $i = "clock"; then
CLOCK_COMPILE_INPROCESS=1
@@ -15177,7 +15034,7 @@
fi; fi; fi; fi
done
-@@ -15671,24 +14189,15 @@ fi
+@@ -15671,24 +14089,15 @@ fi
# For the run dialog
@@ -15205,7 +15062,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <$ac_hdr>
-@@ -15702,41 +14211,18 @@ return 0;
+@@ -15702,41 +14111,18 @@ return 0;
return 0;
}
_ACEOF
@@ -15253,7 +15110,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
_ACEOF
-@@ -15747,17 +14233,13 @@ fi
+@@ -15747,17 +14133,13 @@ fi
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
@@ -15274,7 +15131,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15782,70 +14264,39 @@ for ac_lib in '' dir; do
+@@ -15782,70 +14164,39 @@ for ac_lib in '' dir; do
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -15356,7 +15213,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15870,70 +14321,39 @@ for ac_lib in '' x; do
+@@ -15870,70 +14221,39 @@ for ac_lib in '' x; do
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -15438,7 +15295,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -15960,60 +14380,33 @@ struct dirent dp; dp.d_type = 0;
+@@ -15960,60 +14280,33 @@ struct dirent dp; dp.d_type = 0;
return 0;
}
_ACEOF
@@ -15507,7 +15364,7 @@
withval=$with_x;
fi
-@@ -16023,10 +14416,8 @@ if test "x$with_x" = xno; then
+@@ -16023,10 +14316,8 @@ if test "x$with_x" = xno; then
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -15520,7 +15377,7 @@
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
-@@ -16074,21 +14465,25 @@ fi
+@@ -16074,21 +14365,25 @@ fi
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
@@ -15546,7 +15403,7 @@
/usr/local/include/X11R6
/usr/local/include/X11R5
/usr/local/include/X11R4
-@@ -16110,37 +14505,14 @@ ac_x_header_dirs='
+@@ -16110,37 +14405,14 @@ ac_x_header_dirs='
if test "$ac_x_includes" = no; then
# Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
@@ -15586,7 +15443,7 @@
for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
-@@ -16148,7 +14520,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -16148,7 +14420,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
done
fi
@@ -15594,7 +15451,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
-@@ -16158,11 +14529,7 @@ if test "$ac_x_libraries" = no; then
+@@ -16158,11 +14429,7 @@ if test "$ac_x_libraries" = no; then
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
@@ -15607,7 +15464,7 @@
/* end confdefs.h. */
#include <X11/Xlib.h>
int
-@@ -16173,35 +14540,12 @@ XrmInitialize ()
+@@ -16173,35 +14440,12 @@ XrmInitialize ()
return 0;
}
_ACEOF
@@ -15645,7 +15502,7 @@
for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do
# Don't even attempt the hair of trying to link an X program!
-@@ -16213,10 +14557,8 @@ do
+@@ -16213,10 +14457,8 @@ do
done
done
fi
@@ -15658,7 +15515,7 @@
fi # $ac_x_libraries = no
case $ac_x_includes,$ac_x_libraries in #(
-@@ -16237,7 +14579,7 @@ fi
+@@ -16237,7 +14479,7 @@ fi
fi # $with_x != no
if test "$have_x" != yes; then
@@ -15667,7 +15524,7 @@
$as_echo "$have_x" >&6; }
no_x=yes
else
-@@ -16248,46 +14590,50 @@ else
+@@ -16248,46 +14490,50 @@ else
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -15738,7 +15595,7 @@
fi
-@@ -16300,14 +14646,14 @@ else
+@@ -16300,14 +14546,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15756,7 +15613,7 @@
$as_echo "no" >&6; }
# pkg-config modules not found (only present since X11R7 aka Xorg); use
-@@ -16315,9 +14661,7 @@ $as_echo "no" >&6; }
+@@ -16315,9 +14561,7 @@ $as_echo "no" >&6; }
if test "$no_x" = yes; then
# Not all programs may use this symbol, but it does not hurt to define it.
@@ -15767,7 +15624,7 @@
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
else
-@@ -16330,16 +14674,12 @@ else
+@@ -16330,16 +14574,12 @@ else
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
@@ -15786,7 +15643,7 @@
/* end confdefs.h. */
int
-@@ -16350,40 +14690,13 @@ main ()
+@@ -16350,40 +14590,13 @@ main ()
return 0;
}
_ACEOF
@@ -15831,7 +15688,7 @@
/* end confdefs.h. */
int
-@@ -16394,46 +14707,19 @@ main ()
+@@ -16394,46 +14607,19 @@ main ()
return 0;
}
_ACEOF
@@ -15885,7 +15742,7 @@
ac_c_werror_flag=$ac_xsave_c_werror_flag
LIBS=$ac_xsave_LIBS
fi
-@@ -16449,11 +14735,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -16449,11 +14635,7 @@ rm -f core conftest.err conftest.$ac_obj
# libraries were built with DECnet support. And Karl Berry says
# the Alpha needs dnet_stub (dnet does not exist).
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
@@ -15898,7 +15755,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16471,44 +14753,17 @@ return XOpenDisplay ();
+@@ -16471,44 +14653,17 @@ return XOpenDisplay ();
return 0;
}
_ACEOF
@@ -15948,7 +15805,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16526,59 +14781,30 @@ return dnet_ntoa ();
+@@ -16526,59 +14681,30 @@ return dnet_ntoa ();
return 0;
}
_ACEOF
@@ -16017,7 +15874,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16596,52 +14822,25 @@ return dnet_ntoa ();
+@@ -16596,52 +14722,25 @@ return dnet_ntoa ();
return 0;
}
_ACEOF
@@ -16078,7 +15935,1285 @@
LIBS="$ac_xsave_LIBS"
# msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -16652,105 +14851,20 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -16652,105 +14751,20 @@ rm -f core conftest.err conftest.$ac_obj
+ # on Irix 5.2, according to T.E. Dickey.
+ # The functions gethostbyname, getservbyname, and inet_addr are
+ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
+-$as_echo_n "checking for gethostbyname... " >&6; }
+-if test "${ac_cv_func_gethostbyname+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 gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define gethostbyname innocuous_gethostbyname
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char gethostbyname (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
++ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
++if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef gethostbyname
+-
+-/* 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 gethostbyname ();
+-/* 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_gethostbyname || defined __stub___gethostbyname
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return gethostbyname ();
+- ;
+- 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_gethostbyname=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_gethostbyname=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+-$as_echo "$ac_cv_func_gethostbyname" >&6; }
+
+ if test $ac_cv_func_gethostbyname = no; then
+- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
+ $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -16768,59 +14782,30 @@ return gethostbyname ();
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_nsl_gethostbyname=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_nsl_gethostbyname=no
++ ac_cv_lib_nsl_gethostbyname=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+
+ if test $ac_cv_lib_nsl_gethostbyname = no; then
+- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
+ $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
+-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -16838,43 +14823,18 @@ return gethostbyname ();
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_bsd_gethostbyname=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_bsd_gethostbyname=no
++ ac_cv_lib_bsd_gethostbyname=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
+-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
++if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+ fi
+
+@@ -16888,105 +14848,20 @@ fi
+ # variants that don't use the name server (or something). -lsocket
+ # must be given before -lnsl if both are needed. We assume that
+ # if connect needs -lnsl, so does gethostbyname.
+- { $as_echo "$as_me:$LINENO: checking for connect" >&5
+-$as_echo_n "checking for connect... " >&6; }
+-if test "${ac_cv_func_connect+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 connect to an innocuous variant, in case <limits.h> declares connect.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define connect innocuous_connect
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char connect (); 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 connect
+-
+-/* 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 connect ();
+-/* 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_connect || defined __stub___connect
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return connect ();
+- ;
+- 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_connect=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_connect=no
+-fi
++ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
++if test "x$ac_cv_func_connect" = x""yes; then :
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+-$as_echo "$ac_cv_func_connect" >&6; }
+
+ if test $ac_cv_func_connect = no; then
+- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+ $as_echo_n "checking for connect in -lsocket... " >&6; }
+-if test "${ac_cv_lib_socket_connect+set}" = set; then
++if test "${ac_cv_lib_socket_connect+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -17004,148 +14879,38 @@ return connect ();
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_socket_connect=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_socket_connect=no
++ ac_cv_lib_socket_connect=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
+ $as_echo "$ac_cv_lib_socket_connect" >&6; }
+-if test "x$ac_cv_lib_socket_connect" = x""yes; then
++if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+ fi
+
+ fi
+
+ # Guillermo Gomez says -lposix is necessary on A/UX.
+- { $as_echo "$as_me:$LINENO: checking for remove" >&5
+-$as_echo_n "checking for remove... " >&6; }
+-if test "${ac_cv_func_remove+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 remove to an innocuous variant, in case <limits.h> declares remove.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define remove innocuous_remove
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char remove (); 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 remove
+-
+-/* 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 remove ();
+-/* 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_remove || defined __stub___remove
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return remove ();
+- ;
+- 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_remove=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_remove=no
+-fi
++ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
++if test "x$ac_cv_func_remove" = x""yes; then :
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+-$as_echo "$ac_cv_func_remove" >&6; }
+
+ if test $ac_cv_func_remove = no; then
+- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
+ $as_echo_n "checking for remove in -lposix... " >&6; }
+-if test "${ac_cv_lib_posix_remove+set}" = set; then
++if test "${ac_cv_lib_posix_remove+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -17163,148 +14928,38 @@ return remove ();
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_posix_remove=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_posix_remove=no
++ ac_cv_lib_posix_remove=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
+ $as_echo "$ac_cv_lib_posix_remove" >&6; }
+-if test "x$ac_cv_lib_posix_remove" = x""yes; then
++if test "x$ac_cv_lib_posix_remove" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+ fi
+
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+- { $as_echo "$as_me:$LINENO: checking for shmat" >&5
+-$as_echo_n "checking for shmat... " >&6; }
+-if test "${ac_cv_func_shmat+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 shmat to an innocuous variant, in case <limits.h> declares shmat.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define shmat innocuous_shmat
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char shmat (); 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 shmat
+-
+-/* 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 shmat ();
+-/* 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_shmat || defined __stub___shmat
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return shmat ();
+- ;
+- 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_shmat=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_shmat=no
+-fi
++ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
++if test "x$ac_cv_func_shmat" = x""yes; then :
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+-$as_echo "$ac_cv_func_shmat" >&6; }
+
+ if test $ac_cv_func_shmat = no; then
+- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
+ $as_echo_n "checking for shmat in -lipc... " >&6; }
+-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
++if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -17322,43 +14977,18 @@ return shmat ();
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ipc_shmat=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_ipc_shmat=no
++ ac_cv_lib_ipc_shmat=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
+ $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
+-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
++if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+ fi
+
+@@ -17374,18 +15004,14 @@ fi
+ # These have to be linked with before -lX11, unlike the other
+ # libraries we check for below, so use a different variable.
+ # John Interrante, Karl Berry
+- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
+ $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
+-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
++if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -17403,43 +15029,18 @@ return IceConnectionNumber ();
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_ICE_IceConnectionNumber=no
++ ac_cv_lib_ICE_IceConnectionNumber=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
++if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+ fi
+
+@@ -17449,28 +15050,21 @@ fi
+
+ # X not found
+ if test x$no_x = xyes ; then
+- { { $as_echo "$as_me:$LINENO: error: X development libraries not found" >&5
+-$as_echo "$as_me: error: X development libraries not found" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "X development libraries not found" "$LINENO" 5
+ fi
+
+ gp_save_cflags="$CFLAGS"
+ gp_save_libs="$LIBS"
+ CFLAGS="$X_CFLAGS"
+ LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
+-
+-{ $as_echo "$as_me:$LINENO: checking for XFree in -lX11" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XFree in -lX11" >&5
+ $as_echo_n "checking for XFree in -lX11... " >&6; }
+-if test "${ac_cv_lib_X11_XFree+set}" = set; then
++if test "${ac_cv_lib_X11_XFree+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -17488,43 +15082,18 @@ return XFree ();
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_X11_XFree=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_X11_XFree=no
++ ac_cv_lib_X11_XFree=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XFree" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XFree" >&5
+ $as_echo "$ac_cv_lib_X11_XFree" >&6; }
+-if test "x$ac_cv_lib_X11_XFree" = x""yes; then
++if test "x$ac_cv_lib_X11_XFree" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBX11 1
+ _ACEOF
+@@ -17532,24 +15101,17 @@ _ACEOF
+ LIBS="-lX11 $LIBS"
+
+ else
+- { { $as_echo "$as_me:$LINENO: error: libX11 not found" >&5
+-$as_echo "$as_me: error: libX11 not found" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "libX11 not found" "$LINENO" 5
+ fi
+
+-
+-{ $as_echo "$as_me:$LINENO: checking for XauFileName in -lXau" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauFileName in -lXau" >&5
+ $as_echo_n "checking for XauFileName in -lXau... " >&6; }
+-if test "${ac_cv_lib_Xau_XauFileName+set}" = set; then
++if test "${ac_cv_lib_Xau_XauFileName+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXau $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -17567,43 +15129,18 @@ return XauFileName ();
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_Xau_XauFileName=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_Xau_XauFileName=no
++ ac_cv_lib_Xau_XauFileName=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauFileName" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xau_XauFileName" >&5
+ $as_echo "$ac_cv_lib_Xau_XauFileName" >&6; }
+-if test "x$ac_cv_lib_Xau_XauFileName" = x""yes; then
++if test "x$ac_cv_lib_Xau_XauFileName" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBXAU 1
+ _ACEOF
+@@ -17611,9 +15148,7 @@ _ACEOF
+ LIBS="-lXau $LIBS"
+
+ else
+- { { $as_echo "$as_me:$LINENO: error: libXau not found" >&5
+-$as_echo "$as_me: error: libXau not found" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "libXau not found" "$LINENO" 5
+ fi
+
+ CFLAGS="$gp_save_cflags"
+@@ -17628,9 +15163,7 @@ elif test $pkg_failed = untried; then
+ if test "$no_x" = yes; then
+ # Not all programs may use this symbol, but it does not hurt to define it.
+
+-cat >>confdefs.h <<\_ACEOF
+-#define X_DISPLAY_MISSING 1
+-_ACEOF
++$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
+
+ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
+ else
+@@ -17643,16 +15176,12 @@ else
+ X_LIBS="$X_LIBS -L$x_libraries"
+ # For Solaris; some versions of Sun CC require a space after -R and
+ # others require no space. Words are not sufficient . . . .
+- { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
+ $as_echo_n "checking whether -R must be followed by a space... " >&6; }
+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+ ac_xsave_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+- 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
+@@ -17663,40 +15192,13 @@ main ()
+ 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
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++if ac_fn_c_try_link "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ X_LIBS="$X_LIBS -R$x_libraries"
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- LIBS="$ac_xsave_LIBS -R $x_libraries"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ LIBS="$ac_xsave_LIBS -R $x_libraries"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -17707,46 +15209,19 @@ main ()
+ 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
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++if ac_fn_c_try_link "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ X_LIBS="$X_LIBS -R $x_libraries"
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- { $as_echo "$as_me:$LINENO: result: neither works" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
+ $as_echo "neither works" >&6; }
+ 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
+-
+-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
+ ac_c_werror_flag=$ac_xsave_c_werror_flag
+ LIBS=$ac_xsave_LIBS
+ fi
+@@ -17762,11 +15237,7 @@ rm -f core conftest.err conftest.$ac_obj
+ # libraries were built with DECnet support. And Karl Berry says
+ # the Alpha needs dnet_stub (dnet does not exist).
+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -17784,44 +15255,17 @@ return XOpenDisplay ();
+ 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
+- :
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_link "$LINENO"; then :
+
+- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
+ $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
+-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
++if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -17839,59 +15283,30 @@ return dnet_ntoa ();
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_dnet_dnet_ntoa=no
++ ac_cv_lib_dnet_dnet_ntoa=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
++if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
+ $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
+-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
++if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -17909,52 +15324,25 @@ return dnet_ntoa ();
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_dnet_stub_dnet_ntoa=no
++ ac_cv_lib_dnet_stub_dnet_ntoa=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
++if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+ fi
+
+ 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_xsave_LIBS"
+
+ # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+@@ -17965,105 +15353,20 @@ rm -f core conftest.err conftest.$ac_obj
# on Irix 5.2, according to T.E. Dickey.
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
@@ -16189,7 +17324,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16768,59 +14882,30 @@ return gethostbyname ();
+@@ -18081,59 +15384,30 @@ return gethostbyname ();
return 0;
}
_ACEOF
@@ -16258,7 +17393,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16838,43 +14923,18 @@ return gethostbyname ();
+@@ -18151,43 +15425,18 @@ return gethostbyname ();
return 0;
}
_ACEOF
@@ -16308,13 +17443,207 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
-@@ -16888,105 +14948,20 @@ fi
+@@ -18201,33 +15450,21 @@ fi
# variants that don't use the name server (or something). -lsocket
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
- { $as_echo "$as_me:$LINENO: checking for connect" >&5
-$as_echo_n "checking for connect... " >&6; }
-if test "${ac_cv_func_connect+set}" = set; then
++ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
++if test "x$ac_cv_func_connect" = x""yes; then :
++
++fi
++
++ if test $ac_cv_func_connect = no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
++$as_echo_n "checking for connect in -lsocket... " >&6; }
++if test "${ac_cv_lib_socket_connect+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define connect innocuous_connect
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char connect (); 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 connect
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -18236,13 +15473,6 @@ cat >>conftest.$ac_ext <<_ACEOF
+ extern "C"
+ #endif
+ char connect ();
+-/* 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_connect || defined __stub___connect
+-choke me
+-#endif
+-
+ int
+ main ()
+ {
+@@ -18251,55 +15481,38 @@ return connect ();
+ 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_connect=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_socket_connect=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_connect=no
++ ac_cv_lib_socket_connect=no
++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:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
++$as_echo "$ac_cv_lib_socket_connect" >&6; }
++if test "x$ac_cv_lib_socket_connect" = x""yes; then :
++ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+ fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++ fi
++
++ # Guillermo Gomez says -lposix is necessary on A/UX.
++ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
++if test "x$ac_cv_func_remove" = x""yes; then :
++
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+-$as_echo "$ac_cv_func_connect" >&6; }
+
+- if test $ac_cv_func_connect = no; then
+- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+-$as_echo_n "checking for connect in -lsocket... " >&6; }
+-if test "${ac_cv_lib_socket_connect+set}" = set; then
++ if test $ac_cv_func_remove = no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
++$as_echo_n "checking for remove in -lposix... " >&6; }
++if test "${ac_cv_lib_posix_remove+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++LIBS="-lposix $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -18308,316 +15521,47 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char connect ();
++char remove ();
+ int
+ main ()
+ {
+-return connect ();
++return remove ();
+ ;
+ 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_lib_socket_connect=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_socket_connect=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+-$as_echo "$ac_cv_lib_socket_connect" >&6; }
+-if test "x$ac_cv_lib_socket_connect" = x""yes; then
+- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+-fi
+-
+- fi
+-
+- # Guillermo Gomez says -lposix is necessary on A/UX.
+- { $as_echo "$as_me:$LINENO: checking for remove" >&5
+-$as_echo_n "checking for remove... " >&6; }
+-if test "${ac_cv_func_remove+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
@@ -16323,12 +17652,12 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--/* Define connect to an innocuous variant, in case <limits.h> declares connect.
+-/* Define remove to an innocuous variant, in case <limits.h> declares remove.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define connect innocuous_connect
+-#define remove innocuous_remove
-
-/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char connect (); below.
+- which can conflict with char remove (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
@@ -16338,7 +17667,7 @@
-# include <assert.h>
-#endif
-
--#undef connect
+-#undef remove
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -16346,18 +17675,18 @@
-#ifdef __cplusplus
-extern "C"
-#endif
--char connect ();
+-char remove ();
-/* 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_connect || defined __stub___connect
+-#if defined __stub_remove || defined __stub___remove
-choke me
-#endif
-
-int
-main ()
-{
--return connect ();
+-return remove ();
- ;
- return 0;
-}
@@ -16383,46 +17712,51 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_func_connect=yes
+- ac_cv_func_remove=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_func_connect=no
+- ac_cv_func_remove=no
-fi
-+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-+if test "x$ac_cv_func_connect" = x""yes; then :
-
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
--$as_echo "$ac_cv_func_connect" >&6; }
-
- if test $ac_cv_func_connect = no; then
-- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
- $as_echo_n "checking for connect in -lsocket... " >&6; }
--if test "${ac_cv_lib_socket_connect+set}" = set; then
-+if test "${ac_cv_lib_socket_connect+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+-$as_echo "$ac_cv_func_remove" >&6; }
+-
+- if test $ac_cv_func_remove = no; then
+- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+-$as_echo_n "checking for remove in -lposix... " >&6; }
+-if test "${ac_cv_lib_posix_remove+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lposix $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -17004,76 +14979,39 @@ return connect ();
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char remove ();
+-int
+-main ()
+-{
+-return remove ();
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -16445,13 +17779,13 @@
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_socket_connect=yes
+ ac_cv_lib_posix_remove=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_socket_connect=no
-+ ac_cv_lib_socket_connect=no
+- ac_cv_lib_posix_remove=no
++ ac_cv_lib_posix_remove=no
fi
-
-rm -rf conftest.dSYM
@@ -16461,220 +17795,17 @@
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
- $as_echo "$ac_cv_lib_socket_connect" >&6; }
--if test "x$ac_cv_lib_socket_connect" = x""yes; then
-+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
+ $as_echo "$ac_cv_lib_posix_remove" >&6; }
+-if test "x$ac_cv_lib_posix_remove" = x""yes; then
++if test "x$ac_cv_lib_posix_remove" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
fi
- # Guillermo Gomez says -lposix is necessary on A/UX.
-- { $as_echo "$as_me:$LINENO: checking for remove" >&5
--$as_echo_n "checking for remove... " >&6; }
--if test "${ac_cv_func_remove+set}" = set; then
-+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
-+if test "x$ac_cv_func_remove" = x""yes; then :
-+
-+fi
-+
-+ if test $ac_cv_func_remove = no; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
-+$as_echo_n "checking for remove in -lposix... " >&6; }
-+if test "${ac_cv_lib_posix_remove+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lposix $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--/* Define remove to an innocuous variant, in case <limits.h> declares remove.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define remove innocuous_remove
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char remove (); 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 remove
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -17082,13 +15020,6 @@ cat >>conftest.$ac_ext <<_ACEOF
- extern "C"
- #endif
- char remove ();
--/* 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_remove || defined __stub___remove
--choke me
--#endif
--
- int
- main ()
- {
-@@ -17097,55 +15028,38 @@ return remove ();
- 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_remove=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_posix_remove=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_remove=no
-+ ac_cv_lib_posix_remove=no
-+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:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
-+$as_echo "$ac_cv_lib_posix_remove" >&6; }
-+if test "x$ac_cv_lib_posix_remove" = x""yes; then :
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
- fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+ fi
-+
-+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-+if test "x$ac_cv_func_shmat" = x""yes; then :
-+
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
--$as_echo "$ac_cv_func_remove" >&6; }
-
-- if test $ac_cv_func_remove = no; then
-- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
--$as_echo_n "checking for remove in -lposix... " >&6; }
--if test "${ac_cv_lib_posix_remove+set}" = set; then
-+ if test $ac_cv_func_shmat = no; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
-+$as_echo_n "checking for shmat in -lipc... " >&6; }
-+if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lposix $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-lipc $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -17154,216 +15068,32 @@ cat >>conftest.$ac_ext <<_ACEOF
- #ifdef __cplusplus
- extern "C"
- #endif
--char remove ();
-+char shmat ();
- int
- main ()
- {
--return remove ();
-+return shmat ();
- ;
- 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_lib_posix_remove=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_ipc_shmat=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_posix_remove=no
-+ ac_cv_lib_ipc_shmat=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
--$as_echo "$ac_cv_lib_posix_remove" >&6; }
--if test "x$ac_cv_lib_posix_remove" = x""yes; then
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
-+$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
- fi
-
- fi
--
-- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
- { $as_echo "$as_me:$LINENO: checking for shmat" >&5
-$as_echo_n "checking for shmat... " >&6; }
-if test "${ac_cv_func_shmat+set}" = set; then
@@ -16753,44 +17884,39 @@
-
- ac_cv_func_shmat=no
-fi
--
++ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
++if test "x$ac_cv_func_shmat" = x""yes; then :
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-$as_echo "$ac_cv_func_shmat" >&6; }
--
-- if test $ac_cv_func_shmat = no; then
+
+ if test $ac_cv_func_shmat = no; then
- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
--$as_echo_n "checking for shmat in -lipc... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
+ $as_echo_n "checking for shmat in -lipc... " >&6; }
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lipc $LIBS"
++if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc $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 shmat ();
--int
--main ()
--{
--return shmat ();
-- ;
-- return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -18635,43 +15579,18 @@ return shmat ();
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -16812,32 +17938,32 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_ipc_shmat=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ipc_shmat=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_ipc_shmat=no
--fi
++ ac_cv_lib_ipc_shmat=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_ipc_shmat" >&5
--$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
+ $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
--fi
--
-- fi
-- fi
-+ fi
-
- # Check for libraries that X11R6 Xt/Xaw programs need.
- ac_save_LDFLAGS=$LDFLAGS
-@@ -17374,18 +15104,14 @@ fi
++if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+ fi
+
+@@ -18687,18 +15606,14 @@ fi
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# John Interrante, Karl Berry
@@ -16859,7 +17985,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17403,43 +15129,18 @@ return IceConnectionNumber ();
+@@ -18716,43 +15631,18 @@ return IceConnectionNumber ();
return 0;
}
_ACEOF
@@ -16909,7 +18035,7 @@
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -17449,28 +15150,21 @@ fi
+@@ -18762,28 +15652,21 @@ fi
# X not found
if test x$no_x = xyes ; then
@@ -16942,7 +18068,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17488,43 +15182,18 @@ return XFree ();
+@@ -18801,43 +15684,18 @@ return XFree ();
return 0;
}
_ACEOF
@@ -16992,7 +18118,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBX11 1
_ACEOF
-@@ -17532,24 +15201,17 @@ _ACEOF
+@@ -18845,24 +15703,17 @@ _ACEOF
LIBS="-lX11 $LIBS"
else
@@ -17021,7 +18147,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17567,43 +15229,18 @@ return XauFileName ();
+@@ -18880,43 +15731,18 @@ return XauFileName ();
return 0;
}
_ACEOF
@@ -17071,7 +18197,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBXAU 1
_ACEOF
-@@ -17611,9 +15248,7 @@ _ACEOF
+@@ -18924,9 +15750,7 @@ _ACEOF
LIBS="-lXau $LIBS"
else
@@ -17082,1307 +18208,7 @@
fi
CFLAGS="$gp_save_cflags"
-@@ -17628,9 +15263,7 @@ elif test $pkg_failed = untried; then
- if test "$no_x" = yes; then
- # Not all programs may use this symbol, but it does not hurt to define it.
-
--cat >>confdefs.h <<\_ACEOF
--#define X_DISPLAY_MISSING 1
--_ACEOF
-+$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
-
- X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
- else
-@@ -17643,16 +15276,12 @@ else
- X_LIBS="$X_LIBS -L$x_libraries"
- # For Solaris; some versions of Sun CC require a space after -R and
- # others require no space. Words are not sufficient . . . .
-- { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
- $as_echo_n "checking whether -R must be followed by a space... " >&6; }
- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
- ac_xsave_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
-- 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
-@@ -17663,40 +15292,13 @@ main ()
- 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
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+if ac_fn_c_try_link "$LINENO"; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- X_LIBS="$X_LIBS -R$x_libraries"
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- LIBS="$ac_xsave_LIBS -R $x_libraries"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ LIBS="$ac_xsave_LIBS -R $x_libraries"
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -17707,46 +15309,19 @@ main ()
- 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
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+if ac_fn_c_try_link "$LINENO"; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- X_LIBS="$X_LIBS -R $x_libraries"
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- { $as_echo "$as_me:$LINENO: result: neither works" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
- $as_echo "neither works" >&6; }
- 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
--
--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
- ac_c_werror_flag=$ac_xsave_c_werror_flag
- LIBS=$ac_xsave_LIBS
- fi
-@@ -17762,11 +15337,7 @@ rm -f core conftest.err conftest.$ac_obj
- # libraries were built with DECnet support. And Karl Berry says
- # the Alpha needs dnet_stub (dnet does not exist).
- ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -17784,44 +15355,17 @@ return XOpenDisplay ();
- 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
-- :
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_link "$LINENO"; then :
-
-- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
- $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
--if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -17839,59 +15383,30 @@ return dnet_ntoa ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dnet_dnet_ntoa=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_dnet_dnet_ntoa=no
-+ ac_cv_lib_dnet_dnet_ntoa=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
- $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
--if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
-+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
- fi
-
- if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
- $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
--if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet_stub $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -17909,52 +15424,25 @@ return dnet_ntoa ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dnet_stub_dnet_ntoa=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_dnet_stub_dnet_ntoa=no
-+ ac_cv_lib_dnet_stub_dnet_ntoa=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
- $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
--if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
-+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
- fi
-
- 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_xsave_LIBS"
-
- # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -17965,105 +15453,20 @@ rm -f core conftest.err conftest.$ac_obj
- # on Irix 5.2, according to T.E. Dickey.
- # The functions gethostbyname, getservbyname, and inet_addr are
- # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
--$as_echo_n "checking for gethostbyname... " >&6; }
--if test "${ac_cv_func_gethostbyname+set}" = set; then
-+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-+
-+fi
-+
-+ if test $ac_cv_func_gethostbyname = no; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
-+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-+if test "${ac_cv_lib_nsl_gethostbyname+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 gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define gethostbyname innocuous_gethostbyname
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char gethostbyname (); 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 gethostbyname
--
--/* 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 gethostbyname ();
--/* 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_gethostbyname || defined __stub___gethostbyname
--choke me
--#endif
--
--int
--main ()
--{
--return gethostbyname ();
-- ;
-- 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_gethostbyname=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_gethostbyname=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
--$as_echo "$ac_cv_func_gethostbyname" >&6; }
--
-- if test $ac_cv_func_gethostbyname = no; then
-- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
--$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
--if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnsl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -18081,59 +15484,30 @@ return gethostbyname ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_nsl_gethostbyname=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_nsl_gethostbyname=no
-+ ac_cv_lib_nsl_gethostbyname=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
- $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
--if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
-+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
- fi
-
- if test $ac_cv_lib_nsl_gethostbyname = no; then
-- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
- $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
--if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -18151,43 +15525,18 @@ return gethostbyname ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_bsd_gethostbyname=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_bsd_gethostbyname=no
-+ ac_cv_lib_bsd_gethostbyname=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
- $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
--if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
-+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
- fi
-
-@@ -18201,105 +15550,20 @@ fi
- # variants that don't use the name server (or something). -lsocket
- # must be given before -lnsl if both are needed. We assume that
- # if connect needs -lnsl, so does gethostbyname.
-- { $as_echo "$as_me:$LINENO: checking for connect" >&5
--$as_echo_n "checking for connect... " >&6; }
--if test "${ac_cv_func_connect+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 connect to an innocuous variant, in case <limits.h> declares connect.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define connect innocuous_connect
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char connect (); 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 connect
--
--/* 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 connect ();
--/* 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_connect || defined __stub___connect
--choke me
--#endif
--
--int
--main ()
--{
--return connect ();
-- ;
-- 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_connect=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_connect=no
--fi
-+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-+if test "x$ac_cv_func_connect" = x""yes; then :
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
--$as_echo "$ac_cv_func_connect" >&6; }
-
- if test $ac_cv_func_connect = no; then
-- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
- $as_echo_n "checking for connect in -lsocket... " >&6; }
--if test "${ac_cv_lib_socket_connect+set}" = set; then
-+if test "${ac_cv_lib_socket_connect+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -18317,148 +15581,38 @@ return connect ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_socket_connect=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_socket_connect=no
-+ ac_cv_lib_socket_connect=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
- $as_echo "$ac_cv_lib_socket_connect" >&6; }
--if test "x$ac_cv_lib_socket_connect" = x""yes; then
-+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
- fi
-
- fi
-
- # Guillermo Gomez says -lposix is necessary on A/UX.
-- { $as_echo "$as_me:$LINENO: checking for remove" >&5
--$as_echo_n "checking for remove... " >&6; }
--if test "${ac_cv_func_remove+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 remove to an innocuous variant, in case <limits.h> declares remove.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define remove innocuous_remove
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char remove (); 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 remove
--
--/* 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 remove ();
--/* 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_remove || defined __stub___remove
--choke me
--#endif
--
--int
--main ()
--{
--return remove ();
-- ;
-- 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_remove=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_remove=no
--fi
-+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
-+if test "x$ac_cv_func_remove" = x""yes; then :
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
--$as_echo "$ac_cv_func_remove" >&6; }
-
- if test $ac_cv_func_remove = no; then
-- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
- $as_echo_n "checking for remove in -lposix... " >&6; }
--if test "${ac_cv_lib_posix_remove+set}" = set; then
-+if test "${ac_cv_lib_posix_remove+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lposix $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -18476,76 +15630,39 @@ return remove ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_posix_remove=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_posix_remove=no
-+ ac_cv_lib_posix_remove=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
- $as_echo "$ac_cv_lib_posix_remove" >&6; }
--if test "x$ac_cv_lib_posix_remove" = x""yes; then
-+if test "x$ac_cv_lib_posix_remove" = x""yes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
- fi
-
- fi
-
- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-- { $as_echo "$as_me:$LINENO: checking for shmat" >&5
--$as_echo_n "checking for shmat... " >&6; }
--if test "${ac_cv_func_shmat+set}" = set; then
-+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-+if test "x$ac_cv_func_shmat" = x""yes; then :
-+
-+fi
-+
-+ if test $ac_cv_func_shmat = no; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
-+$as_echo_n "checking for shmat in -lipc... " >&6; }
-+if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lipc $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define shmat innocuous_shmat
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char shmat (); 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 shmat
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -18554,13 +15671,6 @@ cat >>conftest.$ac_ext <<_ACEOF
- extern "C"
- #endif
- char shmat ();
--/* 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_shmat || defined __stub___shmat
--choke me
--#endif
--
- int
- main ()
- {
-@@ -18569,109 +15679,18 @@ return shmat ();
- 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_shmat=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_shmat=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
--$as_echo "$ac_cv_func_shmat" >&6; }
--
-- if test $ac_cv_func_shmat = no; then
-- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
--$as_echo_n "checking for shmat in -lipc... " >&6; }
--if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lipc $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 shmat ();
--int
--main ()
--{
--return shmat ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ipc_shmat=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_ipc_shmat=no
-+ ac_cv_lib_ipc_shmat=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
- $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
--if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
-+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
- fi
-
-@@ -18687,18 +15706,14 @@ fi
- # These have to be linked with before -lX11, unlike the other
- # libraries we check for below, so use a different variable.
- # John Interrante, Karl Berry
-- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
- $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
--if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lICE $X_EXTRA_LIBS $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -18716,43 +15731,18 @@ return IceConnectionNumber ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ICE_IceConnectionNumber=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_ICE_IceConnectionNumber=no
-+ ac_cv_lib_ICE_IceConnectionNumber=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
- $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
--if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
-+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
- fi
-
-@@ -18762,28 +15752,21 @@ fi
-
- # X not found
- if test x$no_x = xyes ; then
-- { { $as_echo "$as_me:$LINENO: error: X development libraries not found" >&5
--$as_echo "$as_me: error: X development libraries not found" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "X development libraries not found" "$LINENO" 5
- fi
-
- gp_save_cflags="$CFLAGS"
- gp_save_libs="$LIBS"
- CFLAGS="$X_CFLAGS"
- LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
--
--{ $as_echo "$as_me:$LINENO: checking for XFree in -lX11" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XFree in -lX11" >&5
- $as_echo_n "checking for XFree in -lX11... " >&6; }
--if test "${ac_cv_lib_X11_XFree+set}" = set; then
-+if test "${ac_cv_lib_X11_XFree+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lX11 $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -18801,43 +15784,18 @@ return XFree ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_X11_XFree=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_X11_XFree=no
-+ ac_cv_lib_X11_XFree=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XFree" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XFree" >&5
- $as_echo "$ac_cv_lib_X11_XFree" >&6; }
--if test "x$ac_cv_lib_X11_XFree" = x""yes; then
-+if test "x$ac_cv_lib_X11_XFree" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBX11 1
- _ACEOF
-@@ -18845,24 +15803,17 @@ _ACEOF
- LIBS="-lX11 $LIBS"
-
- else
-- { { $as_echo "$as_me:$LINENO: error: libX11 not found" >&5
--$as_echo "$as_me: error: libX11 not found" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "libX11 not found" "$LINENO" 5
- fi
-
--
--{ $as_echo "$as_me:$LINENO: checking for XauFileName in -lXau" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauFileName in -lXau" >&5
- $as_echo_n "checking for XauFileName in -lXau... " >&6; }
--if test "${ac_cv_lib_Xau_XauFileName+set}" = set; then
-+if test "${ac_cv_lib_Xau_XauFileName+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXau $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -18880,43 +15831,18 @@ return XauFileName ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_Xau_XauFileName=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_Xau_XauFileName=no
-+ ac_cv_lib_Xau_XauFileName=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauFileName" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xau_XauFileName" >&5
- $as_echo "$ac_cv_lib_Xau_XauFileName" >&6; }
--if test "x$ac_cv_lib_Xau_XauFileName" = x""yes; then
-+if test "x$ac_cv_lib_Xau_XauFileName" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBXAU 1
- _ACEOF
-@@ -18924,9 +15850,7 @@ _ACEOF
- LIBS="-lXau $LIBS"
-
- else
-- { { $as_echo "$as_me:$LINENO: error: libXau not found" >&5
--$as_echo "$as_me: error: libXau not found" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "libXau not found" "$LINENO" 5
- fi
-
- CFLAGS="$gp_save_cflags"
-@@ -18937,7 +15861,7 @@ fi
+@@ -18937,7 +15761,7 @@ fi
else
X_CFLAGS=$pkg_cv_X_CFLAGS
X_LIBS=$pkg_cv_X_LIBS
@@ -18391,7 +18217,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -18947,9 +15871,7 @@ fi
+@@ -18947,9 +15771,7 @@ fi
if $PKG_CONFIG --exists "xrandr >= 1.2.0" ; then
@@ -18402,7 +18228,7 @@
have_randr=yes
else
-@@ -18976,151 +15898,12 @@ _ACEOF
+@@ -18976,151 +15798,12 @@ _ACEOF
@@ -18559,7 +18385,7 @@
_ACEOF
fi
-@@ -19128,16 +15911,12 @@ fi
+@@ -19128,16 +15811,12 @@ fi
done
if test $ac_cv_header_locale_h = yes; then
@@ -18579,7 +18405,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -19148,46 +15927,19 @@ return LC_MESSAGES
+@@ -19148,46 +15827,19 @@ return LC_MESSAGES
return 0;
}
_ACEOF
@@ -18632,7 +18458,7 @@
fi
fi
-@@ -19200,155 +15952,20 @@ _ACEOF
+@@ -19200,155 +15852,20 @@ _ACEOF
XGETTEXT=:
INTLLIBS=
@@ -18793,7 +18619,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -19361,54 +15978,25 @@ return !ngettext ("","", 1)
+@@ -19361,54 +15878,25 @@ return !ngettext ("","", 1)
return 0;
}
_ACEOF
@@ -18856,7 +18682,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -19421,141 +16009,26 @@ return !dgettext ("","")
+@@ -19421,141 +15909,26 @@ return !dgettext ("","")
return 0;
}
_ACEOF
@@ -19008,7 +18834,7 @@
_ACEOF
fi
-@@ -19570,18 +16043,14 @@ done
+@@ -19570,18 +15943,14 @@ done
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -19030,7 +18856,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19591,63 +16060,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -19591,63 +15960,34 @@ cat >>conftest.$ac_ext <<_ACEOF
extern "C"
#endif
char bindtextdomain ();
@@ -19111,7 +18937,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19665,55 +16105,26 @@ return ngettext ();
+@@ -19665,55 +16005,26 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -19176,7 +19002,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19731,43 +16142,18 @@ return dgettext ();
+@@ -19731,43 +16042,18 @@ return dgettext ();
return 0;
}
_ACEOF
@@ -19226,7 +19052,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -19777,22 +16163,18 @@ fi
+@@ -19777,22 +16063,18 @@ fi
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -19254,7 +19080,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19810,55 +16192,26 @@ return ngettext ();
+@@ -19810,55 +16092,26 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -19319,7 +19145,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19876,43 +16229,18 @@ return dcgettext ();
+@@ -19876,43 +16129,18 @@ return dcgettext ();
return 0;
}
_ACEOF
@@ -19369,7 +19195,7 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -19934,102 +16262,12 @@ fi
+@@ -19934,102 +16162,12 @@ fi
glib_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
@@ -19477,7 +19303,7 @@
_ACEOF
fi
-@@ -20059,15 +16297,13 @@ done
+@@ -20059,15 +16197,13 @@ done
if test "$gt_cv_have_gettext" = "yes"; then
@@ -19496,7 +19322,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -20092,118 +16328,28 @@ esac
+@@ -20092,118 +16228,28 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -19623,7 +19449,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -20218,14 +16364,14 @@ msgstr ""
+@@ -20218,14 +16264,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -19643,7 +19469,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -20233,9 +16379,9 @@ fi
+@@ -20233,9 +16279,9 @@ fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -19655,7 +19481,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -20248,14 +16394,14 @@ for as_dir in $PATH
+@@ -20248,14 +16294,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19673,7 +19499,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -20264,19 +16410,19 @@ esac
+@@ -20264,19 +16310,19 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -19697,7 +19523,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -20301,144 +16447,33 @@ esac
+@@ -20301,144 +16347,33 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -19858,7 +19684,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -20453,10 +16488,8 @@ fi
+@@ -20453,10 +16388,8 @@ fi
;;
esac
fi
@@ -19871,7 +19697,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -20470,9 +16503,7 @@ fi
+@@ -20470,9 +16403,7 @@ fi
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -19882,7 +19708,7 @@
fi
-@@ -20480,7 +16511,7 @@ _ACEOF
+@@ -20480,7 +16411,7 @@ _ACEOF
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -19891,7 +19717,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -20513,7 +16544,7 @@ $as_echo "found xgettext program is not
+@@ -20513,7 +16444,7 @@ $as_echo "found xgettext program is not
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -19900,7 +19726,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -20538,7 +16569,7 @@ $as_echo_n "checking for catalogs to be
+@@ -20538,7 +16469,7 @@ $as_echo_n "checking for catalogs to be
fi
done
LINGUAS=$NEW_LINGUAS
@@ -19909,7 +19735,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -20576,9 +16607,9 @@ $as_echo "$LINGUAS" >&6; }
+@@ -20576,9 +16507,9 @@ $as_echo "$LINGUAS" >&6; }
# Extract the first word of "gtkdoc-check", so it can be a program name with args.
set dummy gtkdoc-check; ac_word=$2
@@ -19921,7 +19747,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_CHECK in
-@@ -20591,14 +16622,14 @@ for as_dir in $PATH
+@@ -20591,14 +16522,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19939,7 +19765,7 @@
IFS=$as_save_IFS
;;
-@@ -20606,10 +16637,10 @@ esac
+@@ -20606,10 +16537,10 @@ esac
fi
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
if test -n "$GTKDOC_CHECK"; then
@@ -19952,7 +19778,7 @@
$as_echo "no" >&6; }
fi
-@@ -20618,9 +16649,9 @@ fi
+@@ -20618,9 +16549,9 @@ fi
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -19964,7 +19790,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_REBASE in
-@@ -20633,14 +16664,14 @@ for as_dir in $PATH
+@@ -20633,14 +16564,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19982,7 +19808,7 @@
IFS=$as_save_IFS
;;
-@@ -20648,10 +16679,10 @@ esac
+@@ -20648,10 +16579,10 @@ esac
fi
GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
if test -n "$GTKDOC_REBASE"; then
@@ -19995,7 +19821,7 @@
$as_echo "no" >&6; }
fi
-@@ -20662,9 +16693,9 @@ test -n "$GTKDOC_REBASE" || GTKDOC_REBAS
+@@ -20662,9 +16593,9 @@ test -n "$GTKDOC_REBASE" || GTKDOC_REBAS
# Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
set dummy gtkdoc-mkpdf; ac_word=$2
@@ -20007,7 +19833,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_MKPDF in
-@@ -20677,14 +16708,14 @@ for as_dir in $PATH
+@@ -20677,14 +16608,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -20025,7 +19851,7 @@
IFS=$as_save_IFS
;;
-@@ -20692,10 +16723,10 @@ esac
+@@ -20692,10 +16623,10 @@ esac
fi
GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
if test -n "$GTKDOC_MKPDF"; then
@@ -20038,7 +19864,7 @@
$as_echo "no" >&6; }
fi
-@@ -20703,7 +16734,7 @@ fi
+@@ -20703,7 +16634,7 @@ fi
# Check whether --with-html-dir was given.
@@ -20047,7 +19873,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -20713,7 +16744,7 @@ fi
+@@ -20713,7 +16644,7 @@ fi
# Check whether --enable-gtk-doc was given.
@@ -20056,7 +19882,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -20722,33 +16753,31 @@ fi
+@@ -20722,33 +16653,31 @@ fi
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -20098,7 +19924,7 @@
enableval=$enable_gtk_doc_pdf;
else
enable_gtk_doc_pdf=no
-@@ -20806,35 +16835,33 @@ fi
+@@ -20806,35 +16735,33 @@ fi
gdu_cv_version_required=0.3.2
@@ -20142,7 +19968,7 @@
withval=$with_help_dir;
else
with_help_dir='${datadir}/gnome/help'
-@@ -20845,7 +16872,7 @@ HELP_DIR="$with_help_dir"
+@@ -20845,7 +16772,7 @@ HELP_DIR="$with_help_dir"
# Check whether --with-omf-dir was given.
@@ -20151,7 +19977,7 @@
withval=$with_omf_dir;
else
with_omf_dir='${datadir}/omf'
-@@ -20856,7 +16883,7 @@ OMF_DIR="$with_omf_dir"
+@@ -20856,7 +16783,7 @@ OMF_DIR="$with_omf_dir"
# Check whether --with-help-formats was given.
@@ -20160,7 +19986,7 @@
withval=$with_help_formats;
else
with_help_formats=''
-@@ -20866,7 +16893,7 @@ DOC_USER_FORMATS="$with_help_formats"
+@@ -20866,7 +16793,7 @@ DOC_USER_FORMATS="$with_help_formats"
# Check whether --enable-scrollkeeper was given.
@@ -20169,7 +19995,7 @@
enableval=$enable_scrollkeeper;
else
enable_scrollkeeper=yes
-@@ -20904,13 +16931,13 @@ fi
+@@ -20904,13 +16831,13 @@ fi
# Check whether --with-gconf-source was given.
@@ -20185,7 +20011,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -20919,22 +16946,20 @@ $as_echo "Using config source $GCONF_SCH
+@@ -20919,22 +16846,20 @@ $as_echo "Using config source $GCONF_SCH
# Check whether --with-gconf-schema-file-dir was given.
@@ -20212,7 +20038,7 @@
esac
fi
-@@ -20952,9 +16977,7 @@ case $host in
+@@ -20952,9 +16877,7 @@ case $host in
*-*-solaris*)
ostype=solaris
@@ -20223,7 +20049,7 @@
;;
esac
-@@ -20963,9 +16986,9 @@ for ac_prog in mawk gawk nawk awk
+@@ -20963,9 +16886,9 @@ for ac_prog in mawk gawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -20235,7 +20061,7 @@
$as_echo_n "(cached) " >&6
else
case $AWK in
-@@ -20978,14 +17001,14 @@ for as_dir in $PATH
+@@ -20978,14 +16901,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -20253,7 +20079,7 @@
IFS=$as_save_IFS
;;
-@@ -20993,10 +17016,10 @@ esac
+@@ -20993,10 +16916,10 @@ esac
fi
AWK=$ac_cv_path_AWK
if test -n "$AWK"; then
@@ -20266,7 +20092,7 @@
$as_echo "no" >&6; }
fi
-@@ -21008,9 +17031,9 @@ for ac_prog in perl5 perl
+@@ -21008,9 +16931,9 @@ for ac_prog in perl5 perl
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -20278,7 +20104,7 @@
$as_echo_n "(cached) " >&6
else
case $PERL in
-@@ -21023,14 +17046,14 @@ for as_dir in $PATH
+@@ -21023,14 +16946,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -20296,7 +20122,7 @@
IFS=$as_save_IFS
;;
-@@ -21038,10 +17061,10 @@ esac
+@@ -21038,10 +16961,10 @@ esac
fi
PERL=$ac_cv_path_PERL
if test -n "$PERL"; then
@@ -20309,7 +20135,7 @@
$as_echo "no" >&6; }
fi
-@@ -21051,7 +17074,7 @@ done
+@@ -21051,7 +16974,7 @@ done
# Check whether --enable-rebuilds was given.
@@ -20318,7 +20144,7 @@
enableval=$enable_rebuilds;
else
enable_rebuilds=yes
-@@ -21095,13 +17118,13 @@ _ACEOF
+@@ -21095,13 +17018,13 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -20334,7 +20160,7 @@
esac ;;
esac
done
-@@ -21109,8 +17132,8 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -21109,8 +17032,8 @@ $as_echo "$as_me: WARNING: cache variabl
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -20345,7 +20171,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -21133,11 +17156,11 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -21133,11 +17056,11 @@ $as_echo "$as_me: WARNING: cache variabl
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -20359,7 +20185,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -21157,8 +17180,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i"
+@@ -21157,8 +17080,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i"
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.
@@ -20370,7 +20196,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -21174,143 +17197,90 @@ else
+@@ -21174,143 +17097,90 @@ else
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -20553,7 +20379,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -21320,17 +17290,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
+@@ -21320,17 +17190,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -20579,7 +20405,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -21338,23 +17309,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -21338,23 +17209,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -20608,7 +20434,7 @@
as_nl='
'
export as_nl
-@@ -21362,7 +17325,13 @@ export as_nl
+@@ -21362,7 +17225,13 @@ export as_nl
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
@@ -20623,7 +20449,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -21373,7 +17342,7 @@ else
+@@ -21373,7 +17242,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -20632,7 +20458,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -21396,13 +17365,6 @@ if test "${PATH_SEPARATOR+set}" != set;
+@@ -21396,13 +17265,6 @@ if test "${PATH_SEPARATOR+set}" != set;
}
fi
@@ -20646,7 +20472,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -21412,15 +17374,15 @@ fi
+@@ -21412,15 +17274,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -20665,7 +20491,7 @@
IFS=$as_save_IFS
;;
-@@ -21432,12 +17394,16 @@ if test "x$as_myself" = x; then
+@@ -21432,12 +17294,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -20686,7 +20512,7 @@
done
PS1='$ '
PS2='> '
-@@ -21449,7 +17415,89 @@ export LC_ALL
+@@ -21449,7 +17315,89 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
@@ -20777,7 +20603,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -21463,8 +17511,12 @@ else
+@@ -21463,8 +17411,12 @@ else
as_basename=false
fi
@@ -20791,7 +20617,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -21484,76 +17536,25 @@ $as_echo X/"$0" |
+@@ -21484,76 +17436,25 @@ $as_echo X/"$0" |
}
s/.*/./; q'`
@@ -20879,7 +20705,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -21582,8 +17583,56 @@ fi
+@@ -21582,8 +17483,56 @@ fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -20937,7 +20763,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -21602,10 +17651,10 @@ else
+@@ -21602,10 +17551,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
@@ -20950,7 +20776,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -21620,13 +17669,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+@@ -21620,13 +17569,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
exec 6>&1
@@ -20972,7 +20798,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -21658,13 +17713,15 @@ _ACEOF
+@@ -21658,13 +17613,15 @@ _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -20991,7 +20817,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -21683,16 +17740,17 @@ $config_headers
+@@ -21683,16 +17640,17 @@ $config_headers
Configuration commands:
$config_commands
@@ -21013,7 +20839,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -21728,6 +17786,8 @@ do
+@@ -21728,6 +17686,8 @@ do
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -21022,7 +20848,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -21735,20 +17795,19 @@ do
+@@ -21735,20 +17695,19 @@ do
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -21047,7 +20873,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -21756,11 +17815,10 @@ Try \`$0 --help' for more information."
+@@ -21756,11 +17715,10 @@ Try \`$0 --help' for more information."
ac_cs_silent=: ;;
# This is an error.
@@ -21062,7 +20888,7 @@
ac_need_defaults=false ;;
esac
-@@ -22104,9 +18162,7 @@ do
+@@ -22104,9 +18062,7 @@ do
"man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -21073,7 +20899,7 @@
esac
done
-@@ -22133,7 +18189,7 @@ $debug ||
+@@ -22133,7 +18089,7 @@ $debug ||
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -21082,7 +20908,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -22144,11 +18200,7 @@ $debug ||
+@@ -22144,11 +18100,7 @@ $debug ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -21095,7 +20921,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -22156,10 +18208,16 @@ $debug ||
+@@ -22156,10 +18108,16 @@ $debug ||
if test -n "$CONFIG_FILES"; then
@@ -21114,7 +20940,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -22173,24 +18231,18 @@ _ACEOF
+@@ -22173,24 +18131,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -21142,7 +20968,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -22212,7 +18264,7 @@ s/'"$ac_delim"'$//
+@@ -22212,7 +18164,7 @@ s/'"$ac_delim"'$//
t delim
:nl
h
@@ -21151,7 +20977,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -22226,7 +18278,7 @@ s/.\{148\}//
+@@ -22226,7 +18178,7 @@ s/.\{148\}//
t nl
:delim
h
@@ -21160,7 +20986,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -22279,9 +18331,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
+@@ -22279,9 +18231,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -21171,7 +20997,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -22322,9 +18372,7 @@ for ac_last_try in false false :; do
+@@ -22322,9 +18272,7 @@ for ac_last_try in false false :; do
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -21182,7 +21008,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -22409,9 +18457,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -22409,9 +18357,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -21193,7 +21019,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -22424,9 +18470,7 @@ do
+@@ -22424,9 +18370,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -21204,7 +21030,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -22454,12 +18498,10 @@ $as_echo "$as_me: error: invalid tag $ac
+@@ -22454,12 +18398,10 @@ $as_echo "$as_me: error: invalid tag $ac
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -21219,7 +21045,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -22470,7 +18512,7 @@ $as_echo "$as_me: error: cannot find inp
+@@ -22470,7 +18412,7 @@ $as_echo "$as_me: error: cannot find inp
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -21228,7 +21054,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -22483,9 +18525,7 @@ $as_echo "$as_me: creating $ac_file" >&6
+@@ -22483,9 +18425,7 @@ $as_echo "$as_me: creating $ac_file" >&6
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -21239,7 +21065,7 @@
esac
;;
esac
-@@ -22513,47 +18553,7 @@ $as_echo X"$ac_file" |
+@@ -22513,47 +18453,7 @@ $as_echo X"$ac_file" |
q
}
s/.*/./; q'`
@@ -21288,7 +21114,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -22610,7 +18610,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+@@ -22610,7 +18510,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# 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=
@@ -21296,7 +21122,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -22620,12 +18619,11 @@ ac_sed_dataroot='
+@@ -22620,12 +18519,11 @@ ac_sed_dataroot='
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -21311,7 +21137,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
-@@ -22635,7 +18633,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -22635,7 +18533,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -21320,7 +21146,7 @@
esac
_ACEOF
-@@ -22664,14 +18662,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+@@ -22664,14 +18562,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -21337,7 +21163,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;}
-@@ -22681,9 +18677,7 @@ which seems to be undefined. Please mak
+@@ -22681,9 +18577,7 @@ which seems to be undefined. Please mak
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -21348,7 +21174,7 @@
;;
:H)
#
-@@ -22694,25 +18688,19 @@ $as_echo "$as_me: error: could not creat
+@@ -22694,25 +18588,19 @@ $as_echo "$as_me: error: could not creat
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -21378,7 +21204,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -22750,7 +18738,7 @@ $as_echo X"$_am_arg" |
+@@ -22750,7 +18638,7 @@ $as_echo X"$_am_arg" |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -21387,7 +21213,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -22845,47 +18833,7 @@ $as_echo X"$file" |
+@@ -22845,47 +18733,7 @@ $as_echo X"$file" |
q
}
s/.*/./; q'`
@@ -21436,7 +21262,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -23538,9 +19486,7 @@ _LT_EOF
+@@ -23538,9 +19386,7 @@ _LT_EOF
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -21447,7 +21273,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -23563,15 +19509,12 @@ $as_echo "$as_me: error: po/Makefile.in.
+@@ -23563,15 +19409,12 @@ $as_echo "$as_me: error: po/Makefile.in.
done # for ac_tag
@@ -21465,7 +21291,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -23592,10 +19535,10 @@ if test "$no_create" != yes; then
+@@ -23592,10 +19435,10 @@ if test "$no_create" != yes; then
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.
@@ -21480,8 +21306,8 @@
Index: gnome-panel-2.30.0/doc/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/doc/Makefile.in 2010-03-30 02:52:45.000000000 +0200
-+++ gnome-panel-2.30.0/doc/Makefile.in 2010-05-05 19:54:02.355835023 +0200
+--- gnome-panel-2.30.0.orig/doc/Makefile.in 2010-05-05 19:55:21.419339458 +0200
++++ gnome-panel-2.30.0/doc/Makefile.in 2010-05-05 19:59:13.967836046 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21516,8 +21342,8 @@
*=* | --[!k]*);; \
Index: gnome-panel-2.30.0/doc/reference/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/doc/reference/Makefile.in 2010-03-30 02:52:45.000000000 +0200
-+++ gnome-panel-2.30.0/doc/reference/Makefile.in 2010-05-05 19:54:02.443334893 +0200
+--- gnome-panel-2.30.0.orig/doc/reference/Makefile.in 2010-05-05 19:55:21.391337367 +0200
++++ gnome-panel-2.30.0/doc/reference/Makefile.in 2010-05-05 19:59:13.967836046 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21552,8 +21378,8 @@
*=* | --[!k]*);; \
Index: gnome-panel-2.30.0/doc/reference/panel-applet/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/doc/reference/panel-applet/Makefile.in 2010-03-30 02:52:46.000000000 +0200
-+++ gnome-panel-2.30.0/doc/reference/panel-applet/Makefile.in 2010-05-05 19:54:02.551835488 +0200
+--- gnome-panel-2.30.0.orig/doc/reference/panel-applet/Makefile.in 2010-05-05 19:55:21.359339101 +0200
++++ gnome-panel-2.30.0/doc/reference/panel-applet/Makefile.in 2010-05-05 19:59:13.967836046 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21570,8 +21396,8 @@
PANEL_LIBS = @PANEL_LIBS@
Index: gnome-panel-2.30.0/gnome-panel/libegg/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/gnome-panel/libegg/Makefile.in 2010-03-30 02:52:46.000000000 +0200
-+++ gnome-panel-2.30.0/gnome-panel/libegg/Makefile.in 2010-05-05 19:54:02.871834820 +0200
+--- gnome-panel-2.30.0.orig/gnome-panel/libegg/Makefile.in 2010-05-05 19:55:21.331342878 +0200
++++ gnome-panel-2.30.0/gnome-panel/libegg/Makefile.in 2010-05-05 19:59:13.967836046 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21588,8 +21414,8 @@
PANEL_LIBS = @PANEL_LIBS@
Index: gnome-panel-2.30.0/gnome-panel/libpanel-util/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/gnome-panel/libpanel-util/Makefile.in 2010-03-30 02:52:46.000000000 +0200
-+++ gnome-panel-2.30.0/gnome-panel/libpanel-util/Makefile.in 2010-05-05 19:54:02.979334651 +0200
+--- gnome-panel-2.30.0.orig/gnome-panel/libpanel-util/Makefile.in 2010-05-05 19:55:21.299339231 +0200
++++ gnome-panel-2.30.0/gnome-panel/libpanel-util/Makefile.in 2010-05-05 19:59:13.967836046 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21606,8 +21432,8 @@
PANEL_LIBS = @PANEL_LIBS@
Index: gnome-panel-2.30.0/gnome-panel/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/gnome-panel/Makefile.in 2010-03-30 02:52:46.000000000 +0200
-+++ gnome-panel-2.30.0/gnome-panel/Makefile.in 2010-05-05 19:54:02.755336991 +0200
+--- gnome-panel-2.30.0.orig/gnome-panel/Makefile.in 2010-05-05 19:55:21.271341051 +0200
++++ gnome-panel-2.30.0/gnome-panel/Makefile.in 2010-05-05 19:59:13.971840047 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21642,8 +21468,8 @@
*=* | --[!k]*);; \
Index: gnome-panel-2.30.0/help/clock/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/help/clock/Makefile.in 2010-03-30 02:52:46.000000000 +0200
-+++ gnome-panel-2.30.0/help/clock/Makefile.in 2010-05-05 19:54:03.183334822 +0200
+--- gnome-panel-2.30.0.orig/help/clock/Makefile.in 2010-05-05 19:55:21.247341493 +0200
++++ gnome-panel-2.30.0/help/clock/Makefile.in 2010-05-05 19:59:13.971840047 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21660,8 +21486,8 @@
PANEL_LIBS = @PANEL_LIBS@
Index: gnome-panel-2.30.0/help/fish/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/help/fish/Makefile.in 2010-03-30 02:52:46.000000000 +0200
-+++ gnome-panel-2.30.0/help/fish/Makefile.in 2010-05-05 19:54:03.299335459 +0200
+--- gnome-panel-2.30.0.orig/help/fish/Makefile.in 2010-05-05 19:55:21.215341267 +0200
++++ gnome-panel-2.30.0/help/fish/Makefile.in 2010-05-05 19:59:13.971840047 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21678,8 +21504,8 @@
PANEL_LIBS = @PANEL_LIBS@
Index: gnome-panel-2.30.0/help/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/help/Makefile.in 2010-03-30 02:52:46.000000000 +0200
-+++ gnome-panel-2.30.0/help/Makefile.in 2010-05-05 19:54:03.067335154 +0200
+--- gnome-panel-2.30.0.orig/help/Makefile.in 2010-05-05 19:55:21.187339662 +0200
++++ gnome-panel-2.30.0/help/Makefile.in 2010-05-05 19:59:13.971840047 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21714,8 +21540,8 @@
*=* | --[!k]*);; \
Index: gnome-panel-2.30.0/icons/16x16/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/icons/16x16/Makefile.in 2010-03-30 02:52:46.000000000 +0200
-+++ gnome-panel-2.30.0/icons/16x16/Makefile.in 2010-05-05 19:54:03.383334883 +0200
+--- gnome-panel-2.30.0.orig/icons/16x16/Makefile.in 2010-05-05 19:55:21.163342058 +0200
++++ gnome-panel-2.30.0/icons/16x16/Makefile.in 2010-05-05 19:59:13.971840047 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21732,8 +21558,8 @@
PANEL_LIBS = @PANEL_LIBS@
Index: gnome-panel-2.30.0/icons/22x22/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/icons/22x22/Makefile.in 2010-03-30 02:52:47.000000000 +0200
-+++ gnome-panel-2.30.0/icons/22x22/Makefile.in 2010-05-05 19:54:03.471335380 +0200
+--- gnome-panel-2.30.0.orig/icons/22x22/Makefile.in 2010-05-05 19:55:21.131341829 +0200
++++ gnome-panel-2.30.0/icons/22x22/Makefile.in 2010-05-05 19:59:13.975841603 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21750,8 +21576,8 @@
PANEL_LIBS = @PANEL_LIBS@
Index: gnome-panel-2.30.0/icons/24x24/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/icons/24x24/Makefile.in 2010-03-30 02:52:47.000000000 +0200
-+++ gnome-panel-2.30.0/icons/24x24/Makefile.in 2010-05-05 19:54:03.555335794 +0200
+--- gnome-panel-2.30.0.orig/icons/24x24/Makefile.in 2010-05-05 19:55:21.099343065 +0200
++++ gnome-panel-2.30.0/icons/24x24/Makefile.in 2010-05-05 19:59:13.975841603 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21768,8 +21594,8 @@
PANEL_LIBS = @PANEL_LIBS@
Index: gnome-panel-2.30.0/icons/32x32/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/icons/32x32/Makefile.in 2010-03-30 02:52:47.000000000 +0200
-+++ gnome-panel-2.30.0/icons/32x32/Makefile.in 2010-05-05 19:54:03.643336788 +0200
+--- gnome-panel-2.30.0.orig/icons/32x32/Makefile.in 2010-05-05 19:55:21.071339017 +0200
++++ gnome-panel-2.30.0/icons/32x32/Makefile.in 2010-05-05 19:59:13.975841603 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21786,8 +21612,8 @@
PANEL_LIBS = @PANEL_LIBS@
Index: gnome-panel-2.30.0/icons/48x48/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/icons/48x48/Makefile.in 2010-03-30 02:52:47.000000000 +0200
-+++ gnome-panel-2.30.0/icons/48x48/Makefile.in 2010-05-05 19:54:03.731334849 +0200
+--- gnome-panel-2.30.0.orig/icons/48x48/Makefile.in 2010-05-05 19:55:21.047341414 +0200
++++ gnome-panel-2.30.0/icons/48x48/Makefile.in 2010-05-05 19:59:13.975841603 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21804,8 +21630,8 @@
PANEL_LIBS = @PANEL_LIBS@
Index: gnome-panel-2.30.0/icons/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/icons/Makefile.in 2010-03-30 02:52:47.000000000 +0200
-+++ gnome-panel-2.30.0/icons/Makefile.in 2010-05-05 19:54:03.819334857 +0200
+--- gnome-panel-2.30.0.orig/icons/Makefile.in 2010-05-05 19:55:21.019339809 +0200
++++ gnome-panel-2.30.0/icons/Makefile.in 2010-05-05 19:59:13.975841603 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21840,8 +21666,8 @@
*=* | --[!k]*);; \
Index: gnome-panel-2.30.0/icons/scalable/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/icons/scalable/Makefile.in 2010-03-30 02:52:47.000000000 +0200
-+++ gnome-panel-2.30.0/icons/scalable/Makefile.in 2010-05-05 19:54:03.911335438 +0200
+--- gnome-panel-2.30.0.orig/icons/scalable/Makefile.in 2010-05-05 19:55:20.991338205 +0200
++++ gnome-panel-2.30.0/icons/scalable/Makefile.in 2010-05-05 19:59:13.975841603 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21858,8 +21684,8 @@
PANEL_LIBS = @PANEL_LIBS@
Index: gnome-panel-2.30.0/idl/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/idl/Makefile.in 2010-03-30 02:52:47.000000000 +0200
-+++ gnome-panel-2.30.0/idl/Makefile.in 2010-05-05 19:54:03.991334780 +0200
+--- gnome-panel-2.30.0.orig/idl/Makefile.in 2010-05-05 19:55:20.967338645 +0200
++++ gnome-panel-2.30.0/idl/Makefile.in 2010-05-05 19:59:13.975841603 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21876,8 +21702,8 @@
PANEL_LIBS = @PANEL_LIBS@
Index: gnome-panel-2.30.0/libpanel-applet/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/libpanel-applet/Makefile.in 2010-03-30 02:52:47.000000000 +0200
-+++ gnome-panel-2.30.0/libpanel-applet/Makefile.in 2010-05-05 19:54:04.131335471 +0200
+--- gnome-panel-2.30.0.orig/libpanel-applet/Makefile.in 2010-05-05 19:55:20.939337040 +0200
++++ gnome-panel-2.30.0/libpanel-applet/Makefile.in 2010-05-05 19:59:13.979840226 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21894,8 +21720,8 @@
PANEL_LIBS = @PANEL_LIBS@
Index: gnome-panel-2.30.0/ltmain.sh
===================================================================
---- gnome-panel-2.30.0.orig/ltmain.sh 2010-03-30 02:52:32.000000000 +0200
-+++ gnome-panel-2.30.0/ltmain.sh 2010-05-05 19:51:55.383841641 +0200
+--- gnome-panel-2.30.0.orig/ltmain.sh 2010-05-05 19:55:20.911337882 +0200
++++ gnome-panel-2.30.0/ltmain.sh 2010-05-05 19:59:13.983841782 +0200
@@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
@@ -22007,8 +21833,8 @@
no)
Index: gnome-panel-2.30.0/m4/intltool.m4
===================================================================
---- gnome-panel-2.30.0.orig/m4/intltool.m4 2010-03-30 02:52:33.000000000 +0200
-+++ gnome-panel-2.30.0/m4/intltool.m4 2010-05-05 19:51:55.383841641 +0200
+--- gnome-panel-2.30.0.orig/m4/intltool.m4 2010-05-05 19:55:20.887335879 +0200
++++ gnome-panel-2.30.0/m4/intltool.m4 2010-05-05 19:59:13.983841782 +0200
@@ -172,7 +172,7 @@ IT_PO_SUBDIR([po])
AC_DEFUN([IT_PO_SUBDIR],
[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
@@ -22020,8 +21846,8 @@
AC_CONFIG_COMMANDS([$1/stamp-it], [
Index: gnome-panel-2.30.0/m4/libtool.m4
===================================================================
---- gnome-panel-2.30.0.orig/m4/libtool.m4 2010-03-30 02:52:32.000000000 +0200
-+++ gnome-panel-2.30.0/m4/libtool.m4 2010-05-05 19:51:55.387842219 +0200
+--- gnome-panel-2.30.0.orig/m4/libtool.m4 2010-05-05 19:55:20.859340146 +0200
++++ gnome-panel-2.30.0/m4/libtool.m4 2010-05-05 19:59:13.987840894 +0200
@@ -2445,7 +2445,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
@@ -22165,8 +21991,8 @@
# Kuck and Associates, Inc. (KAI) C++ Compiler
Index: gnome-panel-2.30.0/m4/ltversion.m4
===================================================================
---- gnome-panel-2.30.0.orig/m4/ltversion.m4 2010-03-30 02:52:32.000000000 +0200
-+++ gnome-panel-2.30.0/m4/ltversion.m4 2010-05-05 19:51:55.387842219 +0200
+--- gnome-panel-2.30.0.orig/m4/ltversion.m4 2010-05-05 19:55:20.835347435 +0200
++++ gnome-panel-2.30.0/m4/ltversion.m4 2010-05-05 19:59:13.991843428 +0200
@@ -9,15 +9,15 @@
# Generated from ltversion.in.
@@ -22190,8 +22016,8 @@
])
Index: gnome-panel-2.30.0/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/Makefile.in 2010-03-30 02:52:48.000000000 +0200
-+++ gnome-panel-2.30.0/Makefile.in 2010-05-05 19:54:04.319337232 +0200
+--- gnome-panel-2.30.0.orig/Makefile.in 2010-05-05 19:55:20.807337033 +0200
++++ gnome-panel-2.30.0/Makefile.in 2010-05-05 19:59:13.991843428 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -22258,8 +22084,8 @@
esac
Index: gnome-panel-2.30.0/man/Makefile.in
===================================================================
---- gnome-panel-2.30.0.orig/man/Makefile.in 2010-03-30 02:52:47.000000000 +0200
-+++ gnome-panel-2.30.0/man/Makefile.in 2010-05-05 19:54:04.219334999 +0200
+--- gnome-panel-2.30.0.orig/man/Makefile.in 2010-05-05 19:55:20.783341876 +0200
++++ gnome-panel-2.30.0/man/Makefile.in 2010-05-05 19:59:13.991843428 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -22276,8 +22102,8 @@
PANEL_LIBS = @PANEL_LIBS@
Index: gnome-panel-2.30.0/po/Makefile.in.in
===================================================================
---- gnome-panel-2.30.0.orig/po/Makefile.in.in 2010-03-30 02:52:33.000000000 +0200
-+++ gnome-panel-2.30.0/po/Makefile.in.in 2010-05-05 19:51:55.391840841 +0200
+--- gnome-panel-2.30.0.orig/po/Makefile.in.in 2010-05-05 19:55:20.755341740 +0200
++++ gnome-panel-2.30.0/po/Makefile.in.in 2010-05-05 19:59:13.991843428 +0200
@@ -56,7 +56,7 @@ ALL_LINGUAS = @ALL_LINGUAS@
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
@@ -22298,8 +22124,8 @@
install-exec installcheck:
Index: gnome-panel-2.30.0/INSTALL
===================================================================
---- gnome-panel-2.30.0.orig/INSTALL 2010-05-05 19:54:34.367839113 +0200
-+++ gnome-panel-2.30.0/INSTALL 2010-05-05 19:54:04.251339137 +0200
+--- gnome-panel-2.30.0.orig/INSTALL 2010-05-05 19:55:20.727340625 +0200
++++ gnome-panel-2.30.0/INSTALL 2010-05-05 19:59:13.991843428 +0200
@@ -2,18 +2,24 @@ Installation Instructions
*************************
@@ -22624,8 +22450,8 @@
Index: gnome-panel-2.30.0/config.guess
===================================================================
---- gnome-panel-2.30.0.orig/config.guess 2010-05-05 19:54:34.571840747 +0200
-+++ gnome-panel-2.30.0/config.guess 2010-05-05 19:54:01.075837213 +0200
+--- gnome-panel-2.30.0.orig/config.guess 2010-05-05 19:55:20.679343462 +0200
++++ gnome-panel-2.30.0/config.guess 2010-05-05 19:59:13.995838140 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -22971,8 +22797,8 @@
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
Index: gnome-panel-2.30.0/config.sub
===================================================================
---- gnome-panel-2.30.0.orig/config.sub 2010-05-05 19:54:34.479837708 +0200
-+++ gnome-panel-2.30.0/config.sub 2010-05-05 19:54:01.079835835 +0200
+--- gnome-panel-2.30.0.orig/config.sub 2010-05-05 19:55:20.703339110 +0200
++++ gnome-panel-2.30.0/config.sub 2010-05-05 19:59:13.995838140 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
More information about the pkg-gnome-commits
mailing list