r23635 - in /desktop/unstable/nautilus/debian: changelog patches/90_relibtoolize.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Fri Apr 9 08:17:38 UTC 2010
Author: biebl
Date: Fri Apr 9 08:17:31 2010
New Revision: 23635
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23635
Log:
* debian/patches/90_relibtoolize.patch
- Update build system accordingly.
Modified:
desktop/unstable/nautilus/debian/changelog
desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch
Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=23635&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog [utf-8] (original)
+++ desktop/unstable/nautilus/debian/changelog [utf-8] Fri Apr 9 08:17:31 2010
@@ -2,6 +2,8 @@
* debian/patches/04_tracker_0.8.patch
- Add support for tracker 0.8.
+ * debian/patches/90_relibtoolize.patch
+ - Update build system accordingly.
-- Michael Biebl <biebl at debian.org> Fri, 09 Apr 2010 10:09:10 +0200
Modified: desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch?rev=23635&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch [utf-8] Fri Apr 9 08:17:31 2010
@@ -8,8 +8,8 @@
Index: nautilus-2.28.4/aclocal.m4
===================================================================
---- nautilus-2.28.4.orig/aclocal.m4 2010-04-09 01:58:09.078718475 +0200
-+++ nautilus-2.28.4/aclocal.m4 2010-04-09 01:59:15.734717077 +0200
+--- nautilus-2.28.4.orig/aclocal.m4 2009-12-15 10:12:53.000000000 +0100
++++ nautilus-2.28.4/aclocal.m4 2010-04-09 02:23:18.709102091 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
@@ -3169,8 +3169,8 @@
m4_include([m4/intltool.m4])
Index: nautilus-2.28.4/config.guess
===================================================================
---- nautilus-2.28.4.orig/config.guess 2010-04-09 01:58:09.066716741 +0200
-+++ nautilus-2.28.4/config.guess 2010-04-09 01:59:17.062714488 +0200
+--- nautilus-2.28.4.orig/config.guess 2009-12-15 10:12:56.000000000 +0100
++++ nautilus-2.28.4/config.guess 2010-04-09 02:23:22.033092789 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -3184,7 +3184,7 @@
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-@@ -27,16 +27,16 @@ timestamp='2009-04-27'
+@@ -27,16 +27,16 @@
# the same distribution terms that you use for the rest of that program.
@@ -3206,7 +3206,7 @@
me=`echo "$0" | sed -e 's,.*/,,'`
-@@ -56,8 +56,9 @@ version="\
+@@ -56,8 +56,9 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
@@ -3218,7 +3218,7 @@
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -170,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -170,7 +171,7 @@
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -3227,7 +3227,7 @@
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
-@@ -333,6 +334,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -333,6 +334,9 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
@@ -3237,7 +3237,7 @@
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
eval $set_cc_for_build
SUN_ARCH="i386"
-@@ -656,7 +660,7 @@ EOF
+@@ -656,7 +660,7 @@
# => hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
@@ -3246,7 +3246,7 @@
then
HP_ARCH="hppa2.0w"
else
-@@ -807,12 +811,12 @@ EOF
+@@ -807,12 +811,12 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
@@ -3261,7 +3261,7 @@
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
-@@ -822,6 +826,9 @@ EOF
+@@ -822,6 +826,9 @@
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -3271,7 +3271,7 @@
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -851,6 +858,20 @@ EOF
+@@ -851,6 +858,20 @@
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
@@ -3292,7 +3292,7 @@
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-@@ -873,6 +894,17 @@ EOF
+@@ -873,6 +894,17 @@
frv:Linux:*:*)
echo frv-unknown-linux-gnu
exit ;;
@@ -3310,7 +3310,7 @@
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
-@@ -882,78 +914,34 @@ EOF
+@@ -882,78 +914,34 @@
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
@@ -3398,7 +3398,7 @@
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -962,8 +950,11 @@ EOF
+@@ -962,8 +950,11 @@
*) echo hppa-unknown-linux-gnu ;;
esac
exit ;;
@@ -3412,7 +3412,7 @@
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
-@@ -986,66 +977,6 @@ EOF
+@@ -986,66 +977,6 @@
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
@@ -3479,7 +3479,7 @@
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
-@@ -1074,7 +1005,7 @@ EOF
+@@ -1074,7 +1005,7 @@
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
@@ -3488,7 +3488,7 @@
echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
-@@ -1182,7 +1113,7 @@ EOF
+@@ -1182,7 +1113,7 @@
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
@@ -3497,7 +3497,7 @@
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
-@@ -1275,6 +1206,16 @@ EOF
+@@ -1275,6 +1206,16 @@
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
@@ -3516,8 +3516,17 @@
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
Index: nautilus-2.28.4/config.h.in
===================================================================
---- nautilus-2.28.4.orig/config.h.in 2010-04-09 01:58:09.050715407 +0200
-+++ nautilus-2.28.4/config.h.in 2010-04-09 01:58:59.554215624 +0200
+--- nautilus-2.28.4.orig/config.h.in 2009-12-15 10:12:56.000000000 +0100
++++ nautilus-2.28.4/config.h.in 2010-04-09 02:23:26.000000000 +0200
+@@ -133,7 +133,7 @@
+ #undef HAVE_TRACKER
+
+ /* Define to enable tracker support */
+-#undef HAVE_TRACKER_0_7
++#undef HAVE_TRACKER_0_8
+
+ /* Define to 1 if you have the <unistd.h> header file. */
+ #undef HAVE_UNISTD_H
@@ -160,6 +160,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -3530,8 +3539,8 @@
Index: nautilus-2.28.4/configure
===================================================================
---- nautilus-2.28.4.orig/configure 2010-04-09 01:58:09.038719539 +0200
-+++ nautilus-2.28.4/configure 2010-04-09 01:59:20.086712160 +0200
+--- nautilus-2.28.4.orig/configure 2009-12-15 10:12:55.000000000 +0100
++++ nautilus-2.28.4/configure 2010-04-09 02:23:30.645095611 +0200
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -3563,7 +3572,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -22,23 +26,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -22,23 +26,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -3592,7 +3601,7 @@
as_nl='
'
export as_nl
-@@ -46,7 +42,13 @@ export as_nl
+@@ -46,7 +42,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -3607,7 +3616,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -57,7 +59,7 @@ else
+@@ -57,7 +59,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -3616,7 +3625,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -80,13 +82,6 @@ if test "${PATH_SEPARATOR+set}" != set;
+@@ -80,13 +82,6 @@
}
fi
@@ -3630,7 +3639,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -96,15 +91,15 @@ fi
+@@ -96,15 +91,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -3649,7 +3658,7 @@
IFS=$as_save_IFS
;;
-@@ -116,12 +111,16 @@ if test "x$as_myself" = x; then
+@@ -116,12 +111,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -3670,7 +3679,7 @@
done
PS1='$ '
PS2='> '
-@@ -133,330 +132,301 @@ export LC_ALL
+@@ -133,330 +132,301 @@
LANGUAGE=C
export LANGUAGE
@@ -4248,7 +4257,7 @@
sed -n '
p
/[$]LINENO/=
-@@ -473,8 +443,7 @@ test \$exitcode = 0") || {
+@@ -473,8 +443,7 @@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
@@ -4258,7 +4267,7 @@
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
-@@ -484,29 +453,18 @@ test \$exitcode = 0") || {
+@@ -484,29 +453,18 @@
exit
}
@@ -4293,7 +4302,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -536,7 +494,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$
+@@ -536,7 +494,7 @@
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
@@ -4302,7 +4311,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -555,10 +513,10 @@ else
+@@ -555,10 +513,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -4315,7 +4324,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -573,7 +531,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+@@ -573,7 +531,6 @@
@@ -4323,7 +4332,7 @@
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
-@@ -722,7 +679,8 @@ fi
+@@ -722,7 +679,8 @@
@@ -4333,7 +4342,7 @@
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-@@ -740,7 +698,6 @@ cross_compiling=no
+@@ -740,7 +698,6 @@
subdirs=
MFLAGS=
MAKEFLAGS=
@@ -4341,7 +4350,7 @@
# Identity of this package.
PACKAGE_NAME='nautilus'
-@@ -748,6 +705,7 @@ PACKAGE_TARNAME='nautilus'
+@@ -748,6 +705,7 @@
PACKAGE_VERSION='2.28.4'
PACKAGE_STRING='nautilus 2.28.4'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus'
@@ -4349,7 +4358,7 @@
ac_unique_file="src"
# Factoring default headers for most tests.
-@@ -1016,6 +974,7 @@ bindir
+@@ -1016,6 +974,7 @@
program_transform_name
prefix
exec_prefix
@@ -4357,7 +4366,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1184,8 +1143,7 @@ do
+@@ -1184,8 +1143,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4367,7 +4376,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1211,8 +1169,7 @@ do
+@@ -1211,8 +1169,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4377,7 +4386,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1416,8 +1373,7 @@ do
+@@ -1416,8 +1373,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4387,7 +4396,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1433,8 +1389,7 @@ do
+@@ -1433,8 +1389,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4397,7 +4406,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1464,17 +1419,17 @@ do
+@@ -1464,17 +1419,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -4421,7 +4430,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1491,15 +1446,13 @@ done
+@@ -1491,15 +1446,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -4439,7 +4448,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1522,8 +1475,7 @@ do
+@@ -1522,8 +1475,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -4449,7 +4458,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1553,11 +1505,9 @@ test "$silent" = yes && exec 6>/dev/null
+@@ -1553,11 +1505,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -4463,7 +4472,7 @@
# Find the source files, if location was not specified.
-@@ -1596,13 +1546,11 @@ else
+@@ -1596,13 +1546,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -4479,7 +4488,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1720,9 +1668,9 @@ Optional Features:
+@@ -1720,9 +1668,9 @@
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--disable-nls do not use Native Language Support
@@ -4492,7 +4501,7 @@
--enable-profiler Enable profiler
--disable-xmp build without xmp support
--disable-tracker build without tracker support
-@@ -1733,8 +1681,8 @@ Optional Features:
+@@ -1733,8 +1681,8 @@
--disable-schemas-install
Disable the schemas installation
--disable-update-mimedb disable the update-mime-database after install
@@ -4503,7 +4512,7 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-@@ -1755,7 +1703,7 @@ Some influential environment variables:
+@@ -1755,7 +1703,7 @@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
@@ -4512,7 +4521,7 @@
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
-@@ -1846,21 +1794,378 @@ test -n "$ac_init_help" && exit $ac_stat
+@@ -1846,21 +1794,378 @@
if $ac_init_version; then
cat <<\_ACEOF
nautilus configure 2.28.4
@@ -4895,7 +4904,7 @@
$ $0 $@
-@@ -1896,8 +2201,8 @@ for as_dir in $PATH
+@@ -1896,8 +2201,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4906,7 +4915,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1934,9 +2239,9 @@ do
+@@ -1934,9 +2239,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -4918,7 +4927,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1952,13 +2257,13 @@ do
+@@ -1952,13 +2257,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -4935,7 +4944,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -1983,13 +2288,13 @@ _ASBOX
+@@ -1983,13 +2288,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -4951,7 +4960,7 @@
esac ;;
esac
done
-@@ -2061,39 +2366,41 @@ _ASBOX
+@@ -2061,39 +2366,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -4998,7 +5007,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2111,8 +2418,8 @@ fi
+@@ -2111,8 +2418,8 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -5009,7 +5018,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2120,10 +2427,10 @@ $as_echo "$as_me: loading site script $a
+@@ -2120,10 +2427,10 @@
done
if test -r "$cache_file"; then
@@ -5024,7 +5033,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2131,7 +2438,7 @@ $as_echo "$as_me: loading cache $cache_f
+@@ -2131,7 +2438,7 @@
esac
fi
else
@@ -5033,7 +5042,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2146,11 +2453,11 @@ for ac_var in $ac_precious_vars; do
+@@ -2146,11 +2453,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -5047,7 +5056,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2160,17 +2467,17 @@ $as_echo "$as_me: error: \`$ac_var' was
+@@ -2160,17 +2467,17 @@
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -5069,7 +5078,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2182,43 +2489,20 @@ $as_echo "$as_me: current value: \`$ac
+@@ -2182,43 +2489,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -5120,7 +5129,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2238,24 +2522,16 @@ am__api_version='1.11'
+@@ -2238,24 +2522,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -5153,7 +5162,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2281,10 +2557,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
+@@ -2281,10 +2557,10 @@
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
@@ -5166,7 +5175,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2292,11 +2568,11 @@ for as_dir in $PATH
+@@ -2292,11 +2568,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5182,7 +5191,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2333,7 +2609,7 @@ case $as_dir/ in
+@@ -2333,7 +2609,7 @@
;;
esac
@@ -5191,7 +5200,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2349,7 +2625,7 @@ fi
+@@ -2349,7 +2625,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -5200,7 +5209,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2360,7 +2636,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+@@ -2360,7 +2636,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -5209,7 +5218,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2371,15 +2647,11 @@ am_lf='
+@@ -2371,15 +2647,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -5227,7 +5236,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2401,11 +2673,8 @@ if (
+@@ -2401,11 +2673,8 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -5241,7 +5250,7 @@
fi
test "$2" = conftest.file
-@@ -2414,13 +2683,10 @@ then
+@@ -2414,13 +2683,10 @@
# Ok.
:
else
@@ -5258,7 +5267,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2448,7 +2714,7 @@ if eval "$MISSING --run true"; then
+@@ -2448,7 +2714,7 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -5267,7 +5276,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2469,9 +2735,9 @@ if test "$cross_compiling" != no; then
+@@ -2469,9 +2735,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -5279,7 +5288,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2482,24 +2748,24 @@ for as_dir in $PATH
+@@ -2482,24 +2748,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5309,7 +5318,7 @@
$as_echo "no" >&6; }
fi
-@@ -2509,9 +2775,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -2509,9 +2775,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -5321,7 +5330,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2522,24 +2788,24 @@ for as_dir in $PATH
+@@ -2522,24 +2788,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5351,7 +5360,7 @@
$as_echo "no" >&6; }
fi
-@@ -2548,7 +2814,7 @@ fi
+@@ -2548,7 +2814,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5360,7 +5369,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2561,10 +2827,10 @@ fi
+@@ -2561,10 +2827,10 @@
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -5373,7 +5382,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2572,7 +2838,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
+@@ -2572,7 +2838,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5382,7 +5391,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2584,11 +2850,12 @@ do
+@@ -2584,11 +2850,12 @@
esac
done
done
@@ -5396,7 +5405,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2596,11 +2863,10 @@ fi
+@@ -2596,11 +2863,10 @@
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
@@ -5409,7 +5418,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2613,9 +2879,9 @@ for ac_prog in gawk mawk nawk awk
+@@ -2613,9 +2879,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -5421,7 +5430,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2626,24 +2892,24 @@ for as_dir in $PATH
+@@ -2626,24 +2892,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5451,7 +5460,7 @@
$as_echo "no" >&6; }
fi
-@@ -2651,11 +2917,11 @@ fi
+@@ -2651,11 +2917,11 @@
test -n "$AWK" && break
done
@@ -5465,7 +5474,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2673,11 +2939,11 @@ esac
+@@ -2673,11 +2939,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -5479,7 +5488,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2697,9 +2963,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
+@@ -2697,9 +2963,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -5490,7 +5499,7 @@
fi
fi
-@@ -2750,7 +3014,7 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma
+@@ -2750,7 +3014,7 @@
AMTAR=${AMTAR-"${am_missing_run}tar"}
@@ -5499,7 +5508,7 @@
$as_echo_n "checking how to create a ustar tar archive... " >&6; }
# Loop over all known methods to create a tar archive until one works.
_am_tools='gnutar plaintar pax cpio none'
-@@ -2823,13 +3087,13 @@ do
+@@ -2823,13 +3087,13 @@
done
rm -rf conftest.dir
@@ -5515,7 +5524,7 @@
$as_echo "$am_cv_prog_tar_ustar" >&6; }
-@@ -2837,16 +3101,16 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
+@@ -2837,16 +3101,16 @@
@@ -5535,7 +5544,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2889,7 +3153,7 @@ am__doit:
+@@ -2889,7 +3153,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -5544,7 +5553,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -2917,12 +3181,12 @@ if test "$am__include" = "#"; then
+@@ -2917,12 +3181,12 @@
fi
@@ -5559,7 +5568,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -2947,9 +3211,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -2947,9 +3211,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -5571,7 +5580,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2960,24 +3224,24 @@ for as_dir in $PATH
+@@ -2960,24 +3224,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5601,7 +5610,7 @@
$as_echo "no" >&6; }
fi
-@@ -2987,9 +3251,9 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -2987,9 +3251,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -5613,7 +5622,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3000,24 +3264,24 @@ for as_dir in $PATH
+@@ -3000,24 +3264,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5643,7 +5652,7 @@
$as_echo "no" >&6; }
fi
-@@ -3026,7 +3290,7 @@ fi
+@@ -3026,7 +3290,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5652,7 +5661,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3040,9 +3304,9 @@ if test -z "$CC"; then
+@@ -3040,9 +3304,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -5664,7 +5673,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3053,24 +3317,24 @@ for as_dir in $PATH
+@@ -3053,24 +3317,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5694,7 +5703,7 @@
$as_echo "no" >&6; }
fi
-@@ -3080,9 +3344,9 @@ fi
+@@ -3080,9 +3344,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -5706,7 +5715,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3094,18 +3358,18 @@ for as_dir in $PATH
+@@ -3094,18 +3358,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5728,7 +5737,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3124,10 +3388,10 @@ fi
+@@ -3124,10 +3388,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -5741,7 +5750,7 @@
$as_echo "no" >&6; }
fi
-@@ -3139,9 +3403,9 @@ if test -z "$CC"; then
+@@ -3139,9 +3403,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -5753,7 +5762,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3152,24 +3416,24 @@ for as_dir in $PATH
+@@ -3152,24 +3416,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5783,7 +5792,7 @@
$as_echo "no" >&6; }
fi
-@@ -3183,9 +3447,9 @@ if test -z "$CC"; then
+@@ -3183,9 +3447,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -5795,7 +5804,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3196,24 +3460,24 @@ for as_dir in $PATH
+@@ -3196,24 +3460,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5825,7 +5834,7 @@
$as_echo "no" >&6; }
fi
-@@ -3226,7 +3490,7 @@ done
+@@ -3226,7 +3490,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5834,7 +5843,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3237,57 +3501,37 @@ fi
+@@ -3237,57 +3501,37 @@
fi
@@ -5912,7 +5921,7 @@
/* end confdefs.h. */
int
-@@ -3303,8 +3547,8 @@ ac_clean_files="$ac_clean_files a.out a.
+@@ -3303,8 +3547,8 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -5923,7 +5932,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3320,17 +3564,17 @@ do
+@@ -3320,17 +3564,17 @@
done
rm -f $ac_rmfiles
@@ -5946,7 +5955,7 @@
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3347,7 +3591,7 @@ do
+@@ -3347,7 +3591,7 @@
# certainly right.
break;;
*.* )
@@ -5955,7 +5964,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3366,84 +3610,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
+@@ -3366,84 +3610,42 @@
else
ac_file=''
fi
@@ -6061,7 +6070,7 @@
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3458,32 +3660,83 @@ for ac_file in conftest.exe conftest con
+@@ -3458,32 +3660,83 @@
esac
done
else
@@ -6161,7 +6170,7 @@
/* end confdefs.h. */
int
-@@ -3495,17 +3748,17 @@ main ()
+@@ -3495,17 +3748,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -6184,7 +6193,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3518,31 +3771,23 @@ else
+@@ -3518,31 +3771,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -6223,7 +6232,7 @@
/* end confdefs.h. */
int
-@@ -3556,37 +3801,16 @@ main ()
+@@ -3556,37 +3801,16 @@
return 0;
}
_ACEOF
@@ -6264,7 +6273,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3595,20 +3819,16 @@ else
+@@ -3595,20 +3819,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -6288,7 +6297,7 @@
/* end confdefs.h. */
int
-@@ -3619,35 +3839,11 @@ main ()
+@@ -3619,35 +3839,11 @@
return 0;
}
_ACEOF
@@ -6327,7 +6336,7 @@
/* end confdefs.h. */
int
-@@ -3658,36 +3854,12 @@ main ()
+@@ -3658,36 +3854,12 @@
return 0;
}
_ACEOF
@@ -6368,7 +6377,7 @@
/* end confdefs.h. */
int
-@@ -3698,42 +3870,17 @@ main ()
+@@ -3698,42 +3870,17 @@
return 0;
}
_ACEOF
@@ -6413,7 +6422,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3750,18 +3897,14 @@ else
+@@ -3750,18 +3897,14 @@
CFLAGS=
fi
fi
@@ -6435,7 +6444,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3818,32 +3961,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
+@@ -3818,32 +3961,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -6469,7 +6478,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3854,17 +3974,19 @@ fi
+@@ -3854,17 +3974,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -6492,7 +6501,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3874,9 +3996,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -3874,9 +3996,9 @@
depcc="$CC" am_compiler_list=
@@ -6504,7 +6513,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3984,7 +4106,7 @@ else
+@@ -3984,7 +4106,7 @@
fi
fi
@@ -6513,7 +6522,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4005,14 +4127,14 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -4005,14 +4127,14 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -6530,7 +6539,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -4027,11 +4149,7 @@ do
+@@ -4027,11 +4149,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -6543,7 +6552,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4040,78 +4158,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -4040,78 +4158,34 @@
#endif
Syntax error
_ACEOF
@@ -6627,7 +6636,7 @@
break
fi
-@@ -4123,7 +4197,7 @@ fi
+@@ -4123,7 +4197,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -6636,7 +6645,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -4134,11 +4208,7 @@ do
+@@ -4134,11 +4208,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -6649,7 +6658,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4147,87 +4217,40 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -4147,87 +4217,40 @@
#endif
Syntax error
_ACEOF
@@ -6746,7 +6755,7 @@
fi
ac_ext=c
-@@ -4237,9 +4260,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -4237,9 +4260,9 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -6758,7 +6767,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4250,7 +4273,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -4250,7 +4273,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6767,7 +6776,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -4270,7 +4293,7 @@ case `"$ac_path_GREP" --version 2>&1` in
+@@ -4270,7 +4293,7 @@
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -6776,7 +6785,7 @@
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -4285,26 +4308,24 @@ esac
+@@ -4285,26 +4308,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -6808,7 +6817,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4318,7 +4339,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -4318,7 +4339,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6817,7 +6826,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -4338,7 +4359,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
+@@ -4338,7 +4359,7 @@
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -6826,7 +6835,7 @@
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4353,12 +4374,10 @@ esac
+@@ -4353,12 +4374,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -6841,7 +6850,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4366,21 +4385,17 @@ fi
+@@ -4366,21 +4385,17 @@
fi
fi
@@ -6867,7 +6876,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -4395,48 +4410,23 @@ main ()
+@@ -4395,48 +4410,23 @@
return 0;
}
_ACEOF
@@ -6921,7 +6930,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4446,18 +4436,14 @@ fi
+@@ -4446,18 +4436,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -6943,7 +6952,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4467,14 +4453,10 @@ fi
+@@ -4467,14 +4453,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -6960,7 +6969,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -4501,118 +4483,34 @@ main ()
+@@ -4501,118 +4483,34 @@
return 0;
}
_ACEOF
@@ -7092,7 +7101,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -4622,19 +4520,14 @@ fi
+@@ -4622,19 +4520,14 @@
done
@@ -7115,7 +7124,7 @@
/* end confdefs.h. */
#ifndef __APPLE_CC__
not a universal capable compiler
-@@ -4642,46 +4535,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -4642,46 +4535,34 @@
typedef int dummy;
_ACEOF
@@ -7184,7 +7193,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-@@ -4699,30 +4580,9 @@ main ()
+@@ -4699,30 +4580,9 @@
return 0;
}
_ACEOF
@@ -7217,7 +7226,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-@@ -4738,49 +4598,18 @@ main ()
+@@ -4738,49 +4598,18 @@
return 0;
}
_ACEOF
@@ -7270,7 +7279,7 @@
/* end confdefs.h. */
#include <limits.h>
-@@ -4795,30 +4624,9 @@ main ()
+@@ -4795,30 +4624,9 @@
return 0;
}
_ACEOF
@@ -7303,7 +7312,7 @@
/* end confdefs.h. */
#include <limits.h>
-@@ -4833,51 +4641,20 @@ main ()
+@@ -4833,51 +4641,20 @@
return 0;
}
_ACEOF
@@ -7359,7 +7368,7 @@
/* end confdefs.h. */
short int ascii_mm[] =
{ 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-@@ -4903,24 +4680,7 @@ return use_ascii (foo) == use_ebcdic (fo
+@@ -4903,24 +4680,7 @@
return 0;
}
_ACEOF
@@ -7385,7 +7394,7 @@
if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
ac_cv_c_bigendian=yes
fi
-@@ -4932,20 +4692,10 @@ $as_echo "$ac_try_echo") >&5
+@@ -4932,20 +4692,10 @@
ac_cv_c_bigendian=unknown
fi
fi
@@ -7407,7 +7416,7 @@
/* end confdefs.h. */
$ac_includes_default
int
-@@ -4965,79 +4715,41 @@ main ()
+@@ -4965,79 +4715,41 @@
return 0;
}
_ACEOF
@@ -7499,7 +7508,7 @@
/* end confdefs.h. */
int
-@@ -5097,41 +4809,18 @@ main ()
+@@ -5097,41 +4809,18 @@
return 0;
}
_ACEOF
@@ -7545,7 +7554,7 @@
fi
-@@ -5143,9 +4832,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -5143,9 +4832,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -7557,7 +7566,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5156,24 +4845,24 @@ for as_dir in $PATH
+@@ -5156,24 +4845,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7587,7 +7596,7 @@
$as_echo "no" >&6; }
fi
-@@ -5183,9 +4872,9 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -5183,9 +4872,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -7599,7 +7608,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -5196,24 +4885,24 @@ for as_dir in $PATH
+@@ -5196,24 +4885,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7629,7 +7638,7 @@
$as_echo "no" >&6; }
fi
-@@ -5222,7 +4911,7 @@ fi
+@@ -5222,7 +4911,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7638,7 +7647,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5236,9 +4925,9 @@ if test -z "$CC"; then
+@@ -5236,9 +4925,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -7650,7 +7659,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5249,24 +4938,24 @@ for as_dir in $PATH
+@@ -5249,24 +4938,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7680,7 +7689,7 @@
$as_echo "no" >&6; }
fi
-@@ -5276,9 +4965,9 @@ fi
+@@ -5276,9 +4965,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -7692,7 +7701,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5290,18 +4979,18 @@ for as_dir in $PATH
+@@ -5290,18 +4979,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7714,7 +7723,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -5320,10 +5009,10 @@ fi
+@@ -5320,10 +5009,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7727,7 +7736,7 @@
$as_echo "no" >&6; }
fi
-@@ -5335,9 +5024,9 @@ if test -z "$CC"; then
+@@ -5335,9 +5024,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -7739,7 +7748,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5348,24 +5037,24 @@ for as_dir in $PATH
+@@ -5348,24 +5037,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7769,7 +7778,7 @@
$as_echo "no" >&6; }
fi
-@@ -5379,9 +5068,9 @@ if test -z "$CC"; then
+@@ -5379,9 +5068,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -7781,7 +7790,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -5392,24 +5081,24 @@ for as_dir in $PATH
+@@ -5392,24 +5081,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7811,7 +7820,7 @@
$as_echo "no" >&6; }
fi
-@@ -5422,7 +5111,7 @@ done
+@@ -5422,7 +5111,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7820,7 +7829,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5433,62 +5122,42 @@ fi
+@@ -5433,62 +5122,42 @@
fi
@@ -7905,7 +7914,7 @@
/* end confdefs.h. */
int
-@@ -5502,37 +5171,16 @@ main ()
+@@ -5502,37 +5171,16 @@
return 0;
}
_ACEOF
@@ -7946,7 +7955,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -5541,20 +5189,16 @@ else
+@@ -5541,20 +5189,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -7970,7 +7979,7 @@
/* end confdefs.h. */
int
-@@ -5565,35 +5209,11 @@ main ()
+@@ -5565,35 +5209,11 @@
return 0;
}
_ACEOF
@@ -8009,7 +8018,7 @@
/* end confdefs.h. */
int
-@@ -5604,36 +5224,12 @@ main ()
+@@ -5604,36 +5224,12 @@
return 0;
}
_ACEOF
@@ -8050,7 +8059,7 @@
/* end confdefs.h. */
int
-@@ -5644,42 +5240,17 @@ main ()
+@@ -5644,42 +5240,17 @@
return 0;
}
_ACEOF
@@ -8095,7 +8104,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -5696,18 +5267,14 @@ else
+@@ -5696,18 +5267,14 @@
CFLAGS=
fi
fi
@@ -8117,7 +8126,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -5764,32 +5331,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
+@@ -5764,32 +5331,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -8151,7 +8160,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -5800,17 +5344,19 @@ fi
+@@ -5800,17 +5344,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -8174,7 +8183,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5820,9 +5366,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -5820,9 +5366,9 @@
depcc="$CC" am_compiler_list=
@@ -8186,7 +8195,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5930,7 +5476,7 @@ else
+@@ -5930,7 +5476,7 @@
fi
fi
@@ -8195,7 +8204,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -5950,14 +5496,14 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -5950,14 +5496,14 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -8212,7 +8221,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -5972,11 +5518,7 @@ do
+@@ -5972,11 +5518,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -8225,7 +8234,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5985,78 +5527,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5985,78 +5527,34 @@
#endif
Syntax error
_ACEOF
@@ -8309,7 +8318,7 @@
break
fi
-@@ -6068,7 +5566,7 @@ fi
+@@ -6068,7 +5566,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -8318,7 +8327,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -6079,11 +5577,7 @@ do
+@@ -6079,11 +5577,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -8331,7 +8340,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -6092,87 +5586,40 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6092,87 +5586,40 @@
#endif
Syntax error
_ACEOF
@@ -8428,7 +8437,7 @@
fi
ac_ext=c
-@@ -6181,115 +5628,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
+@@ -6181,115 +5628,23 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -8549,7 +8558,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -6307,17 +5662,17 @@ esac
+@@ -6307,17 +5662,17 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -8570,7 +8579,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -6349,35 +5704,27 @@ fi
+@@ -6349,35 +5704,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -8613,7 +8622,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -6393,28 +5740,24 @@ IFS=$ac_save_IFS
+@@ -6393,28 +5740,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -8647,7 +8656,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -6437,9 +5780,9 @@ case $host in
+@@ -6437,9 +5780,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
set dummy ${ac_tool_prefix}as; ac_word=$2
@@ -8659,7 +8668,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AS"; then
-@@ -6450,24 +5793,24 @@ for as_dir in $PATH
+@@ -6450,24 +5793,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8689,7 +8698,7 @@
$as_echo "no" >&6; }
fi
-@@ -6477,9 +5820,9 @@ if test -z "$ac_cv_prog_AS"; then
+@@ -6477,9 +5820,9 @@
ac_ct_AS=$AS
# Extract the first word of "as", so it can be a program name with args.
set dummy as; ac_word=$2
@@ -8701,7 +8710,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AS"; then
-@@ -6490,24 +5833,24 @@ for as_dir in $PATH
+@@ -6490,24 +5833,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8731,7 +8740,7 @@
$as_echo "no" >&6; }
fi
-@@ -6516,7 +5859,7 @@ fi
+@@ -6516,7 +5859,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8740,7 +8749,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6529,9 +5872,9 @@ fi
+@@ -6529,9 +5872,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
set dummy ${ac_tool_prefix}dlltool; ac_word=$2
@@ -8752,7 +8761,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DLLTOOL"; then
-@@ -6542,24 +5885,24 @@ for as_dir in $PATH
+@@ -6542,24 +5885,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8782,7 +8791,7 @@
$as_echo "no" >&6; }
fi
-@@ -6569,9 +5912,9 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
+@@ -6569,9 +5912,9 @@
ac_ct_DLLTOOL=$DLLTOOL
# Extract the first word of "dlltool", so it can be a program name with args.
set dummy dlltool; ac_word=$2
@@ -8794,7 +8803,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DLLTOOL"; then
-@@ -6582,24 +5925,24 @@ for as_dir in $PATH
+@@ -6582,24 +5925,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8824,7 +8833,7 @@
$as_echo "no" >&6; }
fi
-@@ -6608,7 +5951,7 @@ fi
+@@ -6608,7 +5951,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8833,7 +8842,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6621,9 +5964,9 @@ fi
+@@ -6621,9 +5964,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -8845,7 +8854,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -6634,24 +5977,24 @@ for as_dir in $PATH
+@@ -6634,24 +5977,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8875,7 +8884,7 @@
$as_echo "no" >&6; }
fi
-@@ -6661,9 +6004,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -6661,9 +6004,9 @@
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -8887,7 +8896,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -6674,24 +6017,24 @@ for as_dir in $PATH
+@@ -6674,24 +6017,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8917,7 +8926,7 @@
$as_echo "no" >&6; }
fi
-@@ -6700,7 +6043,7 @@ fi
+@@ -6700,7 +6043,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8926,7 +8935,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6735,14 +6078,14 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -6735,14 +6078,14 @@
case `pwd` in
*\ * | *\ *)
@@ -8944,7 +8953,7 @@
-@@ -6758,9 +6101,9 @@ macro_revision='1.3012'
+@@ -6758,9 +6101,9 @@
ltmain="$ac_aux_dir/ltmain.sh"
@@ -8956,7 +8965,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -6768,7 +6111,7 @@ else
+@@ -6768,7 +6111,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -8965,7 +8974,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -6777,7 +6120,7 @@ for as_dir in $PATH
+@@ -6777,7 +6120,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8974,7 +8983,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -6797,7 +6140,7 @@ case `"$ac_path_SED" --version 2>&1` in
+@@ -6797,7 +6140,7 @@
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -8983,7 +8992,7 @@
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
-@@ -6812,19 +6155,17 @@ esac
+@@ -6812,19 +6155,17 @@
$ac_path_SED_found && break 3
done
done
@@ -9006,7 +9015,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -6842,9 +6183,9 @@ Xsed="$SED -e 1s/^X//"
+@@ -6842,9 +6183,9 @@
@@ -9018,7 +9027,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -6858,7 +6199,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -6858,7 +6199,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9027,7 +9036,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -6878,7 +6219,7 @@ case `"$ac_path_FGREP" --version 2>&1` i
+@@ -6878,7 +6219,7 @@
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -9036,7 +9045,7 @@
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -6893,12 +6234,10 @@ esac
+@@ -6893,12 +6234,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -9051,7 +9060,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -6906,7 +6245,7 @@ fi
+@@ -6906,7 +6245,7 @@
fi
fi
@@ -9060,7 +9069,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -6932,7 +6271,7 @@ test -z "$GREP" && GREP=grep
+@@ -6932,7 +6271,7 @@
# Check whether --with-gnu-ld was given.
@@ -9069,7 +9078,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -6941,7 +6280,7 @@ fi
+@@ -6941,7 +6280,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -9078,7 +9087,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -6971,13 +6310,13 @@ $as_echo_n "checking for ld used by $CC.
+@@ -6971,13 +6310,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -9095,7 +9104,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -7008,18 +6347,16 @@ fi
+@@ -7008,18 +6347,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -9119,7 +9128,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -7032,7 +6369,7 @@ case `$LD -v 2>&1 </dev/null` in
+@@ -7032,7 +6369,7 @@
;;
esac
fi
@@ -9128,7 +9137,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -7044,9 +6381,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -7044,9 +6381,9 @@
@@ -9140,7 +9149,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -7093,7 +6430,7 @@ else
+@@ -7093,7 +6430,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -9149,7 +9158,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -7104,9 +6441,9 @@ else
+@@ -7104,9 +6441,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -9161,7 +9170,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -7117,24 +6454,24 @@ for as_dir in $PATH
+@@ -7117,24 +6454,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9191,7 +9200,7 @@
$as_echo "no" >&6; }
fi
-@@ -7148,9 +6485,9 @@ if test -z "$DUMPBIN"; then
+@@ -7148,9 +6485,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -9203,7 +9212,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -7161,24 +6498,24 @@ for as_dir in $PATH
+@@ -7161,24 +6498,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9233,7 +9242,7 @@
$as_echo "no" >&6; }
fi
-@@ -7191,7 +6528,7 @@ done
+@@ -7191,7 +6528,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9242,7 +9251,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7211,33 +6548,33 @@ test -z "$NM" && NM=nm
+@@ -7211,33 +6548,33 @@
@@ -9284,7 +9293,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -7355,10 +6692,10 @@ else
+@@ -7355,10 +6692,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -9297,7 +9306,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -7372,7 +6709,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
+@@ -7372,7 +6709,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -9306,7 +9315,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -7382,17 +6719,17 @@ xsi_shell=no
+@@ -7382,17 +6719,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -9327,7 +9336,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -7427,14 +6764,14 @@ esac
+@@ -7427,14 +6764,14 @@
@@ -9345,7 +9354,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -7463,9 +6800,9 @@ esac
+@@ -7463,9 +6800,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -9357,7 +9366,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -7476,24 +6813,24 @@ for as_dir in $PATH
+@@ -7476,24 +6813,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9387,7 +9396,7 @@
$as_echo "no" >&6; }
fi
-@@ -7503,9 +6840,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -7503,9 +6840,9 @@
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -9399,7 +9408,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -7516,24 +6853,24 @@ for as_dir in $PATH
+@@ -7516,24 +6853,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9429,7 +9438,7 @@
$as_echo "no" >&6; }
fi
-@@ -7542,7 +6879,7 @@ fi
+@@ -7542,7 +6879,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9438,7 +9447,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7559,9 +6896,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -7559,9 +6896,9 @@
@@ -9450,7 +9459,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -7676,11 +7013,11 @@ irix5* | irix6* | nonstopux*)
+@@ -7676,11 +7013,11 @@
;;
# This must be Linux ELF.
@@ -9464,7 +9473,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
-@@ -7755,7 +7092,7 @@ tpf*)
+@@ -7755,7 +7092,7 @@
esac
fi
@@ -9473,7 +9482,7 @@
$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -7775,9 +7112,9 @@ test -z "$deplibs_check_method" && depli
+@@ -7775,9 +7112,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -9485,7 +9494,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -7788,24 +7125,24 @@ for as_dir in $PATH
+@@ -7788,24 +7125,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9515,7 +9524,7 @@
$as_echo "no" >&6; }
fi
-@@ -7815,9 +7152,9 @@ if test -z "$ac_cv_prog_AR"; then
+@@ -7815,9 +7152,9 @@
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -9527,7 +9536,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -7828,24 +7165,24 @@ for as_dir in $PATH
+@@ -7828,24 +7165,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9557,7 +9566,7 @@
$as_echo "no" >&6; }
fi
-@@ -7854,7 +7191,7 @@ fi
+@@ -7854,7 +7191,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9566,7 +9575,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7880,9 +7217,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+@@ -7880,9 +7217,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -9578,7 +9587,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -7893,24 +7230,24 @@ for as_dir in $PATH
+@@ -7893,24 +7230,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9608,7 +9617,7 @@
$as_echo "no" >&6; }
fi
-@@ -7920,9 +7257,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -7920,9 +7257,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -9620,7 +9629,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -7933,24 +7270,24 @@ for as_dir in $PATH
+@@ -7933,24 +7270,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9650,7 +9659,7 @@
$as_echo "no" >&6; }
fi
-@@ -7959,7 +7296,7 @@ fi
+@@ -7959,7 +7296,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9659,7 +9668,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7979,9 +7316,9 @@ test -z "$STRIP" && STRIP=:
+@@ -7979,9 +7316,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -9671,7 +9680,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -7992,24 +7329,24 @@ for as_dir in $PATH
+@@ -7992,24 +7329,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9701,7 +9710,7 @@
$as_echo "no" >&6; }
fi
-@@ -8019,9 +7356,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
+@@ -8019,9 +7356,9 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -9713,7 +9722,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -8032,24 +7369,24 @@ for as_dir in $PATH
+@@ -8032,24 +7369,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9743,7 +9752,7 @@
$as_echo "no" >&6; }
fi
-@@ -8058,7 +7395,7 @@ fi
+@@ -8058,7 +7395,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9752,7 +9761,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8136,9 +7473,9 @@ compiler=$CC
+@@ -8136,9 +7473,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -9764,7 +9773,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -8254,18 +7591,18 @@ void nm_test_func(void){}
+@@ -8254,18 +7591,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -9789,7 +9798,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -8318,11 +7655,11 @@ _LT_EOF
+@@ -8318,11 +7655,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -9804,7 +9813,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -8356,10 +7693,10 @@ if test -z "$lt_cv_sys_global_symbol_pip
+@@ -8356,10 +7693,10 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -9817,7 +9826,7 @@
$as_echo "ok" >&6; }
fi
-@@ -8385,7 +7722,7 @@ fi
+@@ -8385,7 +7722,7 @@
# Check whether --enable-libtool-lock was given.
@@ -9826,7 +9835,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -8397,11 +7734,11 @@ case $host in
+@@ -8397,11 +7734,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9841,7 +9850,7 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -8415,12 +7752,12 @@ ia64-*-hpux*)
+@@ -8415,12 +7752,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -9858,7 +9867,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -8454,11 +7791,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
+@@ -8454,11 +7791,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9873,7 +9882,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -8507,9 +7844,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -8507,9 +7844,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -9885,7 +9894,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -8518,11 +7855,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
+@@ -8518,11 +7855,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -9898,7 +9907,7 @@
/* end confdefs.h. */
int
-@@ -8533,38 +7866,13 @@ main ()
+@@ -8533,38 +7866,13 @@
return 0;
}
_ACEOF
@@ -9941,7 +9950,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -8572,7 +7880,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -8572,7 +7880,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -9950,7 +9959,7 @@
$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -8582,11 +7890,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+@@ -8582,11 +7890,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9965,7 +9974,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -8612,9 +7920,9 @@ need_locks="$enable_libtool_lock"
+@@ -8612,9 +7920,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -9977,7 +9986,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -8625,24 +7933,24 @@ for as_dir in $PATH
+@@ -8625,24 +7933,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10007,7 +10016,7 @@
$as_echo "no" >&6; }
fi
-@@ -8652,9 +7960,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+@@ -8652,9 +7960,9 @@
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
@@ -10019,7 +10028,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -8665,24 +7973,24 @@ for as_dir in $PATH
+@@ -8665,24 +7973,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10049,7 +10058,7 @@
$as_echo "no" >&6; }
fi
-@@ -8691,7 +7999,7 @@ fi
+@@ -8691,7 +7999,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10058,7 +10067,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8704,9 +8012,9 @@ fi
+@@ -8704,9 +8012,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -10070,7 +10079,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -8717,24 +8025,24 @@ for as_dir in $PATH
+@@ -8717,24 +8025,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10100,7 +10109,7 @@
$as_echo "no" >&6; }
fi
-@@ -8744,9 +8052,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+@@ -8744,9 +8052,9 @@
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
@@ -10112,7 +10121,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -8757,24 +8065,24 @@ for as_dir in $PATH
+@@ -8757,24 +8065,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10142,7 +10151,7 @@
$as_echo "no" >&6; }
fi
-@@ -8783,7 +8091,7 @@ fi
+@@ -8783,7 +8091,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10151,7 +10160,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8796,9 +8104,9 @@ fi
+@@ -8796,9 +8104,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -10163,7 +10172,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -8809,24 +8117,24 @@ for as_dir in $PATH
+@@ -8809,24 +8117,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10193,7 +10202,7 @@
$as_echo "no" >&6; }
fi
-@@ -8836,9 +8144,9 @@ if test -z "$ac_cv_prog_LIPO"; then
+@@ -8836,9 +8144,9 @@
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
@@ -10205,7 +10214,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -8849,24 +8157,24 @@ for as_dir in $PATH
+@@ -8849,24 +8157,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10235,7 +10244,7 @@
$as_echo "no" >&6; }
fi
-@@ -8875,7 +8183,7 @@ fi
+@@ -8875,7 +8183,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10244,7 +10253,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8888,9 +8196,9 @@ fi
+@@ -8888,9 +8196,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -10256,7 +10265,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -8901,24 +8209,24 @@ for as_dir in $PATH
+@@ -8901,24 +8209,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10286,7 +10295,7 @@
$as_echo "no" >&6; }
fi
-@@ -8928,9 +8236,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
+@@ -8928,9 +8236,9 @@
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
@@ -10298,7 +10307,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -8941,24 +8249,24 @@ for as_dir in $PATH
+@@ -8941,24 +8249,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10328,7 +10337,7 @@
$as_echo "no" >&6; }
fi
-@@ -8967,7 +8275,7 @@ fi
+@@ -8967,7 +8275,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10337,7 +10346,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8980,9 +8288,9 @@ fi
+@@ -8980,9 +8288,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -10349,7 +10358,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -8993,24 +8301,24 @@ for as_dir in $PATH
+@@ -8993,24 +8301,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10379,7 +10388,7 @@
$as_echo "no" >&6; }
fi
-@@ -9020,9 +8328,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
+@@ -9020,9 +8328,9 @@
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
@@ -10391,7 +10400,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -9033,24 +8341,24 @@ for as_dir in $PATH
+@@ -9033,24 +8341,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10421,7 +10430,7 @@
$as_echo "no" >&6; }
fi
-@@ -9059,7 +8367,7 @@ fi
+@@ -9059,7 +8367,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10430,7 +10439,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9095,9 +8403,9 @@ fi
+@@ -9095,9 +8403,9 @@
@@ -10442,7 +10451,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -9122,22 +8430,18 @@ else
+@@ -9122,22 +8430,18 @@
rm -f conftest.*
fi
fi
@@ -10469,7 +10478,7 @@
/* end confdefs.h. */
int
-@@ -9148,42 +8452,17 @@ main ()
+@@ -9148,42 +8452,17 @@
return 0;
}
_ACEOF
@@ -10517,7 +10526,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -9220,62 +8499,13 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
+@@ -9220,62 +8499,13 @@
;;
esac
@@ -10585,7 +10594,7 @@
_ACEOF
fi
-@@ -9293,7 +8523,7 @@ done
+@@ -9293,7 +8523,7 @@
# Check whether --enable-shared was given.
@@ -10594,7 +10603,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -9326,7 +8556,7 @@ fi
+@@ -9326,7 +8556,7 @@
# Check whether --with-pic was given.
@@ -10603,7 +10612,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -9342,7 +8572,7 @@ test -z "$pic_mode" && pic_mode=default
+@@ -9342,7 +8572,7 @@
# Check whether --enable-fast-install was given.
@@ -10612,7 +10621,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -9423,9 +8653,9 @@ if test -n "${ZSH_VERSION+set}" ; then
+@@ -9423,9 +8653,9 @@
setopt NO_GLOB_SUBST
fi
@@ -10624,7 +10633,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -9438,7 +8668,7 @@ else
+@@ -9438,7 +8668,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -10633,7 +10642,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -9531,9 +8761,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
+@@ -9531,9 +8761,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -10645,7 +10654,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9584,10 +8814,10 @@ fi
+@@ -9584,10 +8814,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -10658,7 +10667,7 @@
$as_echo "no" >&6; }
fi
-@@ -9597,9 +8827,9 @@ fi
+@@ -9597,9 +8827,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -10670,7 +10679,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9650,10 +8880,10 @@ fi
+@@ -9650,10 +8880,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -10683,7 +10692,7 @@
$as_echo "no" >&6; }
fi
-@@ -9734,9 +8964,9 @@ lt_prog_compiler_no_builtin_flag=
+@@ -9734,9 +8964,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -10695,7 +10704,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9752,11 +8982,11 @@ else
+@@ -9752,11 +8982,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -10709,7 +10718,7 @@
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.
-@@ -9769,7 +8999,7 @@ else
+@@ -9769,7 +8999,7 @@
$RM conftest*
fi
@@ -10718,7 +10727,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -9789,7 +9019,7 @@ fi
+@@ -9789,7 +9019,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -10727,7 +10736,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -9921,7 +9151,7 @@ $as_echo_n "checking for $compiler optio
+@@ -9921,7 +9151,7 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -10736,7 +10745,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -10061,7 +9291,7 @@ case $host_os in
+@@ -10061,7 +9291,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -10745,7 +10754,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -10073,9 +9303,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
+@@ -10073,9 +9303,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -10757,7 +10766,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -10091,11 +9321,11 @@ else
+@@ -10091,11 +9321,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -10771,7 +10780,7 @@
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.
-@@ -10108,7 +9338,7 @@ else
+@@ -10108,7 +9338,7 @@
$RM conftest*
fi
@@ -10780,7 +10789,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -10132,9 +9362,9 @@ fi
+@@ -10132,9 +9362,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -10792,7 +10801,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -10160,7 +9390,7 @@ else
+@@ -10160,7 +9390,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -10801,7 +10810,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -10175,9 +9405,9 @@ fi
+@@ -10175,9 +9405,9 @@
@@ -10813,7 +10822,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10196,11 +9426,11 @@ else
+@@ -10196,11 +9426,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -10827,7 +10836,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -10222,7 +9452,7 @@ else
+@@ -10222,7 +9452,7 @@
$RM conftest*
fi
@@ -10836,7 +10845,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10230,9 +9460,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -10230,9 +9460,9 @@
@@ -10848,7 +10857,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10251,11 +9481,11 @@ else
+@@ -10251,11 +9481,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -10862,7 +10871,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -10277,7 +9507,7 @@ else
+@@ -10277,7 +9507,7 @@
$RM conftest*
fi
@@ -10871,7 +10880,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10286,7 +9516,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -10286,7 +9516,7 @@
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -10880,7 +10889,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -10294,10 +9524,10 @@ $as_echo_n "checking if we can lock with
+@@ -10294,10 +9524,10 @@
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -10893,7 +10902,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -10310,7 +9540,7 @@ fi
+@@ -10310,7 +9540,7 @@
@@ -10902,7 +10911,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -10370,6 +9600,9 @@ $as_echo_n "checking whether the $compil
+@@ -10370,6 +9600,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -10912,7 +10921,7 @@
esac
ld_shlibs=yes
-@@ -10391,6 +9624,7 @@ $as_echo_n "checking whether the $compil
+@@ -10391,6 +9624,7 @@
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -10920,7 +10929,7 @@
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -10482,7 +9716,7 @@ _LT_EOF
+@@ -10482,7 +9716,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'
;;
@@ -10929,7 +10938,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -10552,7 +9786,7 @@ _LT_EOF
+@@ -10552,7 +9786,7 @@
fi
;;
@@ -10938,7 +10947,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10727,6 +9961,7 @@ _LT_EOF
+@@ -10727,6 +9961,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -10946,7 +10955,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10752,11 +9987,7 @@ _LT_EOF
+@@ -10752,11 +9987,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -10959,7 +10968,7 @@
/* end confdefs.h. */
int
-@@ -10767,27 +9998,7 @@ main ()
+@@ -10767,27 +9998,7 @@
return 0;
}
_ACEOF
@@ -10988,7 +10997,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10801,16 +10012,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -10801,16 +10012,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -11007,7 +11016,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10823,11 +10027,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10823,11 +10027,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -11020,7 +11029,7 @@
/* end confdefs.h. */
int
-@@ -10838,27 +10038,7 @@ main ()
+@@ -10838,27 +10038,7 @@
return 0;
}
_ACEOF
@@ -11049,7 +11058,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10872,16 +10052,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -10872,16 +10052,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -11068,7 +11077,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -11093,42 +10266,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -11093,42 +10266,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -11116,7 +11125,7 @@
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11141,7 +10288,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11141,7 +10288,7 @@
link_all_deplibs=yes
;;
@@ -11125,7 +11134,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11384,7 +10531,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11384,7 +10531,7 @@
fi
fi
@@ -11134,7 +11143,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -11421,16 +10568,16 @@ x|xyes)
+@@ -11421,16 +10568,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -11155,7 +11164,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -11444,11 +10591,11 @@ $as_echo_n "checking whether -lc should
+@@ -11444,11 +10591,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -11170,7 +11179,7 @@
then
archive_cmds_need_lc=no
else
-@@ -11459,7 +10606,7 @@ $as_echo_n "checking whether -lc should
+@@ -11459,7 +10606,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -11179,7 +11188,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -11623,7 +10770,7 @@ esac
+@@ -11623,7 +10770,7 @@
@@ -11188,7 +11197,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -12031,7 +11178,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -12031,7 +11178,7 @@
;;
# This must be Linux ELF.
@@ -11197,7 +11206,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -12045,11 +11192,7 @@ linux* | k*bsd*-gnu)
+@@ -12045,11 +11192,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -11210,7 +11219,7 @@
/* end confdefs.h. */
int
-@@ -12060,41 +11203,13 @@ main ()
+@@ -12060,41 +11203,13 @@
return 0;
}
_ACEOF
@@ -11256,7 +11265,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -12103,13 +11218,10 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -12103,13 +11218,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -11271,7 +11280,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -12121,6 +11233,18 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -12121,6 +11233,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11290,7 +11299,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -12309,7 +11433,7 @@ uts4*)
+@@ -12309,7 +11433,7 @@
dynamic_linker=no
;;
esac
@@ -11299,7 +11308,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -12411,7 +11535,7 @@ fi
+@@ -12411,7 +11535,7 @@
@@ -11308,7 +11317,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -12436,7 +11560,7 @@ else
+@@ -12436,7 +11560,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -11317,7 +11326,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -12481,18 +11605,14 @@ else
+@@ -12481,18 +11605,14 @@
darwin*)
# if libdl is installed we need to link against it
@@ -11339,7 +11348,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12510,43 +11630,18 @@ return dlopen ();
+@@ -12510,43 +11630,18 @@
return 0;
}
_ACEOF
@@ -11389,7 +11398,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -12559,33 +11654,19 @@ fi
+@@ -12559,33 +11654,19 @@
;;
*)
@@ -11433,7 +11442,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -12594,13 +11675,6 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -12594,13 +11675,6 @@
extern "C"
#endif
char shl_load ();
@@ -11447,7 +11456,7 @@
int
main ()
{
-@@ -12609,56 +11683,32 @@ return shl_load ();
+@@ -12609,56 +11683,32 @@
return 0;
}
_ACEOF
@@ -11523,7 +11532,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12667,81 +11717,38 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -12667,81 +11717,38 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -11622,7 +11631,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -12750,13 +11757,6 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -12750,13 +11757,6 @@
extern "C"
#endif
char dlopen ();
@@ -11636,7 +11645,7 @@
int
main ()
{
-@@ -12765,192 +11765,28 @@ return dlopen ();
+@@ -12765,192 +11765,28 @@
return 0;
}
_ACEOF
@@ -11838,7 +11847,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12968,43 +11804,18 @@ return dld_link ();
+@@ -12968,43 +11804,18 @@
return 0;
}
_ACEOF
@@ -11888,7 +11897,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -13043,9 +11854,9 @@ fi
+@@ -13043,9 +11854,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -11900,7 +11909,7 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -13054,7 +11865,7 @@ else
+@@ -13054,7 +11865,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -11909,7 +11918,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13113,11 +11924,11 @@ int main ()
+@@ -13113,11 +11924,11 @@
return status;
}
_LT_EOF
@@ -11924,7 +11933,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13134,14 +11945,14 @@ rm -fr conftest*
+@@ -13134,14 +11945,14 @@
fi
@@ -11942,7 +11951,7 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -13150,7 +11961,7 @@ else
+@@ -13150,7 +11961,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -11951,7 +11960,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13209,11 +12020,11 @@ int main ()
+@@ -13209,11 +12020,11 @@
return status;
}
_LT_EOF
@@ -11966,7 +11975,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13230,7 +12041,7 @@ rm -fr conftest*
+@@ -13230,7 +12041,7 @@
fi
@@ -11975,7 +11984,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -13269,12 +12080,12 @@ fi
+@@ -13269,12 +12080,12 @@
striplib=
old_striplib=
@@ -11990,7 +11999,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -13283,15 +12094,15 @@ else
+@@ -13283,15 +12094,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -12009,7 +12018,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -13309,12 +12120,12 @@ fi
+@@ -13309,12 +12120,12 @@
# Report which library types will actually be built
@@ -12025,7 +12034,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -13335,14 +12146,14 @@ $as_echo_n "checking whether to build sh
+@@ -13335,14 +12146,14 @@
fi
;;
esac
@@ -12043,7 +12052,7 @@
$as_echo "$enable_static" >&6; }
-@@ -13379,9 +12190,9 @@ CC="$lt_save_CC"
+@@ -13379,9 +12190,9 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -12055,7 +12064,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -13394,14 +12205,14 @@ for as_dir in $PATH
+@@ -13394,14 +12205,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12073,7 +12082,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -13410,10 +12221,10 @@ esac
+@@ -13410,10 +12221,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -12086,7 +12095,7 @@
$as_echo "no" >&6; }
fi
-@@ -13425,9 +12236,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
+@@ -13425,9 +12236,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -12098,7 +12107,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -13440,14 +12251,14 @@ for as_dir in $PATH
+@@ -13440,14 +12251,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12116,7 +12125,7 @@
IFS=$as_save_IFS
;;
-@@ -13455,10 +12266,10 @@ esac
+@@ -13455,10 +12266,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -12129,7 +12138,7 @@
$as_echo "no" >&6; }
fi
-@@ -13468,9 +12279,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
+@@ -13468,9 +12279,9 @@
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -12141,7 +12150,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -13483,14 +12294,14 @@ for as_dir in $PATH
+@@ -13483,14 +12294,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12159,7 +12168,7 @@
IFS=$as_save_IFS
;;
-@@ -13498,10 +12309,10 @@ esac
+@@ -13498,10 +12309,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -12172,7 +12181,7 @@
$as_echo "no" >&6; }
fi
-@@ -13510,7 +12321,7 @@ fi
+@@ -13510,7 +12321,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -12181,7 +12190,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -13523,13 +12334,13 @@ fi
+@@ -13523,13 +12334,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -12198,7 +12207,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -13537,14 +12348,15 @@ $as_echo "no" >&6; }
+@@ -13537,14 +12348,15 @@
fi
pkg_failed=no
@@ -12220,7 +12229,7 @@
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
gthread-2.0
-@@ -13556,7 +12368,7 @@ if test -n "$ALL_CFLAGS"; then
+@@ -13556,7 +12368,7 @@
gail >= 0.16
unique-1.0
dbus-glib-1
@@ -12229,7 +12238,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
-@@ -13571,8 +12383,8 @@ if test -n "$ALL_CFLAGS"; then
+@@ -13571,8 +12383,8 @@
dbus-glib-1
") 2>&5
ac_status=$?
@@ -12240,7 +12249,7 @@
pkg_cv_ALL_CFLAGS=`$PKG_CONFIG --cflags "
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
-@@ -13589,14 +12401,16 @@ if test -n "$ALL_CFLAGS"; then
+@@ -13589,14 +12401,16 @@
else
pkg_failed=yes
fi
@@ -12264,7 +12273,7 @@
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
gthread-2.0
-@@ -13608,7 +12422,7 @@ if test -n "$ALL_LIBS"; then
+@@ -13608,7 +12422,7 @@
gail >= 0.16
unique-1.0
dbus-glib-1
@@ -12273,7 +12282,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
-@@ -13623,8 +12437,8 @@ if test -n "$ALL_LIBS"; then
+@@ -13623,8 +12437,8 @@
dbus-glib-1
") 2>&5
ac_status=$?
@@ -12284,7 +12293,7 @@
pkg_cv_ALL_LIBS=`$PKG_CONFIG --libs "
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
-@@ -13641,8 +12455,9 @@ if test -n "$ALL_LIBS"; then
+@@ -13641,8 +12455,9 @@
else
pkg_failed=yes
fi
@@ -12296,7 +12305,7 @@
fi
-@@ -13655,7 +12470,7 @@ else
+@@ -13655,7 +12470,7 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12305,7 +12314,7 @@
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
gthread-2.0
-@@ -13667,9 +12482,9 @@ fi
+@@ -13667,9 +12482,9 @@
gail >= 0.16
unique-1.0
dbus-glib-1
@@ -12317,7 +12326,7 @@
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
gthread-2.0
-@@ -13681,35 +12496,12 @@ fi
+@@ -13681,35 +12496,12 @@
gail >= 0.16
unique-1.0
dbus-glib-1
@@ -12355,7 +12364,7 @@
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
gthread-2.0
-@@ -13731,22 +12523,11 @@ installed software in a non-standard pre
+@@ -13731,22 +12523,11 @@
Alternatively, you may set the environment variables ALL_CFLAGS
and ALL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -12381,7 +12390,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -13755,12 +12536,11 @@ and ALL_LIBS to avoid the need to call p
+@@ -13755,12 +12536,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12396,7 +12405,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -13774,151 +12554,12 @@ _ACEOF
+@@ -13774,151 +12554,12 @@
@@ -12553,7 +12562,7 @@
_ACEOF
fi
-@@ -13926,16 +12567,12 @@ fi
+@@ -13926,16 +12567,12 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -12573,7 +12582,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -13946,46 +12583,19 @@ return LC_MESSAGES
+@@ -13946,46 +12583,19 @@
return 0;
}
_ACEOF
@@ -12626,7 +12635,7 @@
fi
fi
-@@ -13998,155 +12608,20 @@ _ACEOF
+@@ -13998,155 +12608,20 @@
XGETTEXT=:
INTLLIBS=
@@ -12787,7 +12796,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -14159,54 +12634,25 @@ return !ngettext ("","", 1)
+@@ -14159,54 +12634,25 @@
return 0;
}
_ACEOF
@@ -12850,7 +12859,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -14219,141 +12665,26 @@ return !dgettext ("","")
+@@ -14219,141 +12665,26 @@
return 0;
}
_ACEOF
@@ -13002,7 +13011,7 @@
_ACEOF
fi
-@@ -14368,18 +12699,14 @@ done
+@@ -14368,18 +12699,14 @@
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -13024,7 +13033,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14397,55 +12724,26 @@ return bindtextdomain ();
+@@ -14397,55 +12724,26 @@
return 0;
}
_ACEOF
@@ -13089,7 +13098,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14463,55 +12761,26 @@ return ngettext ();
+@@ -14463,55 +12761,26 @@
return 0;
}
_ACEOF
@@ -13154,7 +13163,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14529,43 +12798,18 @@ return dgettext ();
+@@ -14529,43 +12798,18 @@
return 0;
}
_ACEOF
@@ -13204,7 +13213,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -14575,22 +12819,18 @@ fi
+@@ -14575,22 +12819,18 @@
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -13232,7 +13241,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14608,55 +12848,26 @@ return ngettext ();
+@@ -14608,55 +12848,26 @@
return 0;
}
_ACEOF
@@ -13297,7 +13306,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14674,43 +12885,18 @@ return dcgettext ();
+@@ -14674,43 +12885,18 @@
return 0;
}
_ACEOF
@@ -13347,7 +13356,7 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -14732,108 +12918,18 @@ fi
+@@ -14732,108 +12918,18 @@
glib_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
@@ -13465,7 +13474,7 @@
if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
gt_cv_func_dgettext_libc=no
-@@ -14857,15 +12953,13 @@ done
+@@ -14857,15 +12953,13 @@
if test "$gt_cv_have_gettext" = "yes"; then
@@ -13484,7 +13493,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -14890,118 +12984,28 @@ esac
+@@ -14890,118 +12984,28 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -13611,7 +13620,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -15016,14 +13020,14 @@ msgstr ""
+@@ -15016,14 +13020,14 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -13631,7 +13640,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -15031,9 +13035,9 @@ fi
+@@ -15031,9 +13035,9 @@
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -13643,7 +13652,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -15046,14 +13050,14 @@ for as_dir in $PATH
+@@ -15046,14 +13050,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13661,7 +13670,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -15062,19 +13066,19 @@ esac
+@@ -15062,19 +13066,19 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -13685,7 +13694,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -15099,18 +13103,14 @@ esac
+@@ -15099,18 +13103,14 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -13707,7 +13716,7 @@
/* end confdefs.h. */
int
-@@ -15122,121 +13122,14 @@ extern int _nl_msg_cat_cntr;
+@@ -15122,121 +13122,14 @@
return 0;
}
_ACEOF
@@ -13833,7 +13842,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -15251,10 +13144,8 @@ fi
+@@ -15251,10 +13144,8 @@
;;
esac
fi
@@ -13846,7 +13855,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -15268,9 +13159,7 @@ fi
+@@ -15268,9 +13159,7 @@
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -13857,7 +13866,7 @@
fi
-@@ -15278,7 +13167,7 @@ _ACEOF
+@@ -15278,7 +13167,7 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -13866,7 +13875,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -15311,7 +13200,7 @@ $as_echo "found xgettext program is not
+@@ -15311,7 +13200,7 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -13875,7 +13884,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -15336,7 +13225,7 @@ $as_echo_n "checking for catalogs to be
+@@ -15336,7 +13225,7 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -13884,7 +13893,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -15390,16 +13279,16 @@ _ACEOF
+@@ -15390,16 +13279,16 @@
@@ -13904,7 +13913,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -15407,35 +13296,31 @@ $as_echo "$USE_NLS" >&6; }
+@@ -15407,35 +13296,31 @@
case "$am__api_version" in
1.01234)
@@ -13946,7 +13955,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -15448,14 +13333,14 @@ for as_dir in $PATH
+@@ -15448,14 +13333,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13964,7 +13973,7 @@
IFS=$as_save_IFS
;;
-@@ -15463,19 +13348,19 @@ esac
+@@ -15463,19 +13348,19 @@
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -13988,7 +13997,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -15488,14 +13373,14 @@ for as_dir in $PATH
+@@ -15488,14 +13373,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14006,7 +14015,7 @@
IFS=$as_save_IFS
;;
-@@ -15503,19 +13388,19 @@ esac
+@@ -15503,19 +13388,19 @@
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -14030,7 +14039,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -15528,14 +13413,14 @@ for as_dir in $PATH
+@@ -15528,14 +13413,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14048,7 +14057,7 @@
IFS=$as_save_IFS
;;
-@@ -15543,18 +13428,16 @@ esac
+@@ -15543,18 +13428,16 @@
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -14070,7 +14079,7 @@
fi
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -15676,9 +13559,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+@@ -15676,9 +13559,9 @@
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -14082,7 +14091,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -15691,14 +13574,14 @@ for as_dir in $PATH
+@@ -15691,14 +13574,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14100,7 +14109,7 @@
IFS=$as_save_IFS
;;
-@@ -15706,19 +13589,19 @@ esac
+@@ -15706,19 +13589,19 @@
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -14124,7 +14133,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -15731,14 +13614,14 @@ for as_dir in $PATH
+@@ -15731,14 +13614,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14142,7 +14151,7 @@
IFS=$as_save_IFS
;;
-@@ -15746,19 +13629,19 @@ esac
+@@ -15746,19 +13629,19 @@
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -14166,7 +14175,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -15771,14 +13654,14 @@ for as_dir in $PATH
+@@ -15771,14 +13654,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14184,7 +14193,7 @@
IFS=$as_save_IFS
;;
-@@ -15786,19 +13669,19 @@ esac
+@@ -15786,19 +13669,19 @@
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -14208,7 +14217,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -15811,14 +13694,14 @@ for as_dir in $PATH
+@@ -15811,14 +13694,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14226,7 +14235,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -15827,33 +13710,29 @@ esac
+@@ -15827,33 +13710,29 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -14266,7 +14275,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -15866,14 +13745,14 @@ for as_dir in $PATH
+@@ -15866,14 +13745,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14284,7 +14293,7 @@
IFS=$as_save_IFS
;;
-@@ -15881,41 +13760,35 @@ esac
+@@ -15881,41 +13760,35 @@
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -14335,7 +14344,7 @@
fi
fi
-@@ -15925,11 +13798,7 @@ fi
+@@ -15925,11 +13798,7 @@
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -14348,7 +14357,7 @@
/* end confdefs.h. */
int
-@@ -15941,136 +13810,27 @@ extern int _nl_msg_cat_cntr;
+@@ -15941,136 +13810,27 @@
return 0;
}
_ACEOF
@@ -14501,7 +14510,7 @@
-@@ -16082,9 +13842,9 @@ fi
+@@ -16082,9 +13842,9 @@
# Extract the first word of "gtkdoc-check", so it can be a program name with args.
set dummy gtkdoc-check; ac_word=$2
@@ -14513,7 +14522,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_CHECK in
-@@ -16097,14 +13857,14 @@ for as_dir in $PATH
+@@ -16097,14 +13857,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14531,7 +14540,7 @@
IFS=$as_save_IFS
;;
-@@ -16112,10 +13872,10 @@ esac
+@@ -16112,10 +13872,10 @@
fi
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
if test -n "$GTKDOC_CHECK"; then
@@ -14544,7 +14553,7 @@
$as_echo "no" >&6; }
fi
-@@ -16124,9 +13884,9 @@ fi
+@@ -16124,9 +13884,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -14556,7 +14565,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_REBASE in
-@@ -16139,14 +13899,14 @@ for as_dir in $PATH
+@@ -16139,14 +13899,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14574,7 +14583,7 @@
IFS=$as_save_IFS
;;
-@@ -16154,10 +13914,10 @@ esac
+@@ -16154,10 +13914,10 @@
fi
GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
if test -n "$GTKDOC_REBASE"; then
@@ -14587,7 +14596,7 @@
$as_echo "no" >&6; }
fi
-@@ -16168,9 +13928,9 @@ test -n "$GTKDOC_REBASE" || GTKDOC_REBAS
+@@ -16168,9 +13928,9 @@
# Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
set dummy gtkdoc-mkpdf; ac_word=$2
@@ -14599,7 +14608,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_MKPDF in
-@@ -16183,14 +13943,14 @@ for as_dir in $PATH
+@@ -16183,14 +13943,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14617,7 +14626,7 @@
IFS=$as_save_IFS
;;
-@@ -16198,10 +13958,10 @@ esac
+@@ -16198,10 +13958,10 @@
fi
GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
if test -n "$GTKDOC_MKPDF"; then
@@ -14630,7 +14639,7 @@
$as_echo "no" >&6; }
fi
-@@ -16209,7 +13969,7 @@ fi
+@@ -16209,7 +13969,7 @@
# Check whether --with-html-dir was given.
@@ -14639,7 +14648,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -16219,7 +13979,7 @@ fi
+@@ -16219,7 +13979,7 @@
# Check whether --enable-gtk-doc was given.
@@ -14648,7 +14657,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -16228,33 +13988,31 @@ fi
+@@ -16228,33 +13988,31 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -14690,7 +14699,7 @@
enableval=$enable_gtk_doc_pdf;
else
enable_gtk_doc_pdf=no
-@@ -16311,12 +14069,10 @@ fi
+@@ -16311,12 +14069,10 @@
ENABLE_PROFILER=
# Check whether --enable-profiler was given.
@@ -14705,7 +14714,7 @@
fi
-@@ -16344,9 +14100,9 @@ for ac_prog in perl5 perl
+@@ -16344,9 +14100,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -14717,7 +14726,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$PERL"; then
-@@ -16357,24 +14113,24 @@ for as_dir in $PATH
+@@ -16357,24 +14113,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14747,7 +14756,7 @@
$as_echo "no" >&6; }
fi
-@@ -16384,9 +14140,9 @@ done
+@@ -16384,9 +14140,9 @@
# Extract the first word of "glib-genmarshal", so it can be a program name with args.
set dummy glib-genmarshal; ac_word=$2
@@ -14759,7 +14768,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -16399,14 +14155,14 @@ for as_dir in $PATH
+@@ -16399,14 +14155,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14777,7 +14786,7 @@
IFS=$as_save_IFS
;;
-@@ -16414,162 +14170,22 @@ esac
+@@ -16414,162 +14170,22 @@
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -14947,7 +14956,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -16578,102 +14194,12 @@ fi
+@@ -16578,102 +14194,12 @@
done
@@ -15054,7 +15063,7 @@
_ACEOF
fi
-@@ -16691,12 +14217,12 @@ x_cflags="`$PKG_CONFIG --cflags pangox`"
+@@ -16691,12 +14217,12 @@
x_extra_libs=
if test $pango_omitted_x_deps = yes ; then
@@ -15069,7 +15078,7 @@
withval=$with_x;
fi
-@@ -16706,10 +14232,8 @@ if test "x$with_x" = xno; then
+@@ -16706,10 +14232,8 @@
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -15082,7 +15091,7 @@
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
-@@ -16757,21 +14281,25 @@ fi
+@@ -16757,21 +14281,25 @@
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
@@ -15108,7 +15117,7 @@
/usr/local/include/X11R6
/usr/local/include/X11R5
/usr/local/include/X11R4
-@@ -16793,37 +14321,14 @@ ac_x_header_dirs='
+@@ -16793,37 +14321,14 @@
if test "$ac_x_includes" = no; then
# Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
@@ -15148,7 +15157,7 @@
for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
-@@ -16831,7 +14336,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -16831,7 +14336,6 @@
fi
done
fi
@@ -15156,7 +15165,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
-@@ -16841,11 +14345,7 @@ if test "$ac_x_libraries" = no; then
+@@ -16841,11 +14345,7 @@
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
@@ -15169,7 +15178,7 @@
/* end confdefs.h. */
#include <X11/Xlib.h>
int
-@@ -16856,35 +14356,12 @@ XrmInitialize ()
+@@ -16856,35 +14356,12 @@
return 0;
}
_ACEOF
@@ -15207,7 +15216,7 @@
for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do
# Don't even attempt the hair of trying to link an X program!
-@@ -16896,10 +14373,8 @@ do
+@@ -16896,10 +14373,8 @@
done
done
fi
@@ -15220,7 +15229,7 @@
fi # $ac_x_libraries = no
case $ac_x_includes,$ac_x_libraries in #(
-@@ -16920,7 +14395,7 @@ fi
+@@ -16920,7 +14395,7 @@
fi # $with_x != no
if test "$have_x" != yes; then
@@ -15229,7 +15238,7 @@
$as_echo "$have_x" >&6; }
no_x=yes
else
-@@ -16931,16 +14406,14 @@ else
+@@ -16931,16 +14406,14 @@
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -15248,7 +15257,7 @@
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
else
-@@ -16953,16 +14426,12 @@ else
+@@ -16953,16 +14426,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 . . . .
@@ -15267,7 +15276,7 @@
/* end confdefs.h. */
int
-@@ -16973,40 +14442,13 @@ main ()
+@@ -16973,40 +14442,13 @@
return 0;
}
_ACEOF
@@ -15312,7 +15321,7 @@
/* end confdefs.h. */
int
-@@ -17017,46 +14459,19 @@ main ()
+@@ -17017,46 +14459,19 @@
return 0;
}
_ACEOF
@@ -15366,7 +15375,7 @@
ac_c_werror_flag=$ac_xsave_c_werror_flag
LIBS=$ac_xsave_LIBS
fi
-@@ -17072,11 +14487,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -17072,11 +14487,7 @@
# libraries were built with DECnet support. And Karl Berry says
# the Alpha needs dnet_stub (dnet does not exist).
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
@@ -15379,7 +15388,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17094,44 +14505,17 @@ return XOpenDisplay ();
+@@ -17094,44 +14505,17 @@
return 0;
}
_ACEOF
@@ -15429,7 +15438,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17149,59 +14533,30 @@ return dnet_ntoa ();
+@@ -17149,59 +14533,30 @@
return 0;
}
_ACEOF
@@ -15498,7 +15507,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17219,52 +14574,25 @@ return dnet_ntoa ();
+@@ -17219,52 +14574,25 @@
return 0;
}
_ACEOF
@@ -15559,7 +15568,7 @@
LIBS="$ac_xsave_LIBS"
# msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -17275,105 +14603,20 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -17275,105 +14603,20 @@
# on Irix 5.2, according to T.E. Dickey.
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
@@ -15577,9 +15586,7 @@
-/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define gethostbyname innocuous_gethostbyname
-+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char gethostbyname (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
@@ -15642,15 +15649,17 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_gethostbyname=no
- fi
+-fi
++ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
++if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-$as_echo "$ac_cv_func_gethostbyname" >&6; }
--
+
if test $ac_cv_func_gethostbyname = no; then
- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
@@ -15670,7 +15679,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17391,59 +14634,30 @@ return gethostbyname ();
+@@ -17391,59 +14634,30 @@
return 0;
}
_ACEOF
@@ -15739,7 +15748,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17461,43 +14675,18 @@ return gethostbyname ();
+@@ -17461,43 +14675,18 @@
return 0;
}
_ACEOF
@@ -15789,7 +15798,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
-@@ -17511,105 +14700,20 @@ fi
+@@ -17511,105 +14700,20 @@
# variants that don't use the name server (or something). -lsocket
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
@@ -15872,15 +15881,15 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_connect=no
- fi
-
+-fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-$as_echo "$ac_cv_func_connect" >&6; }
--
+
if test $ac_cv_func_connect = no; then
- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
@@ -15900,7 +15909,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17627,148 +14731,38 @@ return connect ();
+@@ -17627,148 +14731,38 @@
return 0;
}
_ACEOF
@@ -15972,7 +15981,9 @@
- which can conflict with char remove (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
++if test "x$ac_cv_func_remove" = x""yes; then :
+
-#ifdef __STDC__
-# include <limits.h>
-#else
@@ -16028,19 +16039,17 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
-+if test "x$ac_cv_func_remove" = x""yes; then :
-
+-
- ac_cv_func_remove=no
- fi
-
+-fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-$as_echo "$ac_cv_func_remove" >&6; }
--
+
if test $ac_cv_func_remove = no; then
- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
@@ -16060,12 +16069,10 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17784,150 +14778,40 @@ main ()
- return remove ();
- ;
+@@ -17786,148 +14780,38 @@
return 0;
--}
--_ACEOF
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -16181,8 +16188,6 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_shmat=yes
-+}
-+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_posix_remove=yes
else
@@ -16195,22 +16200,22 @@
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
- fi
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
+$as_echo "$ac_cv_lib_posix_remove" >&6; }
+if test "x$ac_cv_lib_posix_remove" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-+fi
-+
+ fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
+if test "x$ac_cv_func_shmat" = x""yes; then :
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
++
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-$as_echo "$ac_cv_func_shmat" >&6; }
@@ -16234,7 +16239,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17945,43 +14829,18 @@ return shmat ();
+@@ -17945,43 +14829,18 @@
return 0;
}
_ACEOF
@@ -16284,7 +16289,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -17997,18 +14856,14 @@ fi
+@@ -17997,18 +14856,14 @@
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# John Interrante, Karl Berry
@@ -16306,7 +16311,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18026,43 +14881,18 @@ return IceConnectionNumber ();
+@@ -18026,43 +14881,18 @@
return 0;
}
_ACEOF
@@ -16356,7 +16361,7 @@
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -18072,9 +14902,7 @@ fi
+@@ -18072,9 +14902,7 @@
if test x$no_x = xyes ; then
@@ -16367,7 +16372,7 @@
fi
x_libs="$X_LIBS -lX11 $X_EXTRA_LIBS"
-@@ -18090,18 +14918,14 @@ x_libs_for_checks=$x_libs
+@@ -18090,18 +14918,14 @@
# esac
#done
@@ -16389,7 +16394,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18119,48 +14943,21 @@ return XOpenDisplay ();
+@@ -18119,48 +14943,21 @@
return 0;
}
_ACEOF
@@ -16445,7 +16450,7 @@
fi
-@@ -18177,40 +14974,44 @@ fi
+@@ -18177,40 +14974,44 @@
pkg_failed=no
@@ -16509,7 +16514,7 @@
fi
-@@ -18223,52 +15024,56 @@ else
+@@ -18223,52 +15024,56 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16588,7 +16593,7 @@
fi
-@@ -18281,14 +15086,14 @@ else
+@@ -18281,14 +15086,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16606,7 +16611,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_EXIF_TRUE=
-@@ -18310,7 +15115,7 @@ fi
+@@ -18310,7 +15115,7 @@
else
EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
EXIF_LIBS=$pkg_cv_EXIF_LIBS
@@ -16615,7 +16620,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18322,9 +15127,7 @@ else
+@@ -18322,9 +15127,7 @@
fi
@@ -16626,7 +16631,7 @@
fi
-@@ -18333,40 +15136,44 @@ elif test $pkg_failed = untried; then
+@@ -18333,40 +15136,44 @@
pkg_failed=no
@@ -16690,7 +16695,7 @@
fi
-@@ -18379,14 +15186,14 @@ else
+@@ -18379,14 +15186,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16708,7 +16713,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_EXIF_TRUE=
-@@ -18408,7 +15215,7 @@ fi
+@@ -18408,7 +15215,7 @@
else
EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
EXIF_LIBS=$pkg_cv_EXIF_LIBS
@@ -16717,7 +16722,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18420,9 +15227,7 @@ else
+@@ -18420,9 +15227,7 @@
fi
@@ -16728,7 +16733,7 @@
fi
-@@ -18430,7 +15235,7 @@ fi
+@@ -18430,7 +15235,7 @@
else
EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
EXIF_LIBS=$pkg_cv_EXIF_LIBS
@@ -16737,7 +16742,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18442,9 +15247,7 @@ else
+@@ -18442,9 +15247,7 @@
fi
@@ -16748,7 +16753,7 @@
fi
-@@ -18464,7 +15267,7 @@ fi
+@@ -18464,7 +15267,7 @@
# Check whether --enable-xmp was given.
@@ -16757,7 +16762,7 @@
enableval=$enable_xmp;
fi
-@@ -18472,40 +15275,44 @@ msg_xmp=no
+@@ -18472,40 +15275,44 @@
if test "x$enable_xmp" != "xno"; then
pkg_failed=no
@@ -16821,7 +16826,7 @@
fi
-@@ -18518,14 +15325,14 @@ else
+@@ -18518,14 +15325,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16839,7 +16844,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_EXEMPI_TRUE=
-@@ -18547,7 +15354,7 @@ fi
+@@ -18547,7 +15354,7 @@
else
EXEMPI_CFLAGS=$pkg_cv_EXEMPI_CFLAGS
EXEMPI_LIBS=$pkg_cv_EXEMPI_LIBS
@@ -16848,7 +16853,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18559,9 +15366,7 @@ else
+@@ -18559,9 +15366,7 @@
fi
@@ -16859,7 +16864,7 @@
msg_xmp=yes
-@@ -18569,40 +15374,44 @@ fi
+@@ -18569,40 +15374,44 @@
pkg_failed=no
@@ -16923,7 +16928,7 @@
fi
-@@ -18615,14 +15424,14 @@ else
+@@ -18615,14 +15424,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16941,7 +16946,7 @@
$as_echo "no" >&6; }
true
elif test $pkg_failed = untried; then
-@@ -18630,12 +15439,10 @@ elif test $pkg_failed = untried; then
+@@ -18630,12 +15439,10 @@
else
EXEMPI_NEW_API_CFLAGS=$pkg_cv_EXEMPI_NEW_API_CFLAGS
EXEMPI_NEW_API_LIBS=$pkg_cv_EXEMPI_NEW_API_LIBS
@@ -16956,7 +16961,7 @@
fi
-@@ -18655,7 +15462,7 @@ fi
+@@ -18655,7 +15462,7 @@
# Check whether --enable-tracker was given.
@@ -16965,7 +16970,7 @@
enableval=$enable_tracker;
fi
-@@ -18663,40 +15470,44 @@ msg_tracker=no
+@@ -18663,40 +15470,44 @@
if test "x$enable_tracker" != "xno"; then
pkg_failed=no
@@ -16978,19 +16983,22 @@
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7\"") >&5
+- ($PKG_CONFIG --exists --print-errors "tracker-client-0.7") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker-client-0.7" 2>/dev/null`
+if test -n "$PKG_CONFIG"; then
+ if test -n "$TRACKER_CFLAGS"; then
+ pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7\""; } >&5
- ($PKG_CONFIG --exists --print-errors "tracker-client-0.7") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "tracker-client-0.8") 2>&5
++ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker-client-0.7" 2>/dev/null`
++ pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker-client-0.8" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -17005,19 +17013,22 @@
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7\"") >&5
+- ($PKG_CONFIG --exists --print-errors "tracker-client-0.7") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker-client-0.7" 2>/dev/null`
+if test -n "$PKG_CONFIG"; then
+ if test -n "$TRACKER_LIBS"; then
+ pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7\""; } >&5
- ($PKG_CONFIG --exists --print-errors "tracker-client-0.7") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "tracker-client-0.8") 2>&5
++ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker-client-0.7" 2>/dev/null`
++ pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker-client-0.8" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -17029,15 +17040,15 @@
fi
-@@ -18709,52 +15520,56 @@ else
+@@ -18709,52 +15520,56 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker-client-0.7" 2>&1`
-+ TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker-client-0.7"`
++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker-client-0.8"`
else
- TRACKER_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker-client-0.7" 2>&1`
-+ TRACKER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker-client-0.7"`
++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker-client-0.8"`
fi
# Put the nasty error message in config.log where it belongs
echo "$TRACKER_PKG_ERRORS" >&5
@@ -17108,7 +17119,7 @@
fi
-@@ -18767,14 +15582,14 @@ else
+@@ -18767,14 +15582,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -17126,7 +17137,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_TRACKER_TRUE=
-@@ -18796,7 +15611,7 @@ fi
+@@ -18796,7 +15611,7 @@
else
TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
@@ -17135,7 +17146,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18808,9 +15623,7 @@ else
+@@ -18808,9 +15623,7 @@
fi
@@ -17146,7 +17157,7 @@
msg_tracker=yes
-@@ -18820,40 +15633,44 @@ elif test $pkg_failed = untried; then
+@@ -18820,40 +15633,44 @@
pkg_failed=no
@@ -17210,7 +17221,7 @@
fi
-@@ -18866,14 +15683,14 @@ else
+@@ -18866,14 +15683,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -17228,7 +17239,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_TRACKER_TRUE=
-@@ -18895,7 +15712,7 @@ fi
+@@ -18895,7 +15712,7 @@
else
TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
@@ -17237,7 +17248,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18907,9 +15724,7 @@ else
+@@ -18907,9 +15724,7 @@
fi
@@ -17248,7 +17259,7 @@
msg_tracker=yes
-@@ -18918,7 +15733,7 @@ fi
+@@ -18918,7 +15733,7 @@
else
TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
@@ -17257,7 +17268,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18930,14 +15745,10 @@ else
+@@ -18930,14 +15745,10 @@
fi
@@ -17270,11 +17281,11 @@
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_TRACKER_0_7 1
-_ACEOF
-+$as_echo "#define HAVE_TRACKER_0_7 1" >>confdefs.h
++$as_echo "#define HAVE_TRACKER_0_8 1" >>confdefs.h
msg_tracker=yes
-@@ -18959,7 +15770,7 @@ fi
+@@ -18959,7 +15770,7 @@
# Check whether --enable-beagle was given.
@@ -17283,7 +17294,7 @@
enableval=$enable_beagle;
fi
-@@ -18974,40 +15785,44 @@ if test "x$enable_beagle" != "xno"; then
+@@ -18974,40 +15785,44 @@
pkg_failed=no
@@ -17347,7 +17358,7 @@
fi
-@@ -19020,14 +15835,14 @@ else
+@@ -19020,14 +15835,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -17365,7 +17376,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_BEAGLE_TRUE=
-@@ -19043,262 +15858,88 @@ elif test $pkg_failed = untried; then
+@@ -19043,262 +15858,88 @@
HAVE_BEAGLE_FALSE='#'
else
HAVE_BEAGLE_TRUE='#'
@@ -17691,7 +17702,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19323,59 +15964,30 @@ for ac_lib in '' selinux; do
+@@ -19323,59 +15964,30 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -17760,7 +17771,7 @@
SELINUX_LIBS="-lselinux"
msg_selinux=yes
-@@ -19393,12 +16005,10 @@ fi
+@@ -19393,12 +16005,10 @@
# Check whether --enable-empty_view was given.
@@ -17775,7 +17786,7 @@
fi
-@@ -19415,7 +16025,7 @@ fi
+@@ -19415,7 +16025,7 @@
# Check whether --enable-packagekit was given.
@@ -17784,7 +17795,7 @@
enableval=$enable_packagekit;
fi
-@@ -19423,16 +16033,14 @@ msg_packagekit=no
+@@ -19423,16 +16033,14 @@
if test "x$enable_packagekit" != "xno"; then
msg_packagekit=yes
@@ -17803,7 +17814,7 @@
enableval=$enable_more_warnings; set_more_warnings="$enableval"
else
-@@ -19445,10 +16053,10 @@ fi
+@@ -19445,10 +16053,10 @@
fi
@@ -17816,7 +17827,7 @@
$as_echo "yes" >&6; }
WARNING_CFLAGS="\
-Wall \
-@@ -19460,13 +16068,9 @@ $as_echo "yes" >&6; }
+@@ -19460,13 +16068,9 @@
for option in -Wstrict-aliasing=0 -Wno-pointer-sign; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -17832,7 +17843,7 @@
/* end confdefs.h. */
int
-@@ -19477,37 +16081,16 @@ main ()
+@@ -19477,37 +16081,16 @@
return 0;
}
_ACEOF
@@ -17873,7 +17884,7 @@
$as_echo "$has_option" >&6; }
CFLAGS="$SAVE_CFLAGS"
unset has_option
-@@ -19515,26 +16098,19 @@ $as_echo "$has_option" >&6; }
+@@ -19515,26 +16098,19 @@
done
unset option
else
@@ -17906,7 +17917,7 @@
/* end confdefs.h. */
#include <time.h>
int main ()
-@@ -19549,65 +16125,32 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -19549,65 +16125,32 @@
}
_ACEOF
@@ -17979,7 +17990,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19625,228 +16168,62 @@ return XRenderFindFormat ();
+@@ -19625,228 +16168,62 @@
return 0;
}
_ACEOF
@@ -18254,7 +18265,7 @@
_ACEOF
fi
-@@ -19857,9 +16234,9 @@ done
+@@ -19857,9 +16234,9 @@
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -18266,7 +18277,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -19872,14 +16249,14 @@ for as_dir in $PATH
+@@ -19872,14 +16249,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18284,7 +18295,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-@@ -19888,19 +16265,17 @@ esac
+@@ -19888,19 +16265,17 @@
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -18307,7 +18318,7 @@
fi
-@@ -19912,13 +16287,13 @@ fi
+@@ -19912,13 +16287,13 @@
# Check whether --with-gconf-source was given.
@@ -18323,7 +18334,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -19927,22 +16302,20 @@ $as_echo "Using config source $GCONF_SCH
+@@ -19927,22 +16302,20 @@
# Check whether --with-gconf-schema-file-dir was given.
@@ -18350,7 +18361,7 @@
esac
fi
-@@ -19959,9 +16332,9 @@ fi
+@@ -19959,9 +16332,9 @@
# Extract the first word of "update-mime-database", so it can be a program name with args.
set dummy update-mime-database; ac_word=$2
@@ -18362,7 +18373,7 @@
$as_echo_n "(cached) " >&6
else
case $UPDATE_MIME_DATABASE in
-@@ -19974,14 +16347,14 @@ for as_dir in $PATH
+@@ -19974,14 +16347,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18380,7 +18391,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_UPDATE_MIME_DATABASE" && ac_cv_path_UPDATE_MIME_DATABASE="no"
-@@ -19990,17 +16363,17 @@ esac
+@@ -19990,17 +16363,17 @@
fi
UPDATE_MIME_DATABASE=$ac_cv_path_UPDATE_MIME_DATABASE
if test -n "$UPDATE_MIME_DATABASE"; then
@@ -18401,7 +18412,7 @@
enableval=$enable_update_mimedb;
else
enable_update_mimedb=yes
-@@ -20018,7 +16391,7 @@ fi
+@@ -20018,7 +16391,7 @@
# Check whether --enable-shave was given.
@@ -18410,7 +18421,7 @@
enableval=$enable_shave;
else
enable_shave=yes
-@@ -20038,9 +16411,9 @@ fi
+@@ -20038,9 +16411,9 @@
# Extract the first word of "sed", so it can be a program name with args.
set dummy sed; ac_word=$2
@@ -18422,7 +18433,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$SED"; then
-@@ -20051,14 +16424,14 @@ for as_dir in $PATH
+@@ -20051,14 +16424,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18440,7 +18451,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_prog_SED" && ac_cv_prog_SED="false"
-@@ -20066,10 +16439,10 @@ fi
+@@ -20066,10 +16439,10 @@
fi
SED=$ac_cv_prog_SED
if test -n "$SED"; then
@@ -18453,7 +18464,7 @@
$as_echo "no" >&6; }
fi
-@@ -20134,13 +16507,13 @@ _ACEOF
+@@ -20134,13 +16507,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -18469,7 +18480,7 @@
esac ;;
esac
done
-@@ -20148,8 +16521,8 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -20148,8 +16521,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -18480,7 +18491,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -20172,11 +16545,11 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -20172,11 +16545,11 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -18494,7 +18505,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -20196,8 +16569,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i"
+@@ -20196,8 +16569,8 @@
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
@@ -18505,7 +18516,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -20213,277 +16586,167 @@ else
+@@ -20213,277 +16586,167 @@
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -18860,7 +18871,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -20493,17 +16756,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
+@@ -20493,17 +16756,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -18886,7 +18897,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -20511,23 +16775,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -20511,23 +16775,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -18915,7 +18926,7 @@
as_nl='
'
export as_nl
-@@ -20535,7 +16791,13 @@ export as_nl
+@@ -20535,7 +16791,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -18930,7 +18941,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -20546,7 +16808,7 @@ else
+@@ -20546,7 +16808,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -18939,7 +18950,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -20569,13 +16831,6 @@ if test "${PATH_SEPARATOR+set}" != set;
+@@ -20569,13 +16831,6 @@
}
fi
@@ -18953,7 +18964,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -20585,15 +16840,15 @@ fi
+@@ -20585,15 +16840,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -18972,7 +18983,7 @@
IFS=$as_save_IFS
;;
-@@ -20605,12 +16860,16 @@ if test "x$as_myself" = x; then
+@@ -20605,12 +16860,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -18993,7 +19004,7 @@
done
PS1='$ '
PS2='> '
-@@ -20622,7 +16881,89 @@ export LC_ALL
+@@ -20622,7 +16881,89 @@
LANGUAGE=C
export LANGUAGE
@@ -19084,7 +19095,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -20636,8 +16977,12 @@ else
+@@ -20636,8 +16977,12 @@
as_basename=false
fi
@@ -19098,7 +19109,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -20657,76 +17002,25 @@ $as_echo X/"$0" |
+@@ -20657,76 +17002,25 @@
}
s/.*/./; q'`
@@ -19186,7 +19197,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -20755,8 +17049,56 @@ fi
+@@ -20755,8 +17049,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -19244,7 +19255,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -20775,10 +17117,10 @@ else
+@@ -20775,10 +17117,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -19257,7 +19268,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -20793,13 +17135,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+@@ -20793,13 +17135,19 @@
exec 6>&1
@@ -19279,7 +19290,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -20831,13 +17179,15 @@ _ACEOF
+@@ -20831,13 +17179,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -19298,7 +19309,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -20856,16 +17206,17 @@ $config_headers
+@@ -20856,16 +17206,17 @@
Configuration commands:
$config_commands
@@ -19320,7 +19331,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -20901,6 +17252,8 @@ do
+@@ -20901,6 +17252,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -19329,7 +19340,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -20908,20 +17261,19 @@ do
+@@ -20908,20 +17261,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -19354,7 +19365,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -20929,11 +17281,10 @@ Try \`$0 --help' for more information."
+@@ -20929,11 +17281,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -19369,7 +19380,7 @@
ac_need_defaults=false ;;
esac
-@@ -21277,9 +17628,7 @@ do
+@@ -21277,9 +17628,7 @@
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -19380,7 +19391,7 @@
esac
done
-@@ -21306,7 +17655,7 @@ $debug ||
+@@ -21306,7 +17655,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -19389,7 +19400,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -21317,11 +17666,7 @@ $debug ||
+@@ -21317,11 +17666,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -19402,7 +19413,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -21329,10 +17674,16 @@ $debug ||
+@@ -21329,10 +17674,16 @@
if test -n "$CONFIG_FILES"; then
@@ -19421,7 +19432,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -21346,24 +17697,18 @@ _ACEOF
+@@ -21346,24 +17697,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -19449,7 +19460,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -21385,7 +17730,7 @@ s/'"$ac_delim"'$//
+@@ -21385,7 +17730,7 @@
t delim
:nl
h
@@ -19458,7 +19469,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -21399,7 +17744,7 @@ s/.\{148\}//
+@@ -21399,7 +17744,7 @@
t nl
:delim
h
@@ -19467,7 +19478,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -21452,9 +17797,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
+@@ -21452,9 +17797,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -19478,7 +19489,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -21495,9 +17838,7 @@ for ac_last_try in false false :; do
+@@ -21495,9 +17838,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -19489,7 +19500,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -21582,9 +17923,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -21582,9 +17923,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -19500,7 +19511,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -21597,9 +17936,7 @@ do
+@@ -21597,9 +17936,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -19511,7 +19522,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -21627,12 +17964,10 @@ $as_echo "$as_me: error: invalid tag $ac
+@@ -21627,12 +17964,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -19526,7 +19537,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -21643,7 +17978,7 @@ $as_echo "$as_me: error: cannot find inp
+@@ -21643,7 +17978,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -19535,7 +19546,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -21656,9 +17991,7 @@ $as_echo "$as_me: creating $ac_file" >&6
+@@ -21656,9 +17991,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -19546,7 +19557,7 @@
esac
;;
esac
-@@ -21686,47 +18019,7 @@ $as_echo X"$ac_file" |
+@@ -21686,47 +18019,7 @@
q
}
s/.*/./; q'`
@@ -19595,7 +19606,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -21783,7 +18076,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+@@ -21783,7 +18076,6 @@
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -19603,7 +19614,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -21793,12 +18085,11 @@ ac_sed_dataroot='
+@@ -21793,12 +18085,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -19618,7 +19629,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -21808,7 +18099,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -21808,7 +18099,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -19627,7 +19638,7 @@
esac
_ACEOF
-@@ -21837,14 +18128,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+@@ -21837,14 +18128,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -19644,7 +19655,7 @@
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
-@@ -21854,9 +18143,7 @@ which seems to be undefined. Please mak
+@@ -21854,9 +18143,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -19655,7 +19666,7 @@
;;
:H)
#
-@@ -21867,25 +18154,19 @@ $as_echo "$as_me: error: could not creat
+@@ -21867,25 +18154,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -19685,7 +19696,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -21923,7 +18204,7 @@ $as_echo X"$_am_arg" |
+@@ -21923,7 +18204,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -19694,7 +19705,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -22018,47 +18299,7 @@ $as_echo X"$file" |
+@@ -22018,47 +18299,7 @@
q
}
s/.*/./; q'`
@@ -19743,7 +19754,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -22711,9 +18952,7 @@ _LT_EOF
+@@ -22711,9 +18952,7 @@
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -19754,7 +19765,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -22736,15 +18975,12 @@ $as_echo "$as_me: error: po/Makefile.in.
+@@ -22736,15 +18975,12 @@
done # for ac_tag
@@ -19772,7 +19783,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -22765,10 +19001,10 @@ if test "$no_create" != yes; then
+@@ -22765,10 +19001,10 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -19787,15 +19798,15 @@
Index: nautilus-2.28.4/cut-n-paste-code/libegg/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/cut-n-paste-code/libegg/Makefile.in 2010-04-09 01:58:09.022714783 +0200
-+++ nautilus-2.28.4/cut-n-paste-code/libegg/Makefile.in 2010-04-09 01:59:17.318213242 +0200
+--- nautilus-2.28.4.orig/cut-n-paste-code/libegg/Makefile.in 2009-12-15 10:12:57.000000000 +0100
++++ nautilus-2.28.4/cut-n-paste-code/libegg/Makefile.in 2010-04-09 02:23:22.385092385 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -188,6 +188,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -188,6 +188,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19805,15 +19816,15 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.4/cut-n-paste-code/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/cut-n-paste-code/Makefile.in 2010-04-09 01:58:09.006715405 +0200
-+++ nautilus-2.28.4/cut-n-paste-code/Makefile.in 2010-04-09 01:59:17.186215663 +0200
+--- nautilus-2.28.4.orig/cut-n-paste-code/Makefile.in 2009-12-15 10:12:57.000000000 +0100
++++ nautilus-2.28.4/cut-n-paste-code/Makefile.in 2010-04-09 02:23:22.221093284 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -199,6 +199,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -199,6 +199,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19821,7 +19832,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -330,7 +331,7 @@ clean-libtool:
+@@ -330,7 +331,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -19830,7 +19841,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -355,7 +356,7 @@ $(RECURSIVE_TARGETS):
+@@ -355,7 +356,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -19841,15 +19852,15 @@
*=* | --[!k]*);; \
Index: nautilus-2.28.4/data/icons/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/data/icons/Makefile.in 2010-04-09 01:58:08.990717493 +0200
-+++ nautilus-2.28.4/data/icons/Makefile.in 2010-04-09 01:59:17.494213749 +0200
+--- nautilus-2.28.4.orig/data/icons/Makefile.in 2009-12-15 10:12:57.000000000 +0100
++++ nautilus-2.28.4/data/icons/Makefile.in 2010-04-09 02:23:22.613094325 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -161,6 +161,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -161,6 +161,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19859,15 +19870,15 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.4/data/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/data/Makefile.in 2010-04-09 01:58:08.974715671 +0200
-+++ nautilus-2.28.4/data/Makefile.in 2010-04-09 01:59:17.414213434 +0200
+--- nautilus-2.28.4.orig/data/Makefile.in 2009-12-15 10:12:57.000000000 +0100
++++ nautilus-2.28.4/data/Makefile.in 2010-04-09 02:23:22.513092479 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -235,6 +235,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -235,6 +235,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19875,7 +19886,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -478,7 +479,7 @@ uninstall-nautilusdataDATA:
+@@ -478,7 +479,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -19884,7 +19895,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -503,7 +504,7 @@ $(RECURSIVE_TARGETS):
+@@ -503,7 +504,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -19895,15 +19906,15 @@
*=* | --[!k]*);; \
Index: nautilus-2.28.4/data/patterns/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/data/patterns/Makefile.in 2010-04-09 01:58:08.962717359 +0200
-+++ nautilus-2.28.4/data/patterns/Makefile.in 2010-04-09 01:59:17.574213574 +0200
+--- nautilus-2.28.4.orig/data/patterns/Makefile.in 2009-12-15 10:12:57.000000000 +0100
++++ nautilus-2.28.4/data/patterns/Makefile.in 2010-04-09 02:23:22.729094862 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -183,6 +183,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -183,6 +183,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19913,15 +19924,15 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.4/docs/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/docs/Makefile.in 2010-04-09 01:58:08.946715536 +0200
-+++ nautilus-2.28.4/docs/Makefile.in 2010-04-09 01:59:17.670213767 +0200
+--- nautilus-2.28.4.orig/docs/Makefile.in 2009-12-15 10:12:57.000000000 +0100
++++ nautilus-2.28.4/docs/Makefile.in 2010-04-09 02:23:22.853094456 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -224,6 +224,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -224,6 +224,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19929,7 +19940,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -416,7 +417,7 @@ uninstall-man1:
+@@ -416,7 +417,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -19938,7 +19949,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -441,7 +442,7 @@ $(RECURSIVE_TARGETS):
+@@ -441,7 +442,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -19949,15 +19960,15 @@
*=* | --[!k]*);; \
Index: nautilus-2.28.4/docs/reference/libnautilus-extension/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/docs/reference/libnautilus-extension/Makefile.in 2010-04-09 01:58:08.934718201 +0200
-+++ nautilus-2.28.4/docs/reference/libnautilus-extension/Makefile.in 2010-04-09 01:59:17.846215266 +0200
+--- nautilus-2.28.4.orig/docs/reference/libnautilus-extension/Makefile.in 2009-12-15 10:12:57.000000000 +0100
++++ nautilus-2.28.4/docs/reference/libnautilus-extension/Makefile.in 2010-04-09 02:23:23.077092249 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -166,6 +166,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -166,6 +166,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19967,15 +19978,15 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.4/docs/reference/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/docs/reference/Makefile.in 2010-04-09 01:58:08.918716867 +0200
-+++ nautilus-2.28.4/docs/reference/Makefile.in 2010-04-09 01:59:17.750213601 +0200
+--- nautilus-2.28.4.orig/docs/reference/Makefile.in 2009-12-15 10:12:57.000000000 +0100
++++ nautilus-2.28.4/docs/reference/Makefile.in 2010-04-09 02:23:22.957093172 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -199,6 +199,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -199,6 +199,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19983,7 +19994,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -330,7 +331,7 @@ clean-libtool:
+@@ -330,7 +331,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -19992,7 +20003,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -355,7 +356,7 @@ $(RECURSIVE_TARGETS):
+@@ -355,7 +356,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -20003,15 +20014,15 @@
*=* | --[!k]*);; \
Index: nautilus-2.28.4/eel/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/eel/Makefile.in 2010-04-09 01:58:08.902714065 +0200
-+++ nautilus-2.28.4/eel/Makefile.in 2010-04-09 01:59:17.978216745 +0200
+--- nautilus-2.28.4.orig/eel/Makefile.in 2009-12-15 10:12:58.000000000 +0100
++++ nautilus-2.28.4/eel/Makefile.in 2010-04-09 02:23:23.241092480 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -52,7 +52,9 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -52,7 +52,9 @@
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
@@ -20022,7 +20033,7 @@
am__objects_1 =
am_libeel_2_la_OBJECTS = eel-accessibility.lo eel-alert-dialog.lo \
eel-art-extensions.lo eel-art-gtk-extensions.lo \
-@@ -208,6 +210,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -208,6 +210,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20030,7 +20041,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -308,6 +311,9 @@ INCLUDES = \
+@@ -308,6 +311,9 @@
libeel_2_la_LDFLAGS = \
-no-undefined \
@@ -20042,15 +20053,15 @@
$(X_LIBS) \
Index: nautilus-2.28.4/icons/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/icons/Makefile.in 2010-04-09 01:58:08.890715264 +0200
-+++ nautilus-2.28.4/icons/Makefile.in 2010-04-09 01:59:18.058214615 +0200
+--- nautilus-2.28.4.orig/icons/Makefile.in 2009-12-15 10:12:58.000000000 +0100
++++ nautilus-2.28.4/icons/Makefile.in 2010-04-09 02:23:23.341094324 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -183,6 +183,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -183,6 +183,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20060,9 +20071,9 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.4/INSTALL
===================================================================
---- nautilus-2.28.4.orig/INSTALL 2010-04-09 01:58:08.878715485 +0200
-+++ nautilus-2.28.4/INSTALL 2010-04-09 01:59:18.846716726 +0200
-@@ -2,18 +2,24 @@ Installation Instructions
+--- nautilus-2.28.4.orig/INSTALL 2009-05-23 20:14:13.000000000 +0200
++++ nautilus-2.28.4/INSTALL 2010-04-09 02:23:24.277095949 +0200
+@@ -2,18 +2,24 @@
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
@@ -20092,7 +20103,7 @@
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
-@@ -42,7 +48,7 @@ may remove or edit it.
+@@ -42,7 +48,7 @@
you want to change it or regenerate `configure' using a newer version
of `autoconf'.
@@ -20101,7 +20112,7 @@
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system.
-@@ -53,12 +59,22 @@ The simplest way to compile this package
+@@ -53,12 +59,22 @@
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
@@ -20127,7 +20138,7 @@
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
-@@ -67,15 +83,22 @@ The simplest way to compile this package
+@@ -67,15 +83,22 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
@@ -20155,7 +20166,7 @@
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
-@@ -88,25 +111,41 @@ is an example:
+@@ -88,25 +111,41 @@
Compiling For Multiple Architectures
====================================
@@ -20201,7 +20212,7 @@
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-@@ -117,16 +156,47 @@ Documentation and other data files still
+@@ -117,16 +156,47 @@
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
@@ -20254,7 +20265,7 @@
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
-@@ -138,14 +208,53 @@ find the X include and library files aut
+@@ -138,14 +208,53 @@
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
@@ -20313,7 +20324,7 @@
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
-@@ -153,7 +262,8 @@ type, such as `sun4', or a canonical nam
+@@ -153,7 +262,8 @@
where SYSTEM can have one of these forms:
@@ -20323,7 +20334,7 @@
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
-@@ -171,9 +281,9 @@ eventually be run) with `--host=TYPE'.
+@@ -171,9 +281,9 @@
Sharing Defaults
================
@@ -20336,7 +20347,7 @@
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
-@@ -182,7 +292,7 @@ A warning: not all `configure' scripts l
+@@ -182,7 +292,7 @@
Defining Variables
==================
@@ -20345,7 +20356,7 @@
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
-@@ -201,11 +311,19 @@ an Autoconf bug. Until the bug is fixed
+@@ -201,11 +311,19 @@
`configure' Invocation
======================
@@ -20367,7 +20378,7 @@
`--version'
`-V'
-@@ -232,6 +350,16 @@ an Autoconf bug. Until the bug is fixed
+@@ -232,6 +350,16 @@
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
@@ -20386,15 +20397,15 @@
Index: nautilus-2.28.4/libnautilus-extension/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/libnautilus-extension/Makefile.in 2010-04-09 01:58:08.866716683 +0200
-+++ nautilus-2.28.4/libnautilus-extension/Makefile.in 2010-04-09 01:59:18.182714101 +0200
+--- nautilus-2.28.4.orig/libnautilus-extension/Makefile.in 2009-12-15 10:12:58.000000000 +0100
++++ nautilus-2.28.4/libnautilus-extension/Makefile.in 2010-04-09 02:23:23.481094551 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -222,6 +222,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -222,6 +222,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20404,15 +20415,15 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.4/libnautilus-private/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/libnautilus-private/Makefile.in 2010-04-09 01:58:08.858718460 +0200
-+++ nautilus-2.28.4/libnautilus-private/Makefile.in 2010-04-09 01:59:18.338715640 +0200
+--- nautilus-2.28.4.orig/libnautilus-private/Makefile.in 2009-12-15 10:12:58.000000000 +0100
++++ nautilus-2.28.4/libnautilus-private/Makefile.in 2010-04-09 02:23:23.657093788 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -341,6 +341,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -341,6 +341,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20422,8 +20433,8 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.4/ltmain.sh
===================================================================
---- nautilus-2.28.4.orig/ltmain.sh 2010-04-09 01:58:08.834714011 +0200
-+++ nautilus-2.28.4/ltmain.sh 2010-04-09 01:59:08.390217560 +0200
+--- nautilus-2.28.4.orig/ltmain.sh 2009-12-15 10:12:49.000000000 +0100
++++ nautilus-2.28.4/ltmain.sh 2010-04-09 02:23:05.649105896 +0200
@@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
@@ -20453,7 +20464,7 @@
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -5033,7 +5033,10 @@ func_mode_link ()
+@@ -5033,7 +5033,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -20465,7 +20476,7 @@
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5344,19 +5347,19 @@ func_mode_link ()
+@@ -5344,19 +5347,19 @@
# It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
@@ -20495,7 +20506,7 @@
continue
fi # $pass = conv
-@@ -5893,6 +5896,7 @@ func_mode_link ()
+@@ -5893,6 +5896,7 @@
if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
@@ -20503,7 +20514,7 @@
case $deplib in
-L*) path="$deplib" ;;
*.la)
-@@ -6206,6 +6210,9 @@ func_mode_link ()
+@@ -6206,6 +6210,9 @@
revision="$number_minor"
lt_irix_increment=no
;;
@@ -20515,15 +20526,15 @@
no)
Index: nautilus-2.28.4/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/Makefile.in 2010-04-09 01:58:08.822715698 +0200
-+++ nautilus-2.28.4/Makefile.in 2010-04-09 01:59:18.910714245 +0200
+--- nautilus-2.28.4.orig/Makefile.in 2009-12-15 10:12:59.000000000 +0100
++++ nautilus-2.28.4/Makefile.in 2010-04-09 02:23:24.357095245 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -216,6 +216,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -216,6 +216,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20531,7 +20542,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -414,7 +415,7 @@ distclean-libtool:
+@@ -414,7 +415,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -20540,7 +20551,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -439,7 +440,7 @@ $(RECURSIVE_TARGETS):
+@@ -439,7 +440,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -20549,7 +20560,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -603,7 +604,8 @@ distdir: $(DISTFILES)
+@@ -603,7 +604,8 @@
fi; \
done
-test -n "$(am__skip_mode_fix)" \
@@ -20559,7 +20570,7 @@
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -647,17 +649,17 @@ dist dist-all: distdir
+@@ -647,17 +649,17 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
@@ -20583,15 +20594,15 @@
esac
Index: nautilus-2.28.4/src/file-manager/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/src/file-manager/Makefile.in 2010-04-09 01:58:08.810723251 +0200
-+++ nautilus-2.28.4/src/file-manager/Makefile.in 2010-04-09 01:59:18.682714518 +0200
+--- nautilus-2.28.4.orig/src/file-manager/Makefile.in 2009-12-15 10:12:59.000000000 +0100
++++ nautilus-2.28.4/src/file-manager/Makefile.in 2010-04-09 02:23:24.077092808 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -223,6 +223,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -223,6 +223,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20601,15 +20612,15 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.4/src/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/src/Makefile.in 2010-04-09 01:58:08.770719909 +0200
-+++ nautilus-2.28.4/src/Makefile.in 2010-04-09 01:59:18.570715434 +0200
+--- nautilus-2.28.4.orig/src/Makefile.in 2009-12-15 10:12:58.000000000 +0100
++++ nautilus-2.28.4/src/Makefile.in 2010-04-09 02:23:23.937093699 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -342,6 +342,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -342,6 +342,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20617,7 +20628,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -858,7 +859,7 @@ uninstall-uiDATA:
+@@ -858,7 +859,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -20626,7 +20637,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -883,7 +884,7 @@ $(RECURSIVE_TARGETS):
+@@ -883,7 +884,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -20637,15 +20648,15 @@
*=* | --[!k]*);; \
Index: nautilus-2.28.4/test/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/test/Makefile.in 2010-04-09 01:58:08.746721814 +0200
-+++ nautilus-2.28.4/test/Makefile.in 2010-04-09 01:59:18.814714542 +0200
+--- nautilus-2.28.4.orig/test/Makefile.in 2009-12-15 10:12:59.000000000 +0100
++++ nautilus-2.28.4/test/Makefile.in 2010-04-09 02:23:24.241095833 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -271,6 +271,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -271,6 +271,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20655,8 +20666,8 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.4/config.sub
===================================================================
---- nautilus-2.28.4.orig/config.sub 2010-04-09 01:58:08.694721628 +0200
-+++ nautilus-2.28.4/config.sub 2010-04-09 01:59:17.062714488 +0200
+--- nautilus-2.28.4.orig/config.sub 2009-12-15 10:12:56.000000000 +0100
++++ nautilus-2.28.4/config.sub 2010-04-09 02:23:22.037096650 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -20670,7 +20681,7 @@
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
-@@ -32,13 +32,16 @@ timestamp='2009-04-17'
+@@ -32,13 +32,16 @@
# Please send patches to <config-patches at gnu.org>. Submit a context
@@ -20688,7 +20699,7 @@
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
-@@ -72,8 +75,9 @@ Report bugs and patches to <config-patch
+@@ -72,8 +75,9 @@
version="\
GNU config.sub ($timestamp)
@@ -20700,7 +20711,7 @@
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -149,10 +153,13 @@ case $os in
+@@ -149,10 +153,13 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
@@ -20715,7 +20726,7 @@
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
-@@ -281,6 +288,7 @@ case $basic_machine in
+@@ -281,6 +288,7 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
@@ -20723,7 +20734,7 @@
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
-@@ -288,13 +296,14 @@ case $basic_machine in
+@@ -288,13 +296,14 @@
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
| spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
@@ -20739,7 +20750,7 @@
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
os=-none
-@@ -337,7 +346,7 @@ case $basic_machine in
+@@ -337,7 +346,7 @@
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -20748,7 +20759,7 @@
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
-@@ -365,15 +374,17 @@ case $basic_machine in
+@@ -365,15 +374,17 @@
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
@@ -20768,7 +20779,7 @@
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-@@ -467,6 +478,10 @@ case $basic_machine in
+@@ -467,6 +478,10 @@
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
@@ -20779,7 +20790,7 @@
c90)
basic_machine=c90-cray
os=-unicos
-@@ -719,6 +734,9 @@ case $basic_machine in
+@@ -719,6 +734,9 @@
basic_machine=ns32k-utek
os=-sysv
;;
@@ -20789,7 +20800,7 @@
mingw32)
basic_machine=i386-pc
os=-mingw32
-@@ -1069,6 +1087,11 @@ case $basic_machine in
+@@ -1069,6 +1087,11 @@
basic_machine=tic6x-unknown
os=-coff
;;
@@ -20801,7 +20812,7 @@
tile*)
basic_machine=tile-unknown
os=-linux-gnu
-@@ -1240,6 +1263,9 @@ case $os in
+@@ -1240,6 +1263,9 @@
# First match some system type aliases
# that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
@@ -20811,7 +20822,7 @@
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
-@@ -1260,9 +1286,9 @@ case $os in
+@@ -1260,9 +1286,9 @@
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
@@ -20824,7 +20835,7 @@
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-@@ -1283,7 +1309,7 @@ case $os in
+@@ -1283,7 +1309,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
@@ -20833,7 +20844,7 @@
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
-@@ -1416,6 +1442,8 @@ case $os in
+@@ -1416,6 +1442,8 @@
-dicos*)
os=-dicos
;;
@@ -20842,7 +20853,7 @@
-none)
;;
*)
-@@ -1613,7 +1641,7 @@ case $basic_machine in
+@@ -1613,7 +1641,7 @@
-sunos*)
vendor=sun
;;
@@ -20853,15 +20864,15 @@
-beos*)
Index: nautilus-2.28.4/m4/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/m4/Makefile.in 2010-04-09 01:58:08.658716422 +0200
-+++ nautilus-2.28.4/m4/Makefile.in 2010-04-09 01:59:18.414713917 +0200
+--- nautilus-2.28.4.orig/m4/Makefile.in 2009-12-15 10:12:58.000000000 +0100
++++ nautilus-2.28.4/m4/Makefile.in 2010-04-09 02:23:23.749092941 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -160,6 +160,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -160,6 +160,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20871,9 +20882,9 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.4/m4/libtool.m4
===================================================================
---- nautilus-2.28.4.orig/m4/libtool.m4 2010-04-09 01:58:08.634724196 +0200
-+++ nautilus-2.28.4/m4/libtool.m4 2010-04-09 01:59:08.514218862 +0200
-@@ -2445,7 +2445,7 @@ linux*oldld* | linux*aout* | linux*coff*
+--- nautilus-2.28.4.orig/m4/libtool.m4 2009-12-15 10:12:49.000000000 +0100
++++ nautilus-2.28.4/m4/libtool.m4 2010-04-09 02:23:05.733097046 +0200
+@@ -2445,7 +2445,7 @@
;;
# This must be Linux ELF.
@@ -20882,7 +20893,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2470,13 +2470,10 @@ linux* | k*bsd*-gnu)
+@@ -2470,13 +2470,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -20897,7 +20908,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -2488,6 +2485,18 @@ linux* | k*bsd*-gnu)
+@@ -2488,6 +2485,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -20916,7 +20927,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -3075,11 +3084,11 @@ irix5* | irix6* | nonstopux*)
+@@ -3075,11 +3084,11 @@
;;
# This must be Linux ELF.
@@ -20930,7 +20941,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
-@@ -3696,7 +3705,7 @@ m4_if([$1], [CXX], [
+@@ -3696,7 +3705,7 @@
;;
esac
;;
@@ -20939,7 +20950,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -3760,7 +3769,7 @@ m4_if([$1], [CXX], [
+@@ -3760,7 +3769,7 @@
;;
esac
;;
@@ -20948,7 +20959,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -3980,7 +3989,7 @@ m4_if([$1], [CXX], [
+@@ -3980,7 +3989,7 @@
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -20957,7 +20968,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -4185,6 +4194,9 @@ m4_if([$1], [CXX], [
+@@ -4185,6 +4194,9 @@
cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -20967,7 +20978,7 @@
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -4249,6 +4261,9 @@ dnl Note also adjust exclude_expsyms for
+@@ -4249,6 +4261,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -20977,7 +20988,7 @@
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4270,6 +4285,7 @@ dnl Note also adjust exclude_expsyms for
+@@ -4270,6 +4285,7 @@
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -20985,7 +20996,7 @@
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -4361,7 +4377,7 @@ _LT_EOF
+@@ -4361,7 +4377,7 @@
_LT_TAGVAR(archive_expsym_cmds, $1)='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'
;;
@@ -20994,7 +21005,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -4431,7 +4447,7 @@ _LT_EOF
+@@ -4431,7 +4447,7 @@
fi
;;
@@ -21003,7 +21014,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -4606,6 +4622,7 @@ _LT_EOF
+@@ -4606,6 +4622,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -21011,7 +21022,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -4844,7 +4861,7 @@ _LT_EOF
+@@ -4844,7 +4861,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -21020,7 +21031,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -5844,7 +5861,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -5844,7 +5861,7 @@
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
@@ -21031,8 +21042,8 @@
# Kuck and Associates, Inc. (KAI) C++ Compiler
Index: nautilus-2.28.4/m4/ltversion.m4
===================================================================
---- nautilus-2.28.4.orig/m4/ltversion.m4 2010-04-09 01:58:08.610718769 +0200
-+++ nautilus-2.28.4/m4/ltversion.m4 2010-04-09 01:59:08.890220437 +0200
+--- nautilus-2.28.4.orig/m4/ltversion.m4 2009-12-15 10:12:49.000000000 +0100
++++ nautilus-2.28.4/m4/ltversion.m4 2010-04-09 02:23:05.981096506 +0200
@@ -9,15 +9,15 @@
# Generated from ltversion.in.
More information about the pkg-gnome-commits
mailing list