r14165 - /desktop/unstable/gnome-session/debian/patches/90_autoconf-autoheader.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Sat Jan 12 07:01:29 UTC 2008
Author: slomo
Date: Sat Jan 12 07:01:29 2008
New Revision: 14165
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14165
Log:
* fix patch
Modified:
desktop/unstable/gnome-session/debian/patches/90_autoconf-autoheader.patch
Modified: desktop/unstable/gnome-session/debian/patches/90_autoconf-autoheader.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/90_autoconf-autoheader.patch?rev=14165&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/90_autoconf-autoheader.patch (original)
+++ desktop/unstable/gnome-session/debian/patches/90_autoconf-autoheader.patch Sat Jan 12 07:01:29 2008
@@ -1,6 +1,6 @@
diff -Naur gnome-session-2.20.3.old/aclocal.m4 gnome-session-2.20.3/aclocal.m4
--- gnome-session-2.20.3.old/aclocal.m4 2008-01-07 23:31:54.000000000 +0100
-+++ gnome-session-2.20.3/aclocal.m4 2008-01-12 07:20:45.000000000 +0100
++++ gnome-session-2.20.3/aclocal.m4 2008-01-12 08:00:03.000000000 +0100
@@ -11,4969 +11,4459 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@@ -14004,9 +14004,22 @@
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+diff -Naur gnome-session-2.20.3.old/config.h.in gnome-session-2.20.3/config.h.in
+--- gnome-session-2.20.3.old/config.h.in 2008-01-07 23:32:04.000000000 +0100
++++ gnome-session-2.20.3/config.h.in 2008-01-12 08:00:18.000000000 +0100
+@@ -108,6 +108,9 @@
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+
++/* Defines the path to the gnome-settings-daemon binary */
++#undef SETTINGS_DAEMON_PATH
++
+ /* Define to 1 if you have the ANSI C header files. */
+ #undef STDC_HEADERS
+
diff -Naur gnome-session-2.20.3.old/configure gnome-session-2.20.3/configure
--- gnome-session-2.20.3.old/configure 2008-01-07 23:32:04.000000000 +0100
-+++ gnome-session-2.20.3/configure 2008-01-12 07:20:55.000000000 +0100
++++ gnome-session-2.20.3/configure 2008-01-12 08:00:17.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -14252,7 +14265,15 @@
eval with_$ac_package=no ;;
--x)
-@@ -1587,6 +1604,7 @@
+@@ -1581,12 +1598,15 @@
+ Specify default window manager
+ --with-rsh-command=COMMAND
+ Specify the command for executing a remote shell
++ --with-settings-daemon=PATH
++ Specify the path to gnome-settings-daemon
+
+ Some influential environment variables:
+ CC C compiler command
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
@@ -14260,7 +14281,7 @@
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
-@@ -1674,7 +1692,7 @@
+@@ -1674,7 +1694,7 @@
if $ac_init_version; then
cat <<\_ACEOF
gnome-session configure 2.20.3
@@ -14269,7 +14290,7 @@
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-@@ -1688,7 +1706,7 @@
+@@ -1688,7 +1708,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by gnome-session $as_me 2.20.3, which was
@@ -14278,7 +14299,7 @@
$ $0 $@
-@@ -2113,7 +2131,7 @@
+@@ -2113,7 +2133,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14287,7 +14308,7 @@
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
-@@ -2241,7 +2259,7 @@
+@@ -2241,7 +2261,7 @@
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14296,7 +14317,7 @@
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
-@@ -2294,7 +2312,7 @@
+@@ -2294,7 +2314,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14305,7 +14326,7 @@
ac_cv_prog_AWK="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2433,7 +2451,7 @@
+@@ -2433,7 +2453,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14314,7 +14335,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2473,7 +2491,7 @@
+@@ -2473,7 +2493,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14323,7 +14344,7 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2663,7 +2681,7 @@
+@@ -2663,7 +2683,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14332,7 +14353,7 @@
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2703,7 +2721,7 @@
+@@ -2703,7 +2723,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14341,7 +14362,7 @@
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2760,7 +2778,7 @@
+@@ -2760,7 +2780,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14350,7 +14371,7 @@
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2801,7 +2819,7 @@
+@@ -2801,7 +2821,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14359,7 +14380,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2859,7 +2877,7 @@
+@@ -2859,7 +2879,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14368,7 +14389,7 @@
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2903,7 +2921,7 @@
+@@ -2903,7 +2923,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14377,7 +14398,7 @@
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3044,7 +3062,7 @@
+@@ -3044,7 +3064,7 @@
# in a Makefile. We should not override ac_cv_exeext if it was cached,
# so that the user can short-circuit this test for compilers unknown to
# Autoconf.
@@ -14386,7 +14407,7 @@
do
test -f "$ac_file" || continue
case $ac_file in
-@@ -3072,6 +3090,12 @@
+@@ -3072,6 +3092,12 @@
test "$ac_cv_exeext" = no && ac_cv_exeext=
else
@@ -14399,7 +14420,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3083,8 +3107,6 @@
+@@ -3083,8 +3109,6 @@
fi
ac_exeext=$ac_cv_exeext
@@ -14408,7 +14429,7 @@
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-@@ -3262,27 +3284,10 @@
+@@ -3262,27 +3286,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14440,7 +14461,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3337,27 +3342,10 @@
+@@ -3337,27 +3344,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14472,7 +14493,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3392,27 +3380,10 @@
+@@ -3392,27 +3382,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14504,7 +14525,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -3448,27 +3419,10 @@
+@@ -3448,27 +3421,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14536,7 +14557,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3584,27 +3538,10 @@
+@@ -3584,27 +3540,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14568,7 +14589,7 @@
ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
-@@ -3836,7 +3773,7 @@
+@@ -3836,7 +3775,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14577,7 +14598,7 @@
ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3876,7 +3813,7 @@
+@@ -3876,7 +3815,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14586,7 +14607,7 @@
ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3916,7 +3853,7 @@
+@@ -3916,7 +3855,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14595,7 +14616,7 @@
ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3978,7 +3915,7 @@
+@@ -3978,7 +3917,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14604,7 +14625,7 @@
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4058,27 +3995,11 @@
+@@ -4058,27 +3997,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14637,7 +14658,7 @@
DATADIRNAME=share
else
echo "$as_me: failed program was:" >&5
-@@ -4149,27 +4070,11 @@
+@@ -4149,27 +4072,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14670,7 +14691,7 @@
ac_cv_func_bind_textdomain_codeset=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4178,7 +4083,7 @@
+@@ -4178,7 +4085,7 @@
ac_cv_func_bind_textdomain_codeset=no
fi
@@ -14679,7 +14700,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-@@ -4196,7 +4101,7 @@
+@@ -4196,7 +4103,7 @@
esac
fi
@@ -14688,7 +14709,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -4257,27 +4162,11 @@
+@@ -4257,27 +4164,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14721,7 +14742,7 @@
ac_cv_search_strerror=$ac_res
else
echo "$as_me: failed program was:" >&5
-@@ -4286,7 +4175,7 @@
+@@ -4286,7 +4177,7 @@
fi
@@ -14730,7 +14751,7 @@
conftest$ac_exeext
if test "${ac_cv_search_strerror+set}" = set; then
break
-@@ -4330,7 +4219,7 @@
+@@ -4330,7 +4221,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14739,7 +14760,7 @@
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4370,7 +4259,7 @@
+@@ -4370,7 +4261,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14748,7 +14769,7 @@
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4427,7 +4316,7 @@
+@@ -4427,7 +4318,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14757,7 +14778,7 @@
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4468,7 +4357,7 @@
+@@ -4468,7 +4359,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14766,7 +14787,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -4526,7 +4415,7 @@
+@@ -4526,7 +4417,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14775,7 +14796,7 @@
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4570,7 +4459,7 @@
+@@ -4570,7 +4461,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14784,7 +14805,7 @@
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4690,27 +4579,10 @@
+@@ -4690,27 +4581,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14816,7 +14837,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4765,27 +4637,10 @@
+@@ -4765,27 +4639,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14848,7 +14869,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4820,27 +4675,10 @@
+@@ -4820,27 +4677,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14880,7 +14901,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -4876,27 +4714,10 @@
+@@ -4876,27 +4716,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14912,7 +14933,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5012,27 +4833,10 @@
+@@ -5012,27 +4835,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14944,7 +14965,7 @@
ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
-@@ -5229,17 +5033,10 @@
+@@ -5229,17 +5035,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14966,7 +14987,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5273,17 +5070,10 @@
+@@ -5273,17 +5072,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14988,7 +15009,7 @@
# Broken: success on invalid input.
continue
else
-@@ -5348,17 +5138,10 @@
+@@ -5348,17 +5140,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15010,7 +15031,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5392,17 +5175,10 @@
+@@ -5392,17 +5177,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15032,7 +15053,7 @@
# Broken: success on invalid input.
continue
else
-@@ -5457,7 +5233,7 @@
+@@ -5457,7 +5235,7 @@
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
@@ -15041,7 +15062,7 @@
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
-@@ -5539,7 +5315,7 @@
+@@ -5539,7 +5317,7 @@
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
@@ -15050,7 +15071,7 @@
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
-@@ -5635,27 +5411,10 @@
+@@ -5635,27 +5413,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15082,7 +15103,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5958,12 +5717,13 @@
+@@ -5958,12 +5719,13 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15097,7 +15118,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -5998,6 +5758,7 @@
+@@ -5998,6 +5760,7 @@
fi
SED=$lt_cv_path_SED
@@ -15105,7 +15126,7 @@
{ echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6; }
-@@ -6197,8 +5958,8 @@
+@@ -6197,8 +5960,8 @@
echo "${ECHO_T}no, using $LN_S" >&6; }
fi
@@ -15116,7 +15137,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6239,16 +6000,22 @@
+@@ -6239,16 +6002,22 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -15143,7 +15164,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -6286,7 +6053,7 @@
+@@ -6286,7 +6055,7 @@
esac
;;
@@ -15152,7 +15173,7 @@
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
;;
-@@ -6302,11 +6069,11 @@
+@@ -6302,11 +6071,11 @@
;;
# This must be Linux ELF.
@@ -15166,7 +15187,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
-@@ -6336,6 +6103,10 @@
+@@ -6336,6 +6105,10 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -15177,16 +15198,16 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -6422,7 +6193,7 @@
+@@ -6422,7 +6195,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6425 "configure"' > conftest.$ac_ext
-+ echo '#line 6196 "configure"' > conftest.$ac_ext
++ echo '#line 6198 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -6457,7 +6228,8 @@
+@@ -6457,7 +6230,8 @@
rm -rf conftest*
;;
@@ -15196,7 +15217,7 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -6468,6 +6240,9 @@
+@@ -6468,6 +6242,9 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -15206,7 +15227,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -6484,6 +6259,9 @@
+@@ -6484,6 +6261,9 @@
;;
*64-bit*)
case $host in
@@ -15216,7 +15237,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -6546,27 +6324,11 @@
+@@ -6546,27 +6326,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15249,7 +15270,7 @@
lt_cv_cc_needs_belf=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6575,7 +6337,7 @@
+@@ -6575,7 +6339,7 @@
lt_cv_cc_needs_belf=no
fi
@@ -15258,7 +15279,7 @@
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -6659,27 +6421,10 @@
+@@ -6659,27 +6423,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15290,7 +15311,7 @@
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -6742,27 +6487,10 @@
+@@ -6742,27 +6489,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15322,7 +15343,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6798,17 +6526,10 @@
+@@ -6798,17 +6528,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15344,7 +15365,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6900,7 +6621,7 @@
+@@ -6900,7 +6623,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15353,7 +15374,7 @@
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -6944,7 +6665,7 @@
+@@ -6944,7 +6667,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15362,7 +15383,7 @@
ac_cv_prog_ac_ct_CXX="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7057,27 +6778,10 @@
+@@ -7057,27 +6780,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15394,7 +15415,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7132,27 +6836,10 @@
+@@ -7132,27 +6838,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15426,7 +15447,7 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7187,27 +6874,10 @@
+@@ -7187,27 +6876,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15458,7 +15479,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -7243,27 +6913,10 @@
+@@ -7243,27 +6915,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15490,7 +15511,7 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7465,17 +7118,10 @@
+@@ -7465,17 +7120,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15512,7 +15533,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -7509,17 +7155,10 @@
+@@ -7509,17 +7157,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15534,7 +15555,7 @@
# Broken: success on invalid input.
continue
else
-@@ -7584,17 +7223,10 @@
+@@ -7584,17 +7225,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15556,7 +15577,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -7628,17 +7260,10 @@
+@@ -7628,17 +7262,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15578,7 +15599,7 @@
# Broken: success on invalid input.
continue
else
-@@ -7679,7 +7304,7 @@
+@@ -7679,7 +7306,7 @@
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
if test -n "$ac_tool_prefix"; then
@@ -15587,7 +15608,7 @@
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
-@@ -7697,7 +7322,7 @@
+@@ -7697,7 +7324,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15596,7 +15617,7 @@
ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7723,7 +7348,7 @@
+@@ -7723,7 +7350,7 @@
fi
if test -z "$F77"; then
ac_ct_F77=$F77
@@ -15605,7 +15626,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-@@ -7741,7 +7366,7 @@
+@@ -7741,7 +7368,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15614,7 +15635,7 @@
ac_cv_prog_ac_ct_F77="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7848,27 +7473,10 @@
+@@ -7848,27 +7475,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15646,7 +15667,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7911,27 +7519,10 @@
+@@ -7911,27 +7521,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15678,7 +15699,7 @@
ac_cv_prog_f77_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -8058,24 +7649,27 @@
+@@ -8058,24 +7651,27 @@
fi
;;
*)
@@ -15723,7 +15744,7 @@
;;
esac
-@@ -8092,6 +7686,7 @@
+@@ -8092,6 +7688,7 @@
@@ -15731,7 +15752,7 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-@@ -8129,7 +7724,7 @@
+@@ -8129,7 +7726,7 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -15740,7 +15761,7 @@
if test "$host_cpu" = ia64; then
symcode='[ABCDGIRSTW]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -8386,7 +7981,7 @@
+@@ -8386,7 +7983,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15749,7 +15770,7 @@
ac_cv_prog_AR="${ac_tool_prefix}ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8426,7 +8021,7 @@
+@@ -8426,7 +8023,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15758,7 +15779,7 @@
ac_cv_prog_ac_ct_AR="ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8482,7 +8077,7 @@
+@@ -8482,7 +8079,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15767,7 +15788,7 @@
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8522,7 +8117,7 @@
+@@ -8522,7 +8119,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15776,7 +15797,7 @@
ac_cv_prog_ac_ct_RANLIB="ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8578,7 +8173,7 @@
+@@ -8578,7 +8175,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15785,7 +15806,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8618,7 +8213,7 @@
+@@ -8618,7 +8215,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15794,7 +15815,7 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8680,7 +8275,7 @@
+@@ -8680,7 +8277,7 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -15803,7 +15824,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -8880,10 +8475,10 @@
+@@ -8880,10 +8477,10 @@
objext=$objext
# Code to be used in simple compile tests
@@ -15816,7 +15837,7 @@
# If no C compiler was specified, use CC.
-@@ -8898,13 +8493,13 @@
+@@ -8898,13 +8495,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -15832,7 +15853,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -8924,7 +8519,7 @@
+@@ -8924,7 +8521,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -15841,21 +15862,21 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -8935,11 +8530,11 @@
+@@ -8935,11 +8532,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8938: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8533: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8535: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8942: \$? = $ac_status" >&5
-+ echo "$as_me:8537: \$? = $ac_status" >&5
++ echo "$as_me:8539: \$? = $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.
-@@ -8990,13 +8585,15 @@
+@@ -8990,13 +8587,15 @@
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
@@ -15873,7 +15894,7 @@
lt_prog_compiler_pic='-DDLL_EXPORT'
;;
-@@ -9006,7 +8603,7 @@
+@@ -9006,7 +8605,7 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -15882,7 +15903,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -9064,7 +8661,7 @@
+@@ -9064,7 +8663,7 @@
esac
;;
@@ -15891,7 +15912,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -9097,7 +8694,7 @@
+@@ -9097,7 +8696,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -15900,7 +15921,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
-@@ -9116,6 +8713,22 @@
+@@ -9116,6 +8715,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -15923,7 +15944,7 @@
esac
;;
-@@ -9125,6 +8738,10 @@
+@@ -9125,6 +8740,10 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -15934,7 +15955,7 @@
solaris*)
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9192,7 +8809,7 @@
+@@ -9192,7 +8811,7 @@
else
lt_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
@@ -15943,21 +15964,21 @@
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -9203,11 +8820,11 @@
+@@ -9203,11 +8822,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9206: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8823: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8825: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9210: \$? = $ac_status" >&5
-+ echo "$as_me:8827: \$? = $ac_status" >&5
++ echo "$as_me:8829: \$? = $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.
-@@ -9256,7 +8873,7 @@
+@@ -9256,7 +8875,7 @@
lt_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -15966,7 +15987,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -9296,7 +8913,7 @@
+@@ -9296,7 +8915,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -15975,21 +15996,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -9307,11 +8924,11 @@
+@@ -9307,11 +8926,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9310: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8927: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8929: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9314: \$? = $ac_status" >&5
-+ echo "$as_me:8931: \$? = $ac_status" >&5
++ echo "$as_me:8933: \$? = $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
-@@ -9503,7 +9120,7 @@
+@@ -9503,7 +9122,7 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -15998,7 +16019,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -9521,7 +9138,7 @@
+@@ -9521,7 +9140,7 @@
fi
;;
@@ -16007,7 +16028,7 @@
hardcode_direct=no
hardcode_shlibpath_var=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -9536,7 +9153,7 @@
+@@ -9536,7 +9155,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -16016,7 +16037,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -9554,20 +9171,30 @@
+@@ -9554,20 +9173,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -16050,7 +16071,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9719,7 +9346,7 @@
+@@ -9719,7 +9348,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -16059,7 +16080,7 @@
else
# We have old collect2
hardcode_direct=unsupported
-@@ -9787,33 +9414,24 @@
+@@ -9787,33 +9416,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16110,7 +16131,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -9821,7 +9439,7 @@
+@@ -9821,7 +9441,7 @@
fi
@@ -16119,7 +16140,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -9862,33 +9480,24 @@
+@@ -9862,33 +9482,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16170,7 +16191,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -9896,7 +9505,7 @@
+@@ -9896,7 +9507,7 @@
fi
@@ -16179,7 +16200,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -9942,7 +9551,7 @@
+@@ -9942,7 +9553,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
@@ -16188,7 +16209,7 @@
fix_srcfile_path='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes=yes
;;
-@@ -9984,10 +9593,10 @@
+@@ -9984,10 +9595,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -16201,7 +16222,7 @@
module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -10027,7 +9636,7 @@
+@@ -10027,7 +9638,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -16210,7 +16231,7 @@
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -10129,7 +9738,7 @@
+@@ -10129,7 +9740,7 @@
link_all_deplibs=yes
;;
@@ -16219,7 +16240,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10149,24 +9758,28 @@
+@@ -10149,24 +9760,28 @@
;;
openbsd*)
@@ -16265,7 +16286,7 @@
fi
;;
-@@ -10225,17 +9838,16 @@
+@@ -10225,17 +9840,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -16292,7 +16313,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10292,7 +9904,7 @@
+@@ -10292,7 +9906,7 @@
fi
;;
@@ -16301,7 +16322,7 @@
no_undefined_flag='${wl}-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
-@@ -10369,7 +9981,7 @@
+@@ -10369,7 +9983,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -16310,7 +16331,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -10427,17 +10039,55 @@
+@@ -10427,17 +10041,55 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -16370,7 +16391,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -10597,12 +10247,8 @@
+@@ -10597,12 +10249,8 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -16385,7 +16406,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -10619,18 +10265,6 @@
+@@ -10619,18 +10267,6 @@
dynamic_linker=no
;;
@@ -16404,7 +16425,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -10668,7 +10302,7 @@
+@@ -10668,7 +10304,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -16413,7 +16434,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10731,7 +10365,7 @@
+@@ -10731,7 +10367,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -16422,7 +16443,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10786,7 +10420,7 @@
+@@ -10786,7 +10422,7 @@
;;
# This must be Linux ELF.
@@ -16431,7 +16452,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10800,31 +10434,10 @@
+@@ -10800,31 +10436,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -16465,7 +16486,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10836,7 +10449,7 @@
+@@ -10836,7 +10451,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -16474,7 +16495,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10845,7 +10458,7 @@
+@@ -10845,7 +10460,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -16483,7 +16504,7 @@
;;
netbsd*)
-@@ -10929,6 +10542,10 @@
+@@ -10929,6 +10544,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -16494,7 +16515,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11082,6 +10699,7 @@
+@@ -11082,6 +10701,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -16502,7 +16523,7 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
-@@ -11165,27 +10783,11 @@
+@@ -11165,27 +10785,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16535,7 +16556,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11194,7 +10796,7 @@
+@@ -11194,7 +10798,7 @@
ac_cv_lib_dl_dlopen=no
fi
@@ -16544,7 +16565,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -11276,27 +10878,11 @@
+@@ -11276,27 +10880,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16577,7 +16598,7 @@
ac_cv_func_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11305,7 +10891,7 @@
+@@ -11305,7 +10893,7 @@
ac_cv_func_shl_load=no
fi
@@ -16586,7 +16607,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-@@ -11355,27 +10941,11 @@
+@@ -11355,27 +10943,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16619,7 +16640,7 @@
ac_cv_lib_dld_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11384,7 +10954,7 @@
+@@ -11384,7 +10956,7 @@
ac_cv_lib_dld_shl_load=no
fi
@@ -16628,7 +16649,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -11456,27 +11026,11 @@
+@@ -11456,27 +11028,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16661,7 +16682,7 @@
ac_cv_func_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11485,7 +11039,7 @@
+@@ -11485,7 +11041,7 @@
ac_cv_func_dlopen=no
fi
@@ -16670,7 +16691,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-@@ -11535,27 +11089,11 @@
+@@ -11535,27 +11091,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16703,7 +16724,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11564,7 +11102,7 @@
+@@ -11564,7 +11104,7 @@
ac_cv_lib_dl_dlopen=no
fi
@@ -16712,7 +16733,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -11615,27 +11153,11 @@
+@@ -11615,27 +11155,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16745,7 +16766,7 @@
ac_cv_lib_svld_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11644,7 +11166,7 @@
+@@ -11644,7 +11168,7 @@
ac_cv_lib_svld_dlopen=no
fi
@@ -16754,7 +16775,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -11695,27 +11217,11 @@
+@@ -11695,27 +11219,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16787,7 +16808,7 @@
ac_cv_lib_dld_dld_link=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11724,7 +11230,7 @@
+@@ -11724,7 +11232,7 @@
ac_cv_lib_dld_dld_link=no
fi
@@ -16796,25 +16817,25 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -11780,7 +11286,7 @@
+@@ -11780,7 +11288,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11783 "configure"
-+#line 11289 "configure"
++#line 11291 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11880,7 +11386,7 @@
+@@ -11880,7 +11388,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11883 "configure"
-+#line 11389 "configure"
++#line 11391 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12078,6 +11584,7 @@
+@@ -12078,6 +11586,7 @@
module_cmds \
module_expsym_cmds \
lt_cv_prog_compiler_c_o \
@@ -16822,7 +16843,7 @@
exclude_expsyms \
include_expsyms; do
-@@ -12122,7 +11629,7 @@
+@@ -12122,7 +11631,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -16831,7 +16852,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -12446,7 +11953,7 @@
+@@ -12446,7 +11955,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -16840,7 +16861,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -12615,10 +12122,10 @@
+@@ -12615,10 +12124,10 @@
objext_CXX=$objext
# Code to be used in simple compile tests
@@ -16853,7 +16874,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -12634,13 +12141,13 @@
+@@ -12634,13 +12143,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -16869,7 +16890,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -12899,7 +12406,7 @@
+@@ -12899,7 +12408,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -16878,7 +16899,7 @@
else
# We have old collect2
hardcode_direct_CXX=unsupported
-@@ -12967,33 +12474,24 @@
+@@ -12967,33 +12476,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16929,7 +16950,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -13001,7 +12499,7 @@
+@@ -13001,7 +12501,7 @@
fi
@@ -16938,7 +16959,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13043,33 +12541,24 @@
+@@ -13043,33 +12543,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16989,7 +17010,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -13077,7 +12566,7 @@
+@@ -13077,7 +12568,7 @@
fi
@@ -16998,7 +17019,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13188,10 +12677,10 @@
+@@ -13188,10 +12679,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -17011,7 +17032,7 @@
module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -13225,7 +12714,7 @@
+@@ -13225,7 +12716,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -17020,7 +17041,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13274,9 +12763,7 @@
+@@ -13274,9 +12765,7 @@
hardcode_libdir_separator_CXX=:
case $host_cpu in
@@ -17031,7 +17052,7 @@
*)
export_dynamic_flag_spec_CXX='${wl}-E'
;;
-@@ -13344,7 +12831,7 @@
+@@ -13344,7 +12833,7 @@
;;
esac
;;
@@ -17040,7 +17061,7 @@
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -13384,7 +12871,7 @@
+@@ -13384,7 +12873,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -17049,7 +17070,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -13464,6 +12951,29 @@
+@@ -13464,6 +12953,29 @@
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -17079,7 +17100,7 @@
esac
;;
lynxos*)
-@@ -13486,7 +12996,7 @@
+@@ -13486,7 +12998,7 @@
;;
esac
;;
@@ -17088,7 +17109,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13502,16 +13012,20 @@
+@@ -13502,16 +13014,20 @@
ld_shlibs_CXX=no
;;
openbsd*)
@@ -17118,7 +17139,7 @@
;;
osf3*)
case $cc_basename in
-@@ -13673,15 +13187,10 @@
+@@ -13673,15 +13189,10 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -17137,7 +17158,7 @@
;;
esac
link_all_deplibs_CXX=yes
-@@ -13728,6 +13237,12 @@
+@@ -13728,6 +13239,12 @@
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -17150,7 +17171,7 @@
fi
;;
esac
-@@ -13919,7 +13434,7 @@
+@@ -13919,7 +13436,7 @@
# PORTME: override above test on systems where it is broken
case $host_os in
@@ -17159,7 +17180,7 @@
# Interix 3.5 installs completely hosed .la files for C++, so rather than
# hack all around it, let's just trust "g++" to DTRT.
predep_objects_CXX=
-@@ -13927,13 +13442,46 @@
+@@ -13927,13 +13444,46 @@
postdeps_CXX=
;;
@@ -17213,7 +17234,7 @@
;;
esac
;;
-@@ -13970,12 +13518,14 @@
+@@ -13970,12 +13520,14 @@
# like `-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
@@ -17230,7 +17251,7 @@
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -13987,7 +13537,7 @@
+@@ -13987,7 +13539,7 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -17239,7 +17260,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -14053,7 +13603,7 @@
+@@ -14053,7 +13605,7 @@
;;
esac
;;
@@ -17248,7 +17269,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -14096,7 +13646,7 @@
+@@ -14096,7 +13648,7 @@
;;
esac
;;
@@ -17257,7 +17278,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -14123,6 +13673,14 @@
+@@ -14123,6 +13675,14 @@
lt_prog_compiler_static_CXX='-non_shared'
;;
*)
@@ -17272,7 +17293,7 @@
;;
esac
;;
-@@ -14139,7 +13697,7 @@
+@@ -14139,7 +13699,7 @@
;;
esac
;;
@@ -17281,7 +17302,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -14237,7 +13795,7 @@
+@@ -14237,7 +13797,7 @@
else
lt_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
@@ -17290,21 +17311,21 @@
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -14248,11 +13806,11 @@
+@@ -14248,11 +13808,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14251: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13809: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13811: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14255: \$? = $ac_status" >&5
-+ echo "$as_me:13813: \$? = $ac_status" >&5
++ echo "$as_me:13815: \$? = $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.
-@@ -14301,7 +13859,7 @@
+@@ -14301,7 +13861,7 @@
lt_prog_compiler_static_works_CXX=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -17313,7 +17334,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -14341,7 +13899,7 @@
+@@ -14341,7 +13901,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -17322,21 +17343,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -14352,11 +13910,11 @@
+@@ -14352,11 +13912,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14355: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13913: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13915: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14359: \$? = $ac_status" >&5
-+ echo "$as_me:13917: \$? = $ac_status" >&5
++ echo "$as_me:13919: \$? = $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
-@@ -14422,7 +13980,10 @@
+@@ -14422,7 +13982,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -17348,7 +17369,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14453,7 +14014,7 @@
+@@ -14453,7 +14016,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -17357,7 +17378,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -14511,20 +14072,7 @@
+@@ -14511,20 +14074,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -17379,7 +17400,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14681,12 +14229,7 @@
+@@ -14681,12 +14231,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -17393,7 +17414,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -14703,18 +14246,6 @@
+@@ -14703,18 +14248,6 @@
dynamic_linker=no
;;
@@ -17412,7 +17433,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -14752,7 +14283,7 @@
+@@ -14752,7 +14285,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -17421,7 +17442,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14815,7 +14346,7 @@
+@@ -14815,7 +14348,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -17430,7 +17451,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14870,7 +14401,7 @@
+@@ -14870,7 +14403,7 @@
;;
# This must be Linux ELF.
@@ -17439,7 +17460,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14884,31 +14415,10 @@
+@@ -14884,31 +14417,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -17473,7 +17494,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14920,7 +14430,7 @@
+@@ -14920,7 +14432,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -17482,7 +17503,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14929,7 +14439,7 @@
+@@ -14929,7 +14441,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -17491,7 +17512,7 @@
;;
netbsd*)
-@@ -15013,6 +14523,10 @@
+@@ -15013,6 +14525,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -17502,7 +17523,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -15207,6 +14721,7 @@
+@@ -15207,6 +14723,7 @@
module_cmds_CXX \
module_expsym_cmds_CXX \
lt_cv_prog_compiler_c_o_CXX \
@@ -17510,7 +17531,7 @@
exclude_expsyms_CXX \
include_expsyms_CXX; do
-@@ -15527,7 +15042,7 @@
+@@ -15527,7 +15044,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -17519,7 +17540,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
-@@ -15618,10 +15133,17 @@
+@@ -15618,10 +15135,17 @@
objext_F77=$objext
# Code to be used in simple compile tests
@@ -17539,7 +17560,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -15637,13 +15159,13 @@
+@@ -15637,13 +15161,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -17555,7 +17576,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -15730,13 +15252,15 @@
+@@ -15730,13 +15254,15 @@
lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
;;
@@ -17573,7 +17594,7 @@
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
;;
-@@ -15746,7 +15270,7 @@
+@@ -15746,7 +15272,7 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -17582,7 +17603,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -15804,7 +15328,7 @@
+@@ -15804,7 +15330,7 @@
esac
;;
@@ -17591,7 +17612,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-@@ -15837,7 +15361,7 @@
+@@ -15837,7 +15363,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -17600,7 +17621,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
-@@ -15856,6 +15380,22 @@
+@@ -15856,6 +15382,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -17623,7 +17644,7 @@
esac
;;
-@@ -15865,6 +15405,10 @@
+@@ -15865,6 +15407,10 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -17634,7 +17655,7 @@
solaris*)
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -15932,7 +15476,7 @@
+@@ -15932,7 +15478,7 @@
else
lt_prog_compiler_pic_works_F77=no
ac_outfile=conftest.$ac_objext
@@ -17643,21 +17664,21 @@
lt_compiler_flag="$lt_prog_compiler_pic_F77"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -15943,11 +15487,11 @@
+@@ -15943,11 +15489,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15946: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15490: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15492: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15950: \$? = $ac_status" >&5
-+ echo "$as_me:15494: \$? = $ac_status" >&5
++ echo "$as_me:15496: \$? = $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.
-@@ -15996,7 +15540,7 @@
+@@ -15996,7 +15542,7 @@
lt_prog_compiler_static_works_F77=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -17666,7 +17687,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -16036,7 +15580,7 @@
+@@ -16036,7 +15582,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -17675,21 +17696,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -16047,11 +15591,11 @@
+@@ -16047,11 +15593,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16050: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15594: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15596: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16054: \$? = $ac_status" >&5
-+ echo "$as_me:15598: \$? = $ac_status" >&5
++ echo "$as_me:15600: \$? = $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
-@@ -16243,7 +15787,7 @@
+@@ -16243,7 +15789,7 @@
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
@@ -17698,7 +17719,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -16261,7 +15805,7 @@
+@@ -16261,7 +15807,7 @@
fi
;;
@@ -17707,7 +17728,7 @@
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -16276,7 +15820,7 @@
+@@ -16276,7 +15822,7 @@
archive_expsym_cmds_F77='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'
;;
@@ -17716,7 +17737,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -16294,20 +15838,30 @@
+@@ -16294,20 +15840,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -17750,7 +17771,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -16459,7 +16013,7 @@
+@@ -16459,7 +16015,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -17759,7 +17780,7 @@
else
# We have old collect2
hardcode_direct_F77=unsupported
-@@ -16517,33 +16071,24 @@
+@@ -16517,33 +16073,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -17810,7 +17831,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16551,7 +16096,7 @@
+@@ -16551,7 +16098,7 @@
fi
@@ -17819,7 +17840,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16582,33 +16127,24 @@
+@@ -16582,33 +16129,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -17870,7 +17891,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16616,7 +16152,7 @@
+@@ -16616,7 +16154,7 @@
fi
@@ -17879,7 +17900,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16662,7 +16198,7 @@
+@@ -16662,7 +16200,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
@@ -17888,7 +17909,7 @@
fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_F77=yes
;;
-@@ -16704,10 +16240,10 @@
+@@ -16704,10 +16242,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -17901,7 +17922,7 @@
module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -16747,7 +16283,7 @@
+@@ -16747,7 +16285,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -17910,7 +17931,7 @@
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
-@@ -16849,7 +16385,7 @@
+@@ -16849,7 +16387,7 @@
link_all_deplibs_F77=yes
;;
@@ -17919,7 +17940,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16869,24 +16405,28 @@
+@@ -16869,24 +16407,28 @@
;;
openbsd*)
@@ -17965,7 +17986,7 @@
fi
;;
-@@ -16945,17 +16485,16 @@
+@@ -16945,17 +16487,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -17992,7 +18013,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17012,7 +16551,7 @@
+@@ -17012,7 +16553,7 @@
fi
;;
@@ -18001,7 +18022,7 @@
no_undefined_flag_F77='${wl}-z,text'
archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
-@@ -17089,7 +16628,7 @@
+@@ -17089,7 +16630,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -18010,7 +18031,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -17147,20 +16686,7 @@
+@@ -17147,20 +16688,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18032,7 +18053,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17317,12 +16843,7 @@
+@@ -17317,12 +16845,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -18046,7 +18067,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -17339,18 +16860,6 @@
+@@ -17339,18 +16862,6 @@
dynamic_linker=no
;;
@@ -18065,7 +18086,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -17388,7 +16897,7 @@
+@@ -17388,7 +16899,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -18074,7 +18095,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17451,7 +16960,7 @@
+@@ -17451,7 +16962,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -18083,7 +18104,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17506,7 +17015,7 @@
+@@ -17506,7 +17017,7 @@
;;
# This must be Linux ELF.
@@ -18092,7 +18113,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17520,31 +17029,10 @@
+@@ -17520,31 +17031,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -18126,7 +18147,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -17556,7 +17044,7 @@
+@@ -17556,7 +17046,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -18135,7 +18156,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17565,7 +17053,7 @@
+@@ -17565,7 +17055,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -18144,7 +18165,7 @@
;;
netbsd*)
-@@ -17649,6 +17137,10 @@
+@@ -17649,6 +17139,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -18155,7 +18176,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17843,6 +17335,7 @@
+@@ -17843,6 +17337,7 @@
module_cmds_F77 \
module_expsym_cmds_F77 \
lt_cv_prog_compiler_c_o_F77 \
@@ -18163,7 +18184,7 @@
exclude_expsyms_F77 \
include_expsyms_F77; do
-@@ -18163,7 +17656,7 @@
+@@ -18163,7 +17658,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -18172,7 +18193,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_F77
-@@ -18221,10 +17714,10 @@
+@@ -18221,10 +17716,10 @@
objext_GCJ=$objext
# Code to be used in simple compile tests
@@ -18185,7 +18206,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -18240,13 +17733,13 @@
+@@ -18240,13 +17735,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -18201,7 +18222,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -18287,7 +17780,7 @@
+@@ -18287,7 +17782,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -18210,21 +18231,21 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -18298,11 +17791,11 @@
+@@ -18298,11 +17793,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18301: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17794: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17796: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18305: \$? = $ac_status" >&5
-+ echo "$as_me:17798: \$? = $ac_status" >&5
++ echo "$as_me:17800: \$? = $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.
-@@ -18353,13 +17846,15 @@
+@@ -18353,13 +17848,15 @@
lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
;;
@@ -18242,7 +18263,7 @@
lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
;;
-@@ -18369,7 +17864,7 @@
+@@ -18369,7 +17866,7 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -18251,7 +18272,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -18427,7 +17922,7 @@
+@@ -18427,7 +17924,7 @@
esac
;;
@@ -18260,7 +18281,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-@@ -18460,7 +17955,7 @@
+@@ -18460,7 +17957,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -18269,7 +18290,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18479,6 +17974,22 @@
+@@ -18479,6 +17976,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -18292,7 +18313,7 @@
esac
;;
-@@ -18488,6 +17999,10 @@
+@@ -18488,6 +18001,10 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -18303,7 +18324,7 @@
solaris*)
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18555,7 +18070,7 @@
+@@ -18555,7 +18072,7 @@
else
lt_prog_compiler_pic_works_GCJ=no
ac_outfile=conftest.$ac_objext
@@ -18312,21 +18333,21 @@
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -18566,11 +18081,11 @@
+@@ -18566,11 +18083,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18569: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18084: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18086: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18573: \$? = $ac_status" >&5
-+ echo "$as_me:18088: \$? = $ac_status" >&5
++ echo "$as_me:18090: \$? = $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.
-@@ -18619,7 +18134,7 @@
+@@ -18619,7 +18136,7 @@
lt_prog_compiler_static_works_GCJ=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -18335,7 +18356,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -18659,7 +18174,7 @@
+@@ -18659,7 +18176,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -18344,21 +18365,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -18670,11 +18185,11 @@
+@@ -18670,11 +18187,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18673: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18188: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18190: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18677: \$? = $ac_status" >&5
-+ echo "$as_me:18192: \$? = $ac_status" >&5
++ echo "$as_me:18194: \$? = $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
-@@ -18866,7 +18381,7 @@
+@@ -18866,7 +18383,7 @@
allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
@@ -18367,7 +18388,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -18884,7 +18399,7 @@
+@@ -18884,7 +18401,7 @@
fi
;;
@@ -18376,7 +18397,7 @@
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -18899,7 +18414,7 @@
+@@ -18899,7 +18416,7 @@
archive_expsym_cmds_GCJ='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'
;;
@@ -18385,7 +18406,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -18917,20 +18432,30 @@
+@@ -18917,20 +18434,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -18419,7 +18440,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -19082,7 +18607,7 @@
+@@ -19082,7 +18609,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -18428,7 +18449,7 @@
else
# We have old collect2
hardcode_direct_GCJ=unsupported
-@@ -19150,33 +18675,24 @@
+@@ -19150,33 +18677,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -18479,7 +18500,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -19184,7 +18700,7 @@
+@@ -19184,7 +18702,7 @@
fi
@@ -18488,7 +18509,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19225,33 +18741,24 @@
+@@ -19225,33 +18743,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -18539,7 +18560,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -19259,7 +18766,7 @@
+@@ -19259,7 +18768,7 @@
fi
@@ -18548,7 +18569,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19305,7 +18812,7 @@
+@@ -19305,7 +18814,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
@@ -18557,7 +18578,7 @@
fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_GCJ=yes
;;
-@@ -19347,10 +18854,10 @@
+@@ -19347,10 +18856,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -18570,7 +18591,7 @@
module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -19390,7 +18897,7 @@
+@@ -19390,7 +18899,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -18579,7 +18600,7 @@
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
-@@ -19492,7 +18999,7 @@
+@@ -19492,7 +19001,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -18588,7 +18609,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19512,24 +19019,28 @@
+@@ -19512,24 +19021,28 @@
;;
openbsd*)
@@ -18634,7 +18655,7 @@
fi
;;
-@@ -19588,17 +19099,16 @@
+@@ -19588,17 +19101,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -18661,7 +18682,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19655,7 +19165,7 @@
+@@ -19655,7 +19167,7 @@
fi
;;
@@ -18670,7 +18691,7 @@
no_undefined_flag_GCJ='${wl}-z,text'
archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
-@@ -19732,7 +19242,7 @@
+@@ -19732,7 +19244,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -18679,7 +18700,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -19790,20 +19300,7 @@
+@@ -19790,20 +19302,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18701,7 +18722,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19960,12 +19457,7 @@
+@@ -19960,12 +19459,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -18715,7 +18736,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -19982,18 +19474,6 @@
+@@ -19982,18 +19476,6 @@
dynamic_linker=no
;;
@@ -18734,7 +18755,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -20031,7 +19511,7 @@
+@@ -20031,7 +19513,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -18743,7 +18764,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -20094,7 +19574,7 @@
+@@ -20094,7 +19576,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -18752,7 +18773,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -20149,7 +19629,7 @@
+@@ -20149,7 +19631,7 @@
;;
# This must be Linux ELF.
@@ -18761,7 +18782,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -20163,31 +19643,10 @@
+@@ -20163,31 +19645,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -18795,7 +18816,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -20199,7 +19658,7 @@
+@@ -20199,7 +19660,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -18804,7 +18825,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -20208,7 +19667,7 @@
+@@ -20208,7 +19669,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -18813,7 +18834,7 @@
;;
netbsd*)
-@@ -20292,6 +19751,10 @@
+@@ -20292,6 +19753,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -18824,7 +18845,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -20486,6 +19949,7 @@
+@@ -20486,6 +19951,7 @@
module_cmds_GCJ \
module_expsym_cmds_GCJ \
lt_cv_prog_compiler_c_o_GCJ \
@@ -18832,7 +18853,7 @@
exclude_expsyms_GCJ \
include_expsyms_GCJ; do
-@@ -20806,7 +20270,7 @@
+@@ -20806,7 +20272,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -18841,7 +18862,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_GCJ
-@@ -20863,7 +20327,7 @@
+@@ -20863,7 +20329,7 @@
objext_RC=$objext
# Code to be used in simple compile tests
@@ -18850,7 +18871,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -20882,13 +20346,13 @@
+@@ -20882,13 +20348,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -18866,7 +18887,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -20966,6 +20430,7 @@
+@@ -20966,6 +20432,7 @@
module_cmds_RC \
module_expsym_cmds_RC \
lt_cv_prog_compiler_c_o_RC \
@@ -18874,7 +18895,7 @@
exclude_expsyms_RC \
include_expsyms_RC; do
-@@ -21286,7 +20751,7 @@
+@@ -21286,7 +20753,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -18883,7 +18904,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_RC
-@@ -21403,7 +20868,7 @@
+@@ -21403,7 +20870,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -18892,7 +18913,7 @@
ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21493,27 +20958,10 @@
+@@ -21493,27 +20960,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -18924,7 +18945,7 @@
has_option=yes
else
echo "$as_me: failed program was:" >&5
-@@ -21657,7 +21105,7 @@
+@@ -21657,7 +21107,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -18933,7 +18954,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21700,7 +21148,7 @@
+@@ -21700,7 +21150,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -18942,7 +18963,7 @@
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21862,7 +21310,7 @@
+@@ -21862,7 +21312,7 @@
and ESOUND_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -18951,7 +18972,7 @@
See \`config.log' for more details." >&5
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
-@@ -21872,7 +21320,7 @@
+@@ -21872,7 +21322,7 @@
and ESOUND_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -18960,7 +18981,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -21912,7 +21360,7 @@
+@@ -21912,7 +21362,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -18969,7 +18990,7 @@
ac_cv_path_ESD_SERVER="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -22039,7 +21487,7 @@
+@@ -22039,7 +21489,7 @@
and GNOME_SESSION_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -18978,7 +18999,7 @@
See \`config.log' for more details." >&5
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
-@@ -22049,7 +21497,7 @@
+@@ -22049,7 +21499,7 @@
and GNOME_SESSION_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -18987,7 +19008,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -22123,7 +21571,9 @@
+@@ -22123,7 +21573,9 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBNOTIFY_PKG_ERRORS" >&5
@@ -18998,7 +19019,7 @@
elif test $pkg_failed = untried; then
HAVE_LIBNOTIFY="no"
else
-@@ -22168,7 +21618,7 @@
+@@ -22168,7 +21620,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -19007,7 +19028,7 @@
ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -22276,7 +21726,7 @@
+@@ -22276,7 +21728,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -19016,7 +19037,7 @@
ac_cv_path_GCONF_SANITY_CHECK="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -22326,7 +21776,7 @@
+@@ -22326,7 +21778,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -19025,7 +19046,7 @@
ac_cv_path_GNOME_KEYRING_DAEMON="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -22499,17 +21949,10 @@
+@@ -22499,17 +21951,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19047,7 +19068,7 @@
# We can compile using X headers with no special include directory.
ac_x_includes=
else
-@@ -22532,7 +21975,7 @@
+@@ -22532,7 +21977,7 @@
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
@@ -19056,7 +19077,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22561,27 +22004,11 @@
+@@ -22561,27 +22006,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19089,7 +19110,7 @@
LIBS=$ac_save_LIBS
# We can link X programs with no special library path.
ac_x_libraries=
-@@ -22594,7 +22021,7 @@
+@@ -22594,7 +22023,7 @@
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
@@ -19098,7 +19119,7 @@
ac_x_libraries=$ac_dir
break 2
fi
-@@ -22602,7 +22029,7 @@
+@@ -22602,7 +22031,7 @@
done
fi
@@ -19107,7 +19128,7 @@
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
-@@ -22657,12 +22084,12 @@
+@@ -22657,12 +22086,12 @@
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 . . . .
@@ -19125,7 +19146,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -22690,44 +22117,20 @@
+@@ -22690,44 +22119,20 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19179,7 +19200,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -22755,48 +22158,30 @@
+@@ -22755,48 +22160,30 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19245,7 +19266,7 @@
fi
# Check for system-dependent libraries X programs must link with.
-@@ -22845,27 +22230,11 @@
+@@ -22845,27 +22232,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19278,7 +19299,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -22913,27 +22282,11 @@
+@@ -22913,27 +22284,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19311,7 +19332,7 @@
ac_cv_lib_dnet_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22942,7 +22295,7 @@
+@@ -22942,7 +22297,7 @@
ac_cv_lib_dnet_dnet_ntoa=no
fi
@@ -19320,7 +19341,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -22995,27 +22348,11 @@
+@@ -22995,27 +22350,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19353,7 +19374,7 @@
ac_cv_lib_dnet_stub_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23024,7 +22361,7 @@
+@@ -23024,7 +22363,7 @@
ac_cv_lib_dnet_stub_dnet_ntoa=no
fi
@@ -19362,7 +19383,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23037,7 +22374,7 @@
+@@ -23037,7 +22376,7 @@
fi
fi
@@ -19371,7 +19392,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
-@@ -23112,27 +22449,11 @@
+@@ -23112,27 +22451,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19404,7 +19425,7 @@
ac_cv_func_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23141,7 +22462,7 @@
+@@ -23141,7 +22464,7 @@
ac_cv_func_gethostbyname=no
fi
@@ -19413,7 +19434,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-@@ -23190,27 +22511,11 @@
+@@ -23190,27 +22513,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19446,7 +19467,7 @@
ac_cv_lib_nsl_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23219,7 +22524,7 @@
+@@ -23219,7 +22526,7 @@
ac_cv_lib_nsl_gethostbyname=no
fi
@@ -19455,7 +19476,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23272,27 +22577,11 @@
+@@ -23272,27 +22579,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19488,7 +19509,7 @@
ac_cv_lib_bsd_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23301,7 +22590,7 @@
+@@ -23301,7 +22592,7 @@
ac_cv_lib_bsd_gethostbyname=no
fi
@@ -19497,7 +19518,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23384,27 +22673,11 @@
+@@ -23384,27 +22675,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19530,7 +19551,7 @@
ac_cv_func_connect=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23413,7 +22686,7 @@
+@@ -23413,7 +22688,7 @@
ac_cv_func_connect=no
fi
@@ -19539,7 +19560,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-@@ -23462,27 +22735,11 @@
+@@ -23462,27 +22737,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19572,7 +19593,7 @@
ac_cv_lib_socket_connect=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23491,7 +22748,7 @@
+@@ -23491,7 +22750,7 @@
ac_cv_lib_socket_connect=no
fi
@@ -19581,7 +19602,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23567,27 +22824,11 @@
+@@ -23567,27 +22826,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19614,7 +19635,7 @@
ac_cv_func_remove=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23596,7 +22837,7 @@
+@@ -23596,7 +22839,7 @@
ac_cv_func_remove=no
fi
@@ -19623,7 +19644,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-@@ -23645,27 +22886,11 @@
+@@ -23645,27 +22888,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19656,7 +19677,7 @@
ac_cv_lib_posix_remove=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23674,7 +22899,7 @@
+@@ -23674,7 +22901,7 @@
ac_cv_lib_posix_remove=no
fi
@@ -19665,7 +19686,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23750,27 +22975,11 @@
+@@ -23750,27 +22977,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19698,7 +19719,7 @@
ac_cv_func_shmat=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23779,7 +22988,7 @@
+@@ -23779,7 +22990,7 @@
ac_cv_func_shmat=no
fi
@@ -19707,7 +19728,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-@@ -23828,27 +23037,11 @@
+@@ -23828,27 +23039,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19740,7 +19761,7 @@
ac_cv_lib_ipc_shmat=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23857,7 +23050,7 @@
+@@ -23857,7 +23052,7 @@
ac_cv_lib_ipc_shmat=no
fi
@@ -19749,7 +19770,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23921,27 +23114,11 @@
+@@ -23921,27 +23116,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19782,7 +19803,7 @@
ac_cv_lib_ICE_IceConnectionNumber=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23950,7 +23127,7 @@
+@@ -23950,7 +23129,7 @@
ac_cv_lib_ICE_IceConnectionNumber=no
fi
@@ -19791,7 +19812,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -24016,27 +23193,11 @@
+@@ -24016,27 +23195,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19824,7 +19845,7 @@
ac_cv_lib_Xau_XauFileName=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24045,7 +23206,7 @@
+@@ -24045,7 +23208,7 @@
ac_cv_lib_Xau_XauFileName=no
fi
@@ -19833,7 +19854,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -24104,27 +23265,11 @@
+@@ -24104,27 +23267,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19866,7 +19887,7 @@
ac_cv_lib_Xrandr_XRRUpdateConfiguration=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24133,7 +23278,7 @@
+@@ -24133,7 +23280,7 @@
ac_cv_lib_Xrandr_XRRUpdateConfiguration=no
fi
@@ -19875,7 +19896,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -24168,27 +23313,10 @@
+@@ -24168,27 +23315,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19907,7 +19928,7 @@
ac_cv_header_X11_extensions_Xrandr_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24269,27 +23397,10 @@
+@@ -24269,27 +23399,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19939,7 +19960,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24325,17 +23436,10 @@
+@@ -24325,17 +23438,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19961,7 +19982,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24433,27 +23537,11 @@
+@@ -24433,27 +23539,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19994,7 +20015,7 @@
am_cv_val_LC_MESSAGES=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24462,7 +23550,7 @@
+@@ -24462,7 +23552,7 @@
am_cv_val_LC_MESSAGES=no
fi
@@ -20003,7 +20024,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-@@ -24518,27 +23606,10 @@
+@@ -24518,27 +23608,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20035,7 +20056,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24574,17 +23645,10 @@
+@@ -24574,17 +23647,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20057,7 +20078,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24680,27 +23744,11 @@
+@@ -24680,27 +23746,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20090,7 +20111,7 @@
gt_cv_func_ngettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24709,7 +23757,7 @@
+@@ -24709,7 +23759,7 @@
gt_cv_func_ngettext_libc=no
fi
@@ -20099,7 +20120,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -24752,27 +23800,11 @@
+@@ -24752,27 +23802,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20132,7 +20153,7 @@
gt_cv_func_dgettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24781,7 +23813,7 @@
+@@ -24781,7 +23815,7 @@
gt_cv_func_dgettext_libc=no
fi
@@ -20141,7 +20162,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -24857,27 +23889,11 @@
+@@ -24857,27 +23891,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20174,7 +20195,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -24886,7 +23902,7 @@
+@@ -24886,7 +23904,7 @@
eval "$as_ac_var=no"
fi
@@ -20183,7 +20204,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -24951,27 +23967,11 @@
+@@ -24951,27 +23969,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20216,7 +20237,7 @@
ac_cv_lib_intl_bindtextdomain=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24980,7 +23980,7 @@
+@@ -24980,7 +23982,7 @@
ac_cv_lib_intl_bindtextdomain=no
fi
@@ -20225,7 +20246,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -25029,27 +24029,11 @@
+@@ -25029,27 +24031,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20258,7 +20279,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25058,7 +24042,7 @@
+@@ -25058,7 +24044,7 @@
ac_cv_lib_intl_ngettext=no
fi
@@ -20267,56 +20288,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -25103,31 +24087,15 @@
- eval "echo \"\$as_me:$LINENO: $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
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_intl_dgettext=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -25136,7 +24104,7 @@
- ac_cv_lib_intl_dgettext=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+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
-@@ -25198,27 +24166,11 @@
+@@ -25107,27 +24093,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20346,11 +20318,11 @@
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_intl_ngettext=yes
+ ac_cv_lib_intl_dgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25227,7 +24179,7 @@
- ac_cv_lib_intl_ngettext=no
+@@ -25136,7 +24106,7 @@
+ ac_cv_lib_intl_dgettext=no
fi
-rm -f core conftest.err conftest.$ac_objext \
@@ -20358,7 +20330,71 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -25276,27 +24228,11 @@
+@@ -25184,41 +24154,25 @@
+ ;
+ 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 "echo \"\$as_me:$LINENO: $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
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
++_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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_intl_ngettext=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -25227,7 +24181,7 @@
+ ac_cv_lib_intl_ngettext=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -25276,27 +24230,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20391,7 +20427,7 @@
ac_cv_lib_intl_dcgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25305,7 +24241,7 @@
+@@ -25305,7 +24243,7 @@
ac_cv_lib_intl_dcgettext=no
fi
@@ -20400,7 +20436,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -25400,27 +24336,11 @@
+@@ -25400,27 +24338,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20433,7 +20469,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -25429,7 +24349,7 @@
+@@ -25429,7 +24351,7 @@
eval "$as_ac_var=no"
fi
@@ -20442,7 +20478,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -25576,27 +24496,11 @@
+@@ -25576,27 +24498,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20475,7 +20511,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -25605,7 +24509,7 @@
+@@ -25605,7 +24511,7 @@
eval "$as_ac_var=no"
fi
@@ -20484,7 +20520,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -25666,7 +24570,7 @@
+@@ -25666,7 +24572,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -20493,7 +20529,7 @@
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -25754,27 +24658,11 @@
+@@ -25754,27 +24660,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20526,7 +20562,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -25846,27 +24734,11 @@
+@@ -25846,27 +24736,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20559,7 +20595,7 @@
ac_cv_func_bind_textdomain_codeset=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25875,7 +24747,7 @@
+@@ -25875,7 +24749,7 @@
ac_cv_func_bind_textdomain_codeset=no
fi
@@ -20568,7 +20604,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-@@ -25896,7 +24768,7 @@
+@@ -25896,7 +24770,7 @@
esac
fi
@@ -20577,7 +20613,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
-@@ -26049,27 +24921,10 @@
+@@ -26049,27 +24923,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20609,7 +20645,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26244,27 +25099,10 @@
+@@ -26244,27 +25101,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20641,7 +20677,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26300,17 +25138,10 @@
+@@ -26300,17 +25140,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20663,7 +20699,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26501,27 +25332,11 @@
+@@ -26501,27 +25334,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20696,7 +20732,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -26561,27 +25376,11 @@
+@@ -26561,27 +25378,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20729,7 +20765,7 @@
LIBWRAP_NSL="-lnsl"
else
echo "$as_me: failed program was:" >&5
-@@ -26590,13 +25389,13 @@
+@@ -26590,13 +25391,13 @@
LIBWRAP_PATH=""
fi
@@ -20745,7 +20781,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$ORIG_LIBS"
if test -n "$LIB_NSL"; then
-@@ -26703,27 +25502,11 @@
+@@ -26703,27 +25504,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20778,7 +20814,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26732,7 +25515,7 @@
+@@ -26732,7 +25517,7 @@
eval "$as_ac_var=no"
fi
@@ -20787,7 +20823,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -26791,27 +25574,10 @@
+@@ -26791,27 +25576,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20819,7 +20855,7 @@
have_ipv6=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26890,27 +25656,11 @@
+@@ -26890,27 +25658,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20852,7 +20888,7 @@
ac_cv_func_getaddrinfo=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26919,7 +25669,7 @@
+@@ -26919,7 +25671,7 @@
ac_cv_func_getaddrinfo=no
fi
@@ -20861,7 +20897,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5
-@@ -26974,27 +25724,11 @@
+@@ -26974,27 +25726,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20894,7 +20930,7 @@
eval "$as_ac_Lib=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -27003,7 +25737,7 @@
+@@ -27003,7 +25739,7 @@
eval "$as_ac_Lib=no"
fi
@@ -20903,7 +20939,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -27046,7 +25780,7 @@
+@@ -27046,7 +25782,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -20912,7 +20948,7 @@
ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -27091,7 +25825,7 @@
+@@ -27091,7 +25827,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -20921,7 +20957,7 @@
ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -27156,7 +25890,7 @@
+@@ -27156,7 +25892,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -20930,7 +20966,38 @@
ac_cv_path_RSH_COMMAND="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -27385,7 +26119,8 @@
+@@ -27187,6 +25923,30 @@
+
+
+
++{ echo "$as_me:$LINENO: checking for gnome-settings-daemon" >&5
++echo $ECHO_N "checking for gnome-settings-daemon... $ECHO_C" >&6; }
++
++# Check whether --with-settings-daemon was given.
++if test "${with_settings_daemon+set}" = set; then
++ withval=$with_settings_daemon; SETTINGS_DAEMON_PATH="$with_settings_daemon"
++else
++ SETTINGS_DAEMON_PATH=`pkg-config --variable=binary gnome-settings-daemon`
++ if test x$SETTINGS_DAEMON_PATH = x ; then
++ { { echo "$as_me:$LINENO: error: No path found to gnome-settings-daemon." >&5
++echo "$as_me: error: No path found to gnome-settings-daemon." >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++
++fi
++
++{ echo "$as_me:$LINENO: result: $SETTINGS_DAEMON_PATH" >&5
++echo "${ECHO_T}$SETTINGS_DAEMON_PATH" >&6; }
++
++cat >>confdefs.h <<_ACEOF
++#define SETTINGS_DAEMON_PATH "$SETTINGS_DAEMON_PATH"
++_ACEOF
++
++
+
+ GNOME_SESSION_TARBALL=`date +%e`
+
+@@ -27385,7 +26145,8 @@
## M4sh Initialization. ##
## --------------------- ##
@@ -20940,7 +21007,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -27394,10 +26129,13 @@
+@@ -27394,10 +26155,13 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -20957,7 +21024,7 @@
# PATH needs CR
-@@ -27621,19 +26359,28 @@
+@@ -27621,19 +26385,28 @@
as_mkdir_p=false
fi
@@ -20997,7 +21064,7 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -27649,7 +26396,7 @@
+@@ -27649,7 +26422,7 @@
# values after options handling.
ac_log="
This file was extended by gnome-session $as_me 2.20.3, which was
@@ -21006,7 +21073,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -27678,7 +26425,7 @@
+@@ -27678,7 +26451,7 @@
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
@@ -21015,7 +21082,7 @@
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
-@@ -27702,7 +26449,7 @@
+@@ -27702,7 +26475,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
gnome-session config.status 2.20.3
@@ -21024,7 +21091,7 @@
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2006 Free Software Foundation, Inc.
-@@ -28059,6 +26806,7 @@
+@@ -28059,6 +26832,7 @@
host_cpu!$host_cpu$ac_delim
host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim
@@ -21032,7 +21099,7 @@
LN_S!$LN_S$ac_delim
ECHO!$ECHO$ac_delim
AR!$AR$ac_delim
-@@ -28125,7 +26873,7 @@
+@@ -28125,7 +26899,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
@@ -21043,7 +21110,7 @@
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -Naur gnome-session-2.20.3.old/data/icons/16x16/Makefile.in gnome-session-2.20.3/data/icons/16x16/Makefile.in
--- gnome-session-2.20.3.old/data/icons/16x16/Makefile.in 2008-01-07 23:32:11.000000000 +0100
-+++ gnome-session-2.20.3/data/icons/16x16/Makefile.in 2008-01-12 07:21:00.000000000 +0100
++++ gnome-session-2.20.3/data/icons/16x16/Makefile.in 2008-01-12 08:00:21.000000000 +0100
@@ -166,6 +166,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
@@ -21054,7 +21121,7 @@
STRIP = @STRIP@
diff -Naur gnome-session-2.20.3.old/data/icons/22x22/Makefile.in gnome-session-2.20.3/data/icons/22x22/Makefile.in
--- gnome-session-2.20.3.old/data/icons/22x22/Makefile.in 2008-01-07 23:32:11.000000000 +0100
-+++ gnome-session-2.20.3/data/icons/22x22/Makefile.in 2008-01-12 07:21:00.000000000 +0100
++++ gnome-session-2.20.3/data/icons/22x22/Makefile.in 2008-01-12 08:00:22.000000000 +0100
@@ -166,6 +166,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
@@ -21065,7 +21132,7 @@
STRIP = @STRIP@
diff -Naur gnome-session-2.20.3.old/data/icons/24x24/Makefile.in gnome-session-2.20.3/data/icons/24x24/Makefile.in
--- gnome-session-2.20.3.old/data/icons/24x24/Makefile.in 2008-01-07 23:32:12.000000000 +0100
-+++ gnome-session-2.20.3/data/icons/24x24/Makefile.in 2008-01-12 07:21:00.000000000 +0100
++++ gnome-session-2.20.3/data/icons/24x24/Makefile.in 2008-01-12 08:00:22.000000000 +0100
@@ -166,6 +166,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
@@ -21076,7 +21143,7 @@
STRIP = @STRIP@
diff -Naur gnome-session-2.20.3.old/data/icons/32x32/Makefile.in gnome-session-2.20.3/data/icons/32x32/Makefile.in
--- gnome-session-2.20.3.old/data/icons/32x32/Makefile.in 2008-01-07 23:32:12.000000000 +0100
-+++ gnome-session-2.20.3/data/icons/32x32/Makefile.in 2008-01-12 07:21:01.000000000 +0100
++++ gnome-session-2.20.3/data/icons/32x32/Makefile.in 2008-01-12 08:00:23.000000000 +0100
@@ -166,6 +166,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
@@ -21087,7 +21154,7 @@
STRIP = @STRIP@
diff -Naur gnome-session-2.20.3.old/data/icons/Makefile.in gnome-session-2.20.3/data/icons/Makefile.in
--- gnome-session-2.20.3.old/data/icons/Makefile.in 2008-01-07 23:32:12.000000000 +0100
-+++ gnome-session-2.20.3/data/icons/Makefile.in 2008-01-12 07:21:01.000000000 +0100
++++ gnome-session-2.20.3/data/icons/Makefile.in 2008-01-12 08:00:23.000000000 +0100
@@ -168,6 +168,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
@@ -21098,7 +21165,7 @@
STRIP = @STRIP@
diff -Naur gnome-session-2.20.3.old/data/icons/scalable/Makefile.in gnome-session-2.20.3/data/icons/scalable/Makefile.in
--- gnome-session-2.20.3.old/data/icons/scalable/Makefile.in 2008-01-07 23:32:12.000000000 +0100
-+++ gnome-session-2.20.3/data/icons/scalable/Makefile.in 2008-01-12 07:21:02.000000000 +0100
++++ gnome-session-2.20.3/data/icons/scalable/Makefile.in 2008-01-12 08:00:23.000000000 +0100
@@ -166,6 +166,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
@@ -21109,7 +21176,7 @@
STRIP = @STRIP@
diff -Naur gnome-session-2.20.3.old/data/Makefile.in gnome-session-2.20.3/data/Makefile.in
--- gnome-session-2.20.3.old/data/Makefile.in 2008-01-07 23:32:11.000000000 +0100
-+++ gnome-session-2.20.3/data/Makefile.in 2008-01-12 07:20:59.000000000 +0100
++++ gnome-session-2.20.3/data/Makefile.in 2008-01-12 08:00:21.000000000 +0100
@@ -183,6 +183,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
@@ -21120,7 +21187,7 @@
STRIP = @STRIP@
diff -Naur gnome-session-2.20.3.old/gnome-session/Makefile.in gnome-session-2.20.3/gnome-session/Makefile.in
--- gnome-session-2.20.3.old/gnome-session/Makefile.in 2008-01-07 23:32:13.000000000 +0100
-+++ gnome-session-2.20.3/gnome-session/Makefile.in 2008-01-12 07:21:02.000000000 +0100
++++ gnome-session-2.20.3/gnome-session/Makefile.in 2008-01-12 08:00:24.000000000 +0100
@@ -227,6 +227,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
@@ -21131,7 +21198,7 @@
STRIP = @STRIP@
diff -Naur gnome-session-2.20.3.old/intltool-extract.in gnome-session-2.20.3/intltool-extract.in
--- gnome-session-2.20.3.old/intltool-extract.in 2008-01-07 23:31:37.000000000 +0100
-+++ gnome-session-2.20.3/intltool-extract.in 2008-01-12 07:20:29.000000000 +0100
++++ gnome-session-2.20.3/intltool-extract.in 2008-01-12 07:59:46.000000000 +0100
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
@@ -21180,7 +21247,7 @@
diff -Naur gnome-session-2.20.3.old/intltool-merge.in gnome-session-2.20.3/intltool-merge.in
--- gnome-session-2.20.3.old/intltool-merge.in 2008-01-07 23:31:37.000000000 +0100
-+++ gnome-session-2.20.3/intltool-merge.in 2008-01-12 07:20:29.000000000 +0100
++++ gnome-session-2.20.3/intltool-merge.in 2008-01-12 07:59:46.000000000 +0100
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
@@ -21404,7 +21471,7 @@
close OUTPUT;
diff -Naur gnome-session-2.20.3.old/intltool-update.in gnome-session-2.20.3/intltool-update.in
--- gnome-session-2.20.3.old/intltool-update.in 2008-01-07 23:31:37.000000000 +0100
-+++ gnome-session-2.20.3/intltool-update.in 2008-01-12 07:20:29.000000000 +0100
++++ gnome-session-2.20.3/intltool-update.in 2008-01-12 07:59:46.000000000 +0100
@@ -30,7 +30,7 @@
## Release information
@@ -21992,7 +22059,7 @@
diff -Naur gnome-session-2.20.3.old/Makefile.in gnome-session-2.20.3/Makefile.in
--- gnome-session-2.20.3.old/Makefile.in 2008-01-07 23:32:13.000000000 +0100
-+++ gnome-session-2.20.3/Makefile.in 2008-01-12 07:21:03.000000000 +0100
++++ gnome-session-2.20.3/Makefile.in 2008-01-12 08:00:25.000000000 +0100
@@ -184,6 +184,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
@@ -22003,7 +22070,7 @@
STRIP = @STRIP@
diff -Naur gnome-session-2.20.3.old/man/Makefile.in gnome-session-2.20.3/man/Makefile.in
--- gnome-session-2.20.3.old/man/Makefile.in 2008-01-07 23:32:13.000000000 +0100
-+++ gnome-session-2.20.3/man/Makefile.in 2008-01-12 07:21:03.000000000 +0100
++++ gnome-session-2.20.3/man/Makefile.in 2008-01-12 08:00:24.000000000 +0100
@@ -162,6 +162,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
More information about the pkg-gnome-commits
mailing list