r22113 - in /desktop/unstable/nautilus/debian: changelog control control.in nautilus-data.gconf-defaults nautilus.install patches/13_autostart.patch patches/90_relibtoolize.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Oct 24 13:33:27 UTC 2009
Author: joss
Date: Sat Oct 24 13:33:25 2009
New Revision: 22113
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22113
Log:
* nautilus-data.gconf-defaults: set exit_with_last_window to false so
that nautilus doesn’t go in a loop when show_desktop = false.
* 13_autostart.patch: removed, it is no longer necessary.
+ Automount works even when show_desktop = false. Closes: #538108.
+ Stop installing the autostart file as well.
+ Break gnome-session < 2.28 because of this change.
* Regenerate 90_relibtoolize.patch.
Removed:
desktop/unstable/nautilus/debian/patches/13_autostart.patch
Modified:
desktop/unstable/nautilus/debian/changelog
desktop/unstable/nautilus/debian/control
desktop/unstable/nautilus/debian/control.in
desktop/unstable/nautilus/debian/nautilus-data.gconf-defaults
desktop/unstable/nautilus/debian/nautilus.install
desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch
desktop/unstable/nautilus/debian/patches/series
Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=22113&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog [utf-8] (original)
+++ desktop/unstable/nautilus/debian/changelog [utf-8] Sat Oct 24 13:33:25 2009
@@ -1,4 +1,4 @@
-nautilus (2.28.1-1) UNRELEASED; urgency=low
+nautilus (2.28.1-1) unstable; urgency=low
[ Josselin Mouette ]
* Drop gnome-mount recommends, it’s already pulled by gvfs if needed
@@ -6,8 +6,6 @@
[ Andrea Veri ]
* New upstream release.
- * debian/patches/90_relibtoolize.patch:
- - refreshed
* debian/control:
- bumped standards-version to 3.8.3. No changes needed.
- bumped libtrackerclient-dev to >= 0.6.6 (lenny version),
@@ -16,7 +14,16 @@
- added missing ${misc:Depends} to both nautilus-dbg and
libnautilus-extension-dev making lintian stop complaining.
- -- Andrea Veri <andrea.veri89 at gmail.com> Sat, 24 Oct 2009 12:13:43 +0200
+ [ Josselin Mouette ]
+ * nautilus-data.gconf-defaults: set exit_with_last_window to false so
+ that nautilus doesn’t go in a loop when show_desktop = false.
+ * 13_autostart.patch: removed, it is no longer necessary.
+ + Automount works even when show_desktop = false. Closes: #538108.
+ + Stop installing the autostart file as well.
+ + Break gnome-session < 2.28 because of this change.
+ * Regenerate 90_relibtoolize.patch.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 24 Oct 2009 15:32:11 +0200
nautilus (2.28.0-2) unstable; urgency=low
Modified: desktop/unstable/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/control?rev=22113&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/control [utf-8] (original)
+++ desktop/unstable/nautilus/debian/control [utf-8] Sat Oct 24 13:33:25 2009
@@ -64,7 +64,8 @@
Conflicts: libnautilus2-2,
libnautilus2-dev
Breaks: gnome-volume-manager (<< 2.24),
- rhythmbox (<< 0.12)
+ rhythmbox (<< 0.12),
+ gnome-session (<< 2.28)
Replaces: libnautilus2-2
Description: file manager and graphical shell for GNOME
Nautilus is the official file manager for the GNOME desktop. It allows
Modified: desktop/unstable/nautilus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/control.in?rev=22113&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/control.in [utf-8] (original)
+++ desktop/unstable/nautilus/debian/control.in [utf-8] Sat Oct 24 13:33:25 2009
@@ -64,7 +64,8 @@
Conflicts: libnautilus2-2,
libnautilus2-dev
Breaks: gnome-volume-manager (<< 2.24),
- rhythmbox (<< 0.12)
+ rhythmbox (<< 0.12),
+ gnome-session (<< 2.28)
Replaces: libnautilus2-2
Description: file manager and graphical shell for GNOME
Nautilus is the official file manager for the GNOME desktop. It allows
Modified: desktop/unstable/nautilus/debian/nautilus-data.gconf-defaults
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/nautilus-data.gconf-defaults?rev=22113&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/nautilus-data.gconf-defaults [utf-8] (original)
+++ desktop/unstable/nautilus/debian/nautilus-data.gconf-defaults [utf-8] Sat Oct 24 13:33:25 2009
@@ -1,2 +1,3 @@
/apps/nautilus/preferences/media_autorun_x_content_ask []
/apps/nautilus/preferences/media_autorun_x_content_start_app [x-content/software,x-content/audio-cdda,x-content/video-dvd,x-content/audio-player,x-content/image-picturecd,x-content/video-hddvd,x-content/audio-dvd,x-content/video-bluray,x-content/blank-cd,x-content/blank-dvd,x-content/blank-bd,x-content/blank-hddvd]
+/apps/nautilus/preferences/exit_with_last_window false
Modified: desktop/unstable/nautilus/debian/nautilus.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/nautilus.install?rev=22113&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/nautilus.install [utf-8] (original)
+++ desktop/unstable/nautilus/debian/nautilus.install [utf-8] Sat Oct 24 13:33:25 2009
@@ -1,5 +1,4 @@
debian/tmp/usr/bin
debian/tmp/usr/lib/nautilus
debian/tmp/usr/share/applications
-debian/tmp/usr/share/gnome/autostart
debian/tmp/usr/share/man
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=22113&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch [utf-8] Sat Oct 24 13:33:25 2009
@@ -8,8 +8,8 @@
Index: nautilus-2.28.1/aclocal.m4
===================================================================
---- nautilus-2.28.1.orig/aclocal.m4 2009-10-20 11:17:52.000000000 +0000
-+++ nautilus-2.28.1/aclocal.m4 2009-10-24 10:11:17.000000000 +0000
+--- nautilus-2.28.1.orig/aclocal.m4 2009-10-20 13:17:52.000000000 +0200
++++ nautilus-2.28.1/aclocal.m4 2009-10-24 15:18:08.341760215 +0200
@@ -13,1664 +13,1666 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -3162,8 +3162,8 @@
m4_include([m4/intltool.m4])
Index: nautilus-2.28.1/config.guess
===================================================================
---- nautilus-2.28.1.orig/config.guess 2009-10-20 11:17:55.000000000 +0000
-+++ nautilus-2.28.1/config.guess 2009-10-24 10:11:17.000000000 +0000
+--- nautilus-2.28.1.orig/config.guess 2009-10-20 13:17:55.000000000 +0200
++++ nautilus-2.28.1/config.guess 2009-10-24 15:18:08.341760215 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -3177,7 +3177,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
-@@ -170,7 +170,7 @@
+@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -3186,7 +3186,7 @@
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
-@@ -656,7 +656,7 @@
+@@ -656,7 +656,7 @@ EOF
# => hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
@@ -3195,7 +3195,7 @@
then
HP_ARCH="hppa2.0w"
else
-@@ -822,6 +822,9 @@
+@@ -822,6 +822,9 @@ EOF
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -3205,7 +3205,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
-@@ -882,40 +885,17 @@
+@@ -882,40 +885,17 @@ EOF
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
@@ -3251,7 +3251,7 @@
#else
CPU=
#endif
-@@ -947,7 +927,7 @@
+@@ -947,7 +927,7 @@ EOF
EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
@@ -3260,7 +3260,7 @@
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit ;;
-@@ -1001,14 +981,6 @@
+@@ -1001,14 +981,6 @@ EOF
elf32-i386)
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
;;
@@ -3275,7 +3275,7 @@
esac
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
-@@ -1074,7 +1046,7 @@
+@@ -1074,7 +1046,7 @@ EOF
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
@@ -3284,7 +3284,7 @@
echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
-@@ -1182,7 +1154,7 @@
+@@ -1182,7 +1154,7 @@ EOF
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
@@ -3295,8 +3295,8 @@
SM[BE]S:UNIX_SV:*:*)
Index: nautilus-2.28.1/config.h.in
===================================================================
---- nautilus-2.28.1.orig/config.h.in 2009-10-20 11:17:54.000000000 +0000
-+++ nautilus-2.28.1/config.h.in 2009-10-24 10:11:17.000000000 +0000
+--- nautilus-2.28.1.orig/config.h.in 2009-10-20 13:17:54.000000000 +0200
++++ nautilus-2.28.1/config.h.in 2009-10-24 15:18:08.341760215 +0200
@@ -160,6 +160,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -3309,8 +3309,8 @@
Index: nautilus-2.28.1/configure
===================================================================
---- nautilus-2.28.1.orig/configure 2009-10-20 11:17:54.000000000 +0000
-+++ nautilus-2.28.1/configure 2009-10-24 10:12:07.000000000 +0000
+--- nautilus-2.28.1.orig/configure 2009-10-20 13:17:54.000000000 +0200
++++ nautilus-2.28.1/configure 2009-10-24 15:18:08.393758931 +0200
@@ -1,20 +1,22 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -3340,7 +3340,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -22,23 +24,15 @@
+@@ -22,23 +24,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -3369,7 +3369,7 @@
as_nl='
'
export as_nl
-@@ -46,7 +40,13 @@
+@@ -46,7 +40,13 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -3384,7 +3384,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -57,7 +57,7 @@
+@@ -57,7 +57,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -3393,7 +3393,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -80,13 +80,6 @@
+@@ -80,13 +80,6 @@ if test "${PATH_SEPARATOR+set}" != set;
}
fi
@@ -3407,7 +3407,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -96,15 +89,15 @@
+@@ -96,15 +89,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -3426,7 +3426,7 @@
IFS=$as_save_IFS
;;
-@@ -116,12 +109,16 @@
+@@ -116,12 +109,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -3447,7 +3447,7 @@
done
PS1='$ '
PS2='> '
-@@ -133,330 +130,301 @@
+@@ -133,330 +130,301 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
@@ -4025,7 +4025,7 @@
sed -n '
p
/[$]LINENO/=
-@@ -473,8 +441,7 @@
+@@ -473,8 +441,7 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
@@ -4035,7 +4035,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 +451,18 @@
+@@ -484,29 +451,18 @@ test \$exitcode = 0") || {
exit
}
@@ -4070,7 +4070,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -536,7 +492,7 @@
+@@ -536,7 +492,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
@@ -4079,7 +4079,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -555,10 +511,10 @@
+@@ -555,10 +511,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
@@ -4092,7 +4092,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -573,7 +529,6 @@
+@@ -573,7 +529,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
@@ -4100,7 +4100,7 @@
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
-@@ -740,7 +695,6 @@
+@@ -740,7 +695,6 @@ cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
@@ -4108,7 +4108,7 @@
# Identity of this package.
PACKAGE_NAME='nautilus'
-@@ -748,6 +702,7 @@
+@@ -748,6 +702,7 @@ PACKAGE_TARNAME='nautilus'
PACKAGE_VERSION='2.28.1'
PACKAGE_STRING='nautilus 2.28.1'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus'
@@ -4116,7 +4116,7 @@
ac_unique_file="src"
# Factoring default headers for most tests.
-@@ -1016,6 +971,7 @@
+@@ -1016,6 +971,7 @@ bindir
program_transform_name
prefix
exec_prefix
@@ -4124,7 +4124,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1184,8 +1140,7 @@
+@@ -1184,8 +1140,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4134,7 +4134,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1211,8 +1166,7 @@
+@@ -1211,8 +1166,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4144,7 +4144,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1416,8 +1370,7 @@
+@@ -1416,8 +1370,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4154,7 +4154,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1433,8 +1386,7 @@
+@@ -1433,8 +1386,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4164,7 +4164,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1464,17 +1416,17 @@
+@@ -1464,17 +1416,17 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -4188,7 +4188,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1491,15 +1443,13 @@
+@@ -1491,15 +1443,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -4206,7 +4206,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1522,8 +1472,7 @@
+@@ -1522,8 +1472,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -4216,7 +4216,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1553,11 +1502,9 @@
+@@ -1553,11 +1502,9 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -4230,7 +4230,7 @@
# Find the source files, if location was not specified.
-@@ -1596,13 +1543,11 @@
+@@ -1596,13 +1543,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -4246,7 +4246,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1846,21 +1791,378 @@
+@@ -1846,21 +1791,378 @@ test -n "$ac_init_help" && exit $ac_stat
if $ac_init_version; then
cat <<\_ACEOF
nautilus configure 2.28.1
@@ -4629,7 +4629,7 @@
$ $0 $@
-@@ -1896,8 +2198,8 @@
+@@ -1896,8 +2198,8 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4640,7 +4640,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1934,9 +2236,9 @@
+@@ -1934,9 +2236,9 @@ do
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -4652,7 +4652,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1952,13 +2254,13 @@
+@@ -1952,13 +2254,13 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -4669,7 +4669,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -1983,13 +2285,13 @@
+@@ -1983,13 +2285,13 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -4685,7 +4685,7 @@
esac ;;
esac
done
-@@ -2061,39 +2363,41 @@
+@@ -2061,39 +2363,41 @@ _ASBOX
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -4732,7 +4732,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2112,7 +2416,7 @@
+@@ -2112,7 +2416,7 @@ for ac_site_file in "$ac_site_file1" "$a
do
test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
@@ -4741,7 +4741,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2123,7 +2427,7 @@
+@@ -2123,7 +2427,7 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
@@ -4750,7 +4750,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2131,7 +2435,7 @@
+@@ -2131,7 +2435,7 @@ $as_echo "$as_me: loading cache $cache_f
esac
fi
else
@@ -4759,7 +4759,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2146,11 +2450,11 @@
+@@ -2146,11 +2450,11 @@ for ac_var in $ac_precious_vars; do
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -4773,7 +4773,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2160,17 +2464,17 @@
+@@ -2160,17 +2464,17 @@ $as_echo "$as_me: error: \`$ac_var' was
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -4795,7 +4795,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2182,43 +2486,20 @@
+@@ -2182,43 +2486,20 @@ $as_echo "$as_me: current value: \`$ac
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -4846,7 +4846,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2238,24 +2519,16 @@
+@@ -2238,24 +2519,16 @@ am__api_version='1.11'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -4879,7 +4879,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2281,10 +2554,10 @@
+@@ -2281,10 +2554,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
@@ -4892,7 +4892,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2292,11 +2565,11 @@
+@@ -2292,11 +2565,11 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4908,7 +4908,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2333,7 +2606,7 @@
+@@ -2333,7 +2606,7 @@ case $as_dir/ in
;;
esac
@@ -4917,7 +4917,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2349,7 +2622,7 @@
+@@ -2349,7 +2622,7 @@ fi
INSTALL=$ac_install_sh
fi
fi
@@ -4926,7 +4926,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2360,7 +2633,7 @@
+@@ -2360,7 +2633,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -4935,7 +4935,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2371,15 +2644,11 @@
+@@ -2371,15 +2644,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -4953,7 +4953,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2401,11 +2670,8 @@
+@@ -2401,11 +2670,8 @@ if (
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -4967,7 +4967,7 @@
fi
test "$2" = conftest.file
-@@ -2414,13 +2680,10 @@
+@@ -2414,13 +2680,10 @@ then
# Ok.
:
else
@@ -4984,7 +4984,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2448,7 +2711,7 @@
+@@ -2448,7 +2711,7 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -4993,7 +4993,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2469,9 +2732,9 @@
+@@ -2469,9 +2732,9 @@ if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -5005,7 +5005,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2482,24 +2745,24 @@
+@@ -2482,24 +2745,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5035,7 +5035,7 @@
$as_echo "no" >&6; }
fi
-@@ -2509,9 +2772,9 @@
+@@ -2509,9 +2772,9 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -5047,7 +5047,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2522,24 +2785,24 @@
+@@ -2522,24 +2785,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5077,7 +5077,7 @@
$as_echo "no" >&6; }
fi
-@@ -2548,7 +2811,7 @@
+@@ -2548,7 +2811,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5086,7 +5086,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2561,10 +2824,10 @@
+@@ -2561,10 +2824,10 @@ fi
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -5099,7 +5099,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2572,7 +2835,7 @@
+@@ -2572,7 +2835,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5108,7 +5108,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,7 +2847,7 @@
+@@ -2584,7 +2847,7 @@ do
esac
done
done
@@ -5117,7 +5117,7 @@
IFS=$as_save_IFS
fi
-@@ -2600,7 +2863,7 @@
+@@ -2600,7 +2863,7 @@ fi
MKDIR_P="$ac_install_sh -d"
fi
fi
@@ -5126,7 +5126,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2613,9 +2876,9 @@
+@@ -2613,9 +2876,9 @@ for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -5138,7 +5138,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2626,24 +2889,24 @@
+@@ -2626,24 +2889,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5168,7 +5168,7 @@
$as_echo "no" >&6; }
fi
-@@ -2651,11 +2914,11 @@
+@@ -2651,11 +2914,11 @@ fi
test -n "$AWK" && break
done
@@ -5182,7 +5182,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2673,11 +2936,11 @@
+@@ -2673,11 +2936,11 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -5196,7 +5196,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2697,9 +2960,7 @@
+@@ -2697,9 +2960,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -5207,7 +5207,7 @@
fi
fi
-@@ -2750,7 +3011,7 @@
+@@ -2750,7 +3011,7 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma
AMTAR=${AMTAR-"${am_missing_run}tar"}
@@ -5216,7 +5216,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 +3084,13 @@
+@@ -2823,13 +3084,13 @@ do
done
rm -rf conftest.dir
@@ -5232,7 +5232,7 @@
$as_echo "$am_cv_prog_tar_ustar" >&6; }
-@@ -2837,16 +3098,16 @@
+@@ -2837,16 +3098,16 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
@@ -5252,7 +5252,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2889,7 +3150,7 @@
+@@ -2889,7 +3150,7 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -5261,7 +5261,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -2917,12 +3178,12 @@
+@@ -2917,12 +3178,12 @@ if test "$am__include" = "#"; then
fi
@@ -5276,7 +5276,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -2947,9 +3208,9 @@
+@@ -2947,9 +3208,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -5288,7 +5288,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2960,24 +3221,24 @@
+@@ -2960,24 +3221,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5318,7 +5318,7 @@
$as_echo "no" >&6; }
fi
-@@ -2987,9 +3248,9 @@
+@@ -2987,9 +3248,9 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -5330,7 +5330,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3000,24 +3261,24 @@
+@@ -3000,24 +3261,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5360,7 +5360,7 @@
$as_echo "no" >&6; }
fi
-@@ -3026,7 +3287,7 @@
+@@ -3026,7 +3287,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5369,7 +5369,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3040,9 +3301,9 @@
+@@ -3040,9 +3301,9 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -5381,7 +5381,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3053,24 +3314,24 @@
+@@ -3053,24 +3314,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5411,7 +5411,7 @@
$as_echo "no" >&6; }
fi
-@@ -3080,9 +3341,9 @@
+@@ -3080,9 +3341,9 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -5423,7 +5423,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3094,18 +3355,18 @@
+@@ -3094,18 +3355,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5445,7 +5445,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3124,10 +3385,10 @@
+@@ -3124,10 +3385,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -5458,7 +5458,7 @@
$as_echo "no" >&6; }
fi
-@@ -3139,9 +3400,9 @@
+@@ -3139,9 +3400,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -5470,7 +5470,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3152,24 +3413,24 @@
+@@ -3152,24 +3413,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5500,7 +5500,7 @@
$as_echo "no" >&6; }
fi
-@@ -3183,9 +3444,9 @@
+@@ -3183,9 +3444,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -5512,7 +5512,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3196,24 +3457,24 @@
+@@ -3196,24 +3457,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5542,7 +5542,7 @@
$as_echo "no" >&6; }
fi
-@@ -3226,7 +3487,7 @@
+@@ -3226,7 +3487,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5551,7 +5551,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3237,73 +3498,55 @@
+@@ -3237,73 +3498,55 @@ fi
fi
@@ -5650,7 +5650,7 @@
$as_echo_n "checking for C compiler default output file name... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-@@ -3320,17 +3563,17 @@
+@@ -3320,17 +3563,17 @@ do
done
rm -f $ac_rmfiles
@@ -5673,7 +5673,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 +3590,7 @@
+@@ -3347,7 +3590,7 @@ do
# certainly right.
break;;
*.* )
@@ -5682,7 +5682,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3366,84 +3609,75 @@
+@@ -3366,84 +3609,75 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
else
ac_file=''
fi
@@ -5792,7 +5792,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 +3692,24 @@
+@@ -3458,32 +3692,24 @@ for ac_file in conftest.exe conftest con
esac
done
else
@@ -5832,7 +5832,7 @@
/* end confdefs.h. */
int
-@@ -3495,17 +3721,17 @@
+@@ -3495,17 +3721,17 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -5855,7 +5855,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3518,31 +3744,23 @@
+@@ -3518,31 +3744,23 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -5894,7 +5894,7 @@
/* end confdefs.h. */
int
-@@ -3556,37 +3774,16 @@
+@@ -3556,37 +3774,16 @@ main ()
return 0;
}
_ACEOF
@@ -5935,7 +5935,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3595,20 +3792,16 @@
+@@ -3595,20 +3792,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -5959,7 +5959,7 @@
/* end confdefs.h. */
int
-@@ -3619,35 +3812,11 @@
+@@ -3619,35 +3812,11 @@ main ()
return 0;
}
_ACEOF
@@ -5998,7 +5998,7 @@
/* end confdefs.h. */
int
-@@ -3658,36 +3827,12 @@
+@@ -3658,36 +3827,12 @@ main ()
return 0;
}
_ACEOF
@@ -6039,7 +6039,7 @@
/* end confdefs.h. */
int
-@@ -3698,42 +3843,17 @@
+@@ -3698,42 +3843,17 @@ main ()
return 0;
}
_ACEOF
@@ -6084,7 +6084,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3750,18 +3870,14 @@
+@@ -3750,18 +3870,14 @@ else
CFLAGS=
fi
fi
@@ -6106,7 +6106,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3818,32 +3934,9 @@
+@@ -3818,32 +3934,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -6140,7 +6140,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3854,17 +3947,19 @@
+@@ -3854,17 +3947,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -6163,7 +6163,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3874,9 +3969,9 @@
+@@ -3874,9 +3969,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -6175,7 +6175,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3984,7 +4079,7 @@
+@@ -3984,7 +4079,7 @@ else
fi
fi
@@ -6184,7 +6184,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4005,14 +4100,14 @@
+@@ -4005,14 +4100,14 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -6201,7 +6201,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -4027,11 +4122,7 @@
+@@ -4027,11 +4122,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -6214,7 +6214,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4040,78 +4131,34 @@
+@@ -4040,78 +4131,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -6298,7 +6298,7 @@
break
fi
-@@ -4123,7 +4170,7 @@
+@@ -4123,7 +4170,7 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
@@ -6307,7 +6307,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -4134,11 +4181,7 @@
+@@ -4134,11 +4181,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -6320,7 +6320,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4147,87 +4190,40 @@
+@@ -4147,87 +4190,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -6417,7 +6417,7 @@
fi
ac_ext=c
-@@ -4237,9 +4233,9 @@
+@@ -4237,9 +4233,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -6429,7 +6429,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4250,7 +4246,7 @@
+@@ -4250,7 +4246,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6438,7 +6438,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 +4266,7 @@
+@@ -4270,7 +4266,7 @@ case `"$ac_path_GREP" --version 2>&1` in
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -6447,7 +6447,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 +4281,24 @@
+@@ -4285,26 +4281,24 @@ esac
$ac_path_GREP_found && break 3
done
done
@@ -6479,7 +6479,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4318,7 +4312,7 @@
+@@ -4318,7 +4312,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6488,7 +6488,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 +4332,7 @@
+@@ -4338,7 +4332,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -6497,7 +6497,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 +4347,10 @@
+@@ -4353,12 +4347,10 @@ esac
$ac_path_EGREP_found && break 3
done
done
@@ -6512,7 +6512,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4366,21 +4358,17 @@
+@@ -4366,21 +4358,17 @@ fi
fi
fi
@@ -6538,7 +6538,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -4395,48 +4383,23 @@
+@@ -4395,48 +4383,23 @@ main ()
return 0;
}
_ACEOF
@@ -6592,7 +6592,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4446,18 +4409,14 @@
+@@ -4446,18 +4409,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -6614,7 +6614,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4467,14 +4426,10 @@
+@@ -4467,14 +4426,10 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -6631,7 +6631,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -4501,118 +4456,34 @@
+@@ -4501,118 +4456,34 @@ main ()
return 0;
}
_ACEOF
@@ -6763,7 +6763,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -4622,19 +4493,14 @@
+@@ -4622,19 +4493,14 @@ fi
done
@@ -6786,7 +6786,7 @@
/* end confdefs.h. */
#ifndef __APPLE_CC__
not a universal capable compiler
-@@ -4642,46 +4508,34 @@
+@@ -4642,46 +4508,34 @@ cat >>conftest.$ac_ext <<_ACEOF
typedef int dummy;
_ACEOF
@@ -6855,7 +6855,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-@@ -4699,30 +4553,9 @@
+@@ -4699,30 +4553,9 @@ main ()
return 0;
}
_ACEOF
@@ -6888,7 +6888,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-@@ -4738,49 +4571,18 @@
+@@ -4738,49 +4571,18 @@ main ()
return 0;
}
_ACEOF
@@ -6941,7 +6941,7 @@
/* end confdefs.h. */
#include <limits.h>
-@@ -4795,30 +4597,9 @@
+@@ -4795,30 +4597,9 @@ main ()
return 0;
}
_ACEOF
@@ -6974,7 +6974,7 @@
/* end confdefs.h. */
#include <limits.h>
-@@ -4833,51 +4614,20 @@
+@@ -4833,51 +4614,20 @@ main ()
return 0;
}
_ACEOF
@@ -7030,7 +7030,7 @@
/* end confdefs.h. */
short int ascii_mm[] =
{ 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-@@ -4903,24 +4653,7 @@
+@@ -4903,24 +4653,7 @@ return use_ascii (foo) == use_ebcdic (fo
return 0;
}
_ACEOF
@@ -7056,7 +7056,7 @@
if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
ac_cv_c_bigendian=yes
fi
-@@ -4932,20 +4665,10 @@
+@@ -4932,20 +4665,10 @@ $as_echo "$ac_try_echo") >&5
ac_cv_c_bigendian=unknown
fi
fi
@@ -7078,7 +7078,7 @@
/* end confdefs.h. */
$ac_includes_default
int
-@@ -4965,79 +4688,41 @@
+@@ -4965,79 +4688,41 @@ main ()
return 0;
}
_ACEOF
@@ -7170,7 +7170,7 @@
/* end confdefs.h. */
int
-@@ -5097,41 +4782,18 @@
+@@ -5097,41 +4782,18 @@ main ()
return 0;
}
_ACEOF
@@ -7216,7 +7216,7 @@
fi
-@@ -5143,9 +4805,9 @@
+@@ -5143,9 +4805,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -7228,7 +7228,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5156,24 +4818,24 @@
+@@ -5156,24 +4818,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7258,7 +7258,7 @@
$as_echo "no" >&6; }
fi
-@@ -5183,9 +4845,9 @@
+@@ -5183,9 +4845,9 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -7270,7 +7270,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -5196,24 +4858,24 @@
+@@ -5196,24 +4858,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7300,7 +7300,7 @@
$as_echo "no" >&6; }
fi
-@@ -5222,7 +4884,7 @@
+@@ -5222,7 +4884,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7309,7 +7309,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5236,9 +4898,9 @@
+@@ -5236,9 +4898,9 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -7321,7 +7321,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5249,24 +4911,24 @@
+@@ -5249,24 +4911,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7351,7 +7351,7 @@
$as_echo "no" >&6; }
fi
-@@ -5276,9 +4938,9 @@
+@@ -5276,9 +4938,9 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -7363,7 +7363,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5290,18 +4952,18 @@
+@@ -5290,18 +4952,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7385,7 +7385,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -5320,10 +4982,10 @@
+@@ -5320,10 +4982,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7398,7 +7398,7 @@
$as_echo "no" >&6; }
fi
-@@ -5335,9 +4997,9 @@
+@@ -5335,9 +4997,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -7410,7 +7410,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5348,24 +5010,24 @@
+@@ -5348,24 +5010,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7440,7 +7440,7 @@
$as_echo "no" >&6; }
fi
-@@ -5379,9 +5041,9 @@
+@@ -5379,9 +5041,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -7452,7 +7452,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -5392,24 +5054,24 @@
+@@ -5392,24 +5054,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7482,7 +7482,7 @@
$as_echo "no" >&6; }
fi
-@@ -5422,7 +5084,7 @@
+@@ -5422,7 +5084,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7491,7 +7491,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5433,62 +5095,42 @@
+@@ -5433,62 +5095,42 @@ fi
fi
@@ -7576,7 +7576,7 @@
/* end confdefs.h. */
int
-@@ -5502,37 +5144,16 @@
+@@ -5502,37 +5144,16 @@ main ()
return 0;
}
_ACEOF
@@ -7617,7 +7617,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -5541,20 +5162,16 @@
+@@ -5541,20 +5162,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -7641,7 +7641,7 @@
/* end confdefs.h. */
int
-@@ -5565,35 +5182,11 @@
+@@ -5565,35 +5182,11 @@ main ()
return 0;
}
_ACEOF
@@ -7680,7 +7680,7 @@
/* end confdefs.h. */
int
-@@ -5604,36 +5197,12 @@
+@@ -5604,36 +5197,12 @@ main ()
return 0;
}
_ACEOF
@@ -7721,7 +7721,7 @@
/* end confdefs.h. */
int
-@@ -5644,42 +5213,17 @@
+@@ -5644,42 +5213,17 @@ main ()
return 0;
}
_ACEOF
@@ -7766,7 +7766,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -5696,18 +5240,14 @@
+@@ -5696,18 +5240,14 @@ else
CFLAGS=
fi
fi
@@ -7788,7 +7788,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -5764,32 +5304,9 @@
+@@ -5764,32 +5304,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -7822,7 +7822,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -5800,17 +5317,19 @@
+@@ -5800,17 +5317,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -7845,7 +7845,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5820,9 +5339,9 @@
+@@ -5820,9 +5339,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -7857,7 +7857,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5930,7 +5449,7 @@
+@@ -5930,7 +5449,7 @@ else
fi
fi
@@ -7866,7 +7866,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -5950,14 +5469,14 @@
+@@ -5950,14 +5469,14 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -7883,7 +7883,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -5972,11 +5491,7 @@
+@@ -5972,11 +5491,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -7896,7 +7896,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5985,78 +5500,34 @@
+@@ -5985,78 +5500,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -7980,7 +7980,7 @@
break
fi
-@@ -6068,7 +5539,7 @@
+@@ -6068,7 +5539,7 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
@@ -7989,7 +7989,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -6079,11 +5550,7 @@
+@@ -6079,11 +5550,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -8002,7 +8002,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -6092,87 +5559,40 @@
+@@ -6092,87 +5559,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -8099,7 +8099,7 @@
fi
ac_ext=c
-@@ -6181,115 +5601,23 @@
+@@ -6181,115 +5601,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -8220,7 +8220,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -6307,17 +5635,17 @@
+@@ -6307,17 +5635,17 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -8241,7 +8241,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -6349,35 +5677,27 @@
+@@ -6349,35 +5677,27 @@ fi
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -8284,7 +8284,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -6393,28 +5713,24 @@
+@@ -6393,28 +5713,24 @@ IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -8318,7 +8318,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -6437,9 +5753,9 @@
+@@ -6437,9 +5753,9 @@ case $host in
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
set dummy ${ac_tool_prefix}as; ac_word=$2
@@ -8330,7 +8330,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AS"; then
-@@ -6450,24 +5766,24 @@
+@@ -6450,24 +5766,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8360,7 +8360,7 @@
$as_echo "no" >&6; }
fi
-@@ -6477,9 +5793,9 @@
+@@ -6477,9 +5793,9 @@ if test -z "$ac_cv_prog_AS"; then
ac_ct_AS=$AS
# Extract the first word of "as", so it can be a program name with args.
set dummy as; ac_word=$2
@@ -8372,7 +8372,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AS"; then
-@@ -6490,24 +5806,24 @@
+@@ -6490,24 +5806,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8402,7 +8402,7 @@
$as_echo "no" >&6; }
fi
-@@ -6516,7 +5832,7 @@
+@@ -6516,7 +5832,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8411,7 +8411,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6529,9 +5845,9 @@
+@@ -6529,9 +5845,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
set dummy ${ac_tool_prefix}dlltool; ac_word=$2
@@ -8423,7 +8423,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DLLTOOL"; then
-@@ -6542,24 +5858,24 @@
+@@ -6542,24 +5858,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8453,7 +8453,7 @@
$as_echo "no" >&6; }
fi
-@@ -6569,9 +5885,9 @@
+@@ -6569,9 +5885,9 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
ac_ct_DLLTOOL=$DLLTOOL
# Extract the first word of "dlltool", so it can be a program name with args.
set dummy dlltool; ac_word=$2
@@ -8465,7 +8465,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DLLTOOL"; then
-@@ -6582,24 +5898,24 @@
+@@ -6582,24 +5898,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8495,7 +8495,7 @@
$as_echo "no" >&6; }
fi
-@@ -6608,7 +5924,7 @@
+@@ -6608,7 +5924,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8504,7 +8504,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6621,9 +5937,9 @@
+@@ -6621,9 +5937,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -8516,7 +8516,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -6634,24 +5950,24 @@
+@@ -6634,24 +5950,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8546,7 +8546,7 @@
$as_echo "no" >&6; }
fi
-@@ -6661,9 +5977,9 @@
+@@ -6661,9 +5977,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -8558,7 +8558,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -6674,24 +5990,24 @@
+@@ -6674,24 +5990,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8588,7 +8588,7 @@
$as_echo "no" >&6; }
fi
-@@ -6700,7 +6016,7 @@
+@@ -6700,7 +6016,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8597,7 +8597,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6735,7 +6051,7 @@
+@@ -6735,7 +6051,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
case `pwd` in
*\ * | *\ *)
@@ -8606,7 +8606,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -6758,9 +6074,9 @@
+@@ -6758,9 +6074,9 @@ macro_revision='1.3012'
ltmain="$ac_aux_dir/ltmain.sh"
@@ -8618,7 +8618,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -6768,7 +6084,7 @@
+@@ -6768,7 +6084,7 @@ else
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -8627,7 +8627,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 +6093,7 @@
+@@ -6777,7 +6093,7 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8636,7 +8636,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 +6113,7 @@
+@@ -6797,7 +6113,7 @@ case `"$ac_path_SED" --version 2>&1` in
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -8645,7 +8645,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 +6128,17 @@
+@@ -6812,19 +6128,17 @@ esac
$ac_path_SED_found && break 3
done
done
@@ -8668,7 +8668,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -6842,9 +6156,9 @@
+@@ -6842,9 +6156,9 @@ Xsed="$SED -e 1s/^X//"
@@ -8680,7 +8680,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -6858,7 +6172,7 @@
+@@ -6858,7 +6172,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8689,7 +8689,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 +6192,7 @@
+@@ -6878,7 +6192,7 @@ case `"$ac_path_FGREP" --version 2>&1` i
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -8698,7 +8698,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 +6207,10 @@
+@@ -6893,12 +6207,10 @@ esac
$ac_path_FGREP_found && break 3
done
done
@@ -8713,7 +8713,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -6906,7 +6218,7 @@
+@@ -6906,7 +6218,7 @@ fi
fi
fi
@@ -8722,7 +8722,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -6932,7 +6244,7 @@
+@@ -6932,7 +6244,7 @@ test -z "$GREP" && GREP=grep
# Check whether --with-gnu-ld was given.
@@ -8731,7 +8731,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -6941,7 +6253,7 @@
+@@ -6941,7 +6253,7 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -8740,7 +8740,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -6971,13 +6283,13 @@
+@@ -6971,13 +6283,13 @@ $as_echo_n "checking for ld used by $CC.
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -8757,7 +8757,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -7008,18 +6320,16 @@
+@@ -7008,18 +6320,16 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -8781,7 +8781,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -7032,7 +6342,7 @@
+@@ -7032,7 +6342,7 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
@@ -8790,7 +8790,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -7044,9 +6354,9 @@
+@@ -7044,9 +6354,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -8802,7 +8802,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -7093,7 +6403,7 @@
+@@ -7093,7 +6403,7 @@ else
: ${lt_cv_path_NM=no}
fi
fi
@@ -8811,7 +8811,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -7104,9 +6414,9 @@
+@@ -7104,9 +6414,9 @@ else
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -8823,7 +8823,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -7117,24 +6427,24 @@
+@@ -7117,24 +6427,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8853,7 +8853,7 @@
$as_echo "no" >&6; }
fi
-@@ -7148,9 +6458,9 @@
+@@ -7148,9 +6458,9 @@ if test -z "$DUMPBIN"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -8865,7 +8865,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -7161,24 +6471,24 @@
+@@ -7161,24 +6471,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8895,7 +8895,7 @@
$as_echo "no" >&6; }
fi
-@@ -7191,7 +6501,7 @@
+@@ -7191,7 +6501,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8904,7 +8904,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7211,33 +6521,33 @@
+@@ -7211,33 +6521,33 @@ test -z "$NM" && NM=nm
@@ -8946,7 +8946,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -7355,10 +6665,10 @@
+@@ -7355,10 +6665,10 @@ else
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -8959,7 +8959,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -7372,7 +6682,7 @@
+@@ -7372,7 +6682,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -8968,7 +8968,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -7382,17 +6692,17 @@
+@@ -7382,17 +6692,17 @@ xsi_shell=no
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -8989,7 +8989,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -7427,14 +6737,14 @@
+@@ -7427,14 +6737,14 @@ esac
@@ -9007,7 +9007,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -7463,9 +6773,9 @@
+@@ -7463,9 +6773,9 @@ esac
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -9019,7 +9019,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -7476,24 +6786,24 @@
+@@ -7476,24 +6786,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9049,7 +9049,7 @@
$as_echo "no" >&6; }
fi
-@@ -7503,9 +6813,9 @@
+@@ -7503,9 +6813,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -9061,7 +9061,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -7516,24 +6826,24 @@
+@@ -7516,24 +6826,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9091,7 +9091,7 @@
$as_echo "no" >&6; }
fi
-@@ -7542,7 +6852,7 @@
+@@ -7542,7 +6852,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9100,7 +9100,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7559,9 +6869,9 @@
+@@ -7559,9 +6869,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
@@ -9112,7 +9112,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -7680,7 +6990,7 @@
+@@ -7680,7 +6990,7 @@ linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -9121,7 +9121,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 +7065,7 @@
+@@ -7755,7 +7065,7 @@ tpf*)
esac
fi
@@ -9130,7 +9130,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 +7085,9 @@
+@@ -7775,9 +7085,9 @@ test -z "$deplibs_check_method" && depli
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -9142,7 +9142,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -7788,24 +7098,24 @@
+@@ -7788,24 +7098,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9172,7 +9172,7 @@
$as_echo "no" >&6; }
fi
-@@ -7815,9 +7125,9 @@
+@@ -7815,9 +7125,9 @@ if test -z "$ac_cv_prog_AR"; then
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -9184,7 +9184,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -7828,24 +7138,24 @@
+@@ -7828,24 +7138,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9214,7 +9214,7 @@
$as_echo "no" >&6; }
fi
-@@ -7854,7 +7164,7 @@
+@@ -7854,7 +7164,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9223,7 +9223,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7880,9 +7190,9 @@
+@@ -7880,9 +7190,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -9235,7 +9235,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -7893,24 +7203,24 @@
+@@ -7893,24 +7203,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9265,7 +9265,7 @@
$as_echo "no" >&6; }
fi
-@@ -7920,9 +7230,9 @@
+@@ -7920,9 +7230,9 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -9277,7 +9277,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -7933,24 +7243,24 @@
+@@ -7933,24 +7243,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9307,7 +9307,7 @@
$as_echo "no" >&6; }
fi
-@@ -7959,7 +7269,7 @@
+@@ -7959,7 +7269,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9316,7 +9316,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7979,9 +7289,9 @@
+@@ -7979,9 +7289,9 @@ test -z "$STRIP" && STRIP=:
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -9328,7 +9328,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -7992,24 +7302,24 @@
+@@ -7992,24 +7302,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9358,7 +9358,7 @@
$as_echo "no" >&6; }
fi
-@@ -8019,9 +7329,9 @@
+@@ -8019,9 +7329,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -9370,7 +9370,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -8032,24 +7342,24 @@
+@@ -8032,24 +7342,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9400,7 +9400,7 @@
$as_echo "no" >&6; }
fi
-@@ -8058,7 +7368,7 @@
+@@ -8058,7 +7368,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9409,7 +9409,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8136,9 +7446,9 @@
+@@ -8136,9 +7446,9 @@ compiler=$CC
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -9421,7 +9421,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -8254,18 +7564,18 @@
+@@ -8254,18 +7564,18 @@ void nm_test_func(void){}
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -9446,7 +9446,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -8318,11 +7628,11 @@
+@@ -8318,11 +7628,11 @@ _LT_EOF
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -9461,7 +9461,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -8356,10 +7666,10 @@
+@@ -8356,10 +7666,10 @@ if test -z "$lt_cv_sys_global_symbol_pip
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -9474,7 +9474,7 @@
$as_echo "ok" >&6; }
fi
-@@ -8385,7 +7695,7 @@
+@@ -8385,7 +7695,7 @@ fi
# Check whether --enable-libtool-lock was given.
@@ -9483,7 +9483,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -8397,11 +7707,11 @@
+@@ -8397,11 +7707,11 @@ case $host in
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9498,7 +9498,7 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -8415,12 +7725,12 @@
+@@ -8415,12 +7725,12 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -9515,7 +9515,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -8454,11 +7764,11 @@
+@@ -8454,11 +7764,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9530,7 +9530,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -8507,9 +7817,9 @@
+@@ -8507,9 +7817,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -9542,7 +9542,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -8518,11 +7828,7 @@
+@@ -8518,11 +7828,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -9555,7 +9555,7 @@
/* end confdefs.h. */
int
-@@ -8533,38 +7839,13 @@
+@@ -8533,38 +7839,13 @@ main ()
return 0;
}
_ACEOF
@@ -9598,7 +9598,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -8572,7 +7853,7 @@
+@@ -8572,7 +7853,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -9607,7 +9607,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 +7863,11 @@
+@@ -8582,11 +7863,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9622,7 +9622,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -8612,9 +7893,9 @@
+@@ -8612,9 +7893,9 @@ need_locks="$enable_libtool_lock"
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -9634,7 +9634,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -8625,24 +7906,24 @@
+@@ -8625,24 +7906,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9664,7 +9664,7 @@
$as_echo "no" >&6; }
fi
-@@ -8652,9 +7933,9 @@
+@@ -8652,9 +7933,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
@@ -9676,7 +9676,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -8665,24 +7946,24 @@
+@@ -8665,24 +7946,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9706,7 +9706,7 @@
$as_echo "no" >&6; }
fi
-@@ -8691,7 +7972,7 @@
+@@ -8691,7 +7972,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9715,7 +9715,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8704,9 +7985,9 @@
+@@ -8704,9 +7985,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -9727,7 +9727,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -8717,24 +7998,24 @@
+@@ -8717,24 +7998,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9757,7 +9757,7 @@
$as_echo "no" >&6; }
fi
-@@ -8744,9 +8025,9 @@
+@@ -8744,9 +8025,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
@@ -9769,7 +9769,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -8757,24 +8038,24 @@
+@@ -8757,24 +8038,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9799,7 +9799,7 @@
$as_echo "no" >&6; }
fi
-@@ -8783,7 +8064,7 @@
+@@ -8783,7 +8064,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9808,7 +9808,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8796,9 +8077,9 @@
+@@ -8796,9 +8077,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -9820,7 +9820,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -8809,24 +8090,24 @@
+@@ -8809,24 +8090,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9850,7 +9850,7 @@
$as_echo "no" >&6; }
fi
-@@ -8836,9 +8117,9 @@
+@@ -8836,9 +8117,9 @@ if test -z "$ac_cv_prog_LIPO"; then
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
@@ -9862,7 +9862,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -8849,24 +8130,24 @@
+@@ -8849,24 +8130,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9892,7 +9892,7 @@
$as_echo "no" >&6; }
fi
-@@ -8875,7 +8156,7 @@
+@@ -8875,7 +8156,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9901,7 +9901,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8888,9 +8169,9 @@
+@@ -8888,9 +8169,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -9913,7 +9913,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -8901,24 +8182,24 @@
+@@ -8901,24 +8182,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9943,7 +9943,7 @@
$as_echo "no" >&6; }
fi
-@@ -8928,9 +8209,9 @@
+@@ -8928,9 +8209,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
@@ -9955,7 +9955,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -8941,24 +8222,24 @@
+@@ -8941,24 +8222,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9985,7 +9985,7 @@
$as_echo "no" >&6; }
fi
-@@ -8967,7 +8248,7 @@
+@@ -8967,7 +8248,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9994,7 +9994,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8980,9 +8261,9 @@
+@@ -8980,9 +8261,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -10006,7 +10006,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -8993,24 +8274,24 @@
+@@ -8993,24 +8274,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10036,7 +10036,7 @@
$as_echo "no" >&6; }
fi
-@@ -9020,9 +8301,9 @@
+@@ -9020,9 +8301,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
@@ -10048,7 +10048,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -9033,24 +8314,24 @@
+@@ -9033,24 +8314,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10078,7 +10078,7 @@
$as_echo "no" >&6; }
fi
-@@ -9059,7 +8340,7 @@
+@@ -9059,7 +8340,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10087,7 +10087,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9095,9 +8376,9 @@
+@@ -9095,9 +8376,9 @@ fi
@@ -10099,7 +10099,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -9122,22 +8403,18 @@
+@@ -9122,22 +8403,18 @@ else
rm -f conftest.*
fi
fi
@@ -10126,7 +10126,7 @@
/* end confdefs.h. */
int
-@@ -9148,42 +8425,17 @@
+@@ -9148,42 +8425,17 @@ main ()
return 0;
}
_ACEOF
@@ -10174,7 +10174,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -9220,62 +8472,13 @@
+@@ -9220,62 +8472,13 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
;;
esac
@@ -10242,7 +10242,7 @@
_ACEOF
fi
-@@ -9293,7 +8496,7 @@
+@@ -9293,7 +8496,7 @@ done
# Check whether --enable-shared was given.
@@ -10251,7 +10251,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -9326,7 +8529,7 @@
+@@ -9326,7 +8529,7 @@ fi
# Check whether --with-pic was given.
@@ -10260,7 +10260,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -9342,7 +8545,7 @@
+@@ -9342,7 +8545,7 @@ test -z "$pic_mode" && pic_mode=default
# Check whether --enable-fast-install was given.
@@ -10269,7 +10269,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -9423,9 +8626,9 @@
+@@ -9423,9 +8626,9 @@ if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
fi
@@ -10281,7 +10281,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -9438,7 +8641,7 @@
+@@ -9438,7 +8641,7 @@ else
fi
rmdir .libs 2>/dev/null
fi
@@ -10290,7 +10290,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -9531,9 +8734,9 @@
+@@ -9531,9 +8734,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -10302,7 +10302,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9584,10 +8787,10 @@
+@@ -9584,10 +8787,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -10315,7 +10315,7 @@
$as_echo "no" >&6; }
fi
-@@ -9597,9 +8800,9 @@
+@@ -9597,9 +8800,9 @@ fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -10327,7 +10327,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9650,10 +8853,10 @@
+@@ -9650,10 +8853,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -10340,7 +10340,7 @@
$as_echo "no" >&6; }
fi
-@@ -9734,9 +8937,9 @@
+@@ -9734,9 +8937,9 @@ lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -10352,7 +10352,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9752,11 +8955,11 @@
+@@ -9752,11 +8955,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -10366,7 +10366,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 +8972,7 @@
+@@ -9769,7 +8972,7 @@ else
$RM conftest*
fi
@@ -10375,7 +10375,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -9789,7 +8992,7 @@
+@@ -9789,7 +8992,7 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -10384,7 +10384,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -10061,7 +9264,7 @@
+@@ -10061,7 +9264,7 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -10393,7 +10393,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -10073,9 +9276,9 @@
+@@ -10073,9 +9276,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -10405,7 +10405,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -10091,11 +9294,11 @@
+@@ -10091,11 +9294,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -10419,7 +10419,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 +9311,7 @@
+@@ -10108,7 +9311,7 @@ else
$RM conftest*
fi
@@ -10428,7 +10428,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -10132,9 +9335,9 @@
+@@ -10132,9 +9335,9 @@ fi
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -10440,7 +10440,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -10160,7 +9363,7 @@
+@@ -10160,7 +9363,7 @@ else
LDFLAGS="$save_LDFLAGS"
fi
@@ -10449,7 +10449,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -10175,9 +9378,9 @@
+@@ -10175,9 +9378,9 @@ fi
@@ -10461,7 +10461,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10196,11 +9399,11 @@
+@@ -10196,11 +9399,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -10475,7 +10475,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 +9425,7 @@
+@@ -10222,7 +9425,7 @@ else
$RM conftest*
fi
@@ -10484,7 +10484,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10230,9 +9433,9 @@
+@@ -10230,9 +9433,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
@@ -10496,7 +10496,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10251,11 +9454,11 @@
+@@ -10251,11 +9454,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -10510,7 +10510,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 +9480,7 @@
+@@ -10277,7 +9480,7 @@ else
$RM conftest*
fi
@@ -10519,7 +10519,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10286,7 +9489,7 @@
+@@ -10286,7 +9489,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -10528,7 +10528,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -10294,10 +9497,10 @@
+@@ -10294,10 +9497,10 @@ $as_echo_n "checking if we can lock with
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -10541,7 +10541,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 +9513,7 @@
+@@ -10310,7 +9513,7 @@ fi
@@ -10550,7 +10550,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -10370,6 +9573,9 @@
+@@ -10370,6 +9573,9 @@ $as_echo_n "checking whether the $compil
openbsd*)
with_gnu_ld=no
;;
@@ -10560,7 +10560,7 @@
esac
ld_shlibs=yes
-@@ -10552,7 +9758,7 @@
+@@ -10552,7 +9758,7 @@ _LT_EOF
fi
;;
@@ -10569,7 +10569,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10727,6 +9933,7 @@
+@@ -10727,6 +9933,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -10577,7 +10577,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10752,11 +9959,7 @@
+@@ -10752,11 +9959,7 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -10590,7 +10590,7 @@
/* end confdefs.h. */
int
-@@ -10767,27 +9970,7 @@
+@@ -10767,27 +9970,7 @@ main ()
return 0;
}
_ACEOF
@@ -10619,7 +10619,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10801,16 +9984,9 @@
+@@ -10801,16 +9984,9 @@ aix_libpath=`dump -H conftest$ac_exeext
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -10638,7 +10638,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10823,11 +9999,7 @@
+@@ -10823,11 +9999,7 @@ if test -z "$aix_libpath"; then aix_libp
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -10651,7 +10651,7 @@
/* end confdefs.h. */
int
-@@ -10838,27 +10010,7 @@
+@@ -10838,27 +10010,7 @@ main ()
return 0;
}
_ACEOF
@@ -10680,7 +10680,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10872,16 +10024,9 @@
+@@ -10872,16 +10024,9 @@ aix_libpath=`dump -H conftest$ac_exeext
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -10699,7 +10699,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -11093,42 +10238,16 @@
+@@ -11093,42 +10238,16 @@ if test -z "$aix_libpath"; then aix_libp
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -10747,7 +10747,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 +10260,7 @@
+@@ -11141,7 +10260,7 @@ rm -f core conftest.err conftest.$ac_obj
link_all_deplibs=yes
;;
@@ -10756,7 +10756,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 +10503,7 @@
+@@ -11384,7 +10503,7 @@ rm -f core conftest.err conftest.$ac_obj
fi
fi
@@ -10765,7 +10765,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -11421,16 +10540,16 @@
+@@ -11421,16 +10540,16 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -10786,7 +10786,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -11444,11 +10563,11 @@
+@@ -11444,11 +10563,11 @@ $as_echo_n "checking whether -lc should
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -10801,7 +10801,7 @@
then
archive_cmds_need_lc=no
else
-@@ -11459,7 +10578,7 @@
+@@ -11459,7 +10578,7 @@ $as_echo_n "checking whether -lc should
cat conftest.err 1>&5
fi
$RM conftest*
@@ -10810,7 +10810,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -11623,7 +10742,7 @@
+@@ -11623,7 +10742,7 @@ esac
@@ -10819,7 +10819,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -12045,11 +11164,7 @@
+@@ -12045,11 +11164,7 @@ linux* | k*bsd*-gnu)
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -10832,7 +10832,7 @@
/* end confdefs.h. */
int
-@@ -12060,41 +11175,13 @@
+@@ -12060,41 +11175,13 @@ main ()
return 0;
}
_ACEOF
@@ -10878,7 +10878,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -12103,13 +11190,10 @@
+@@ -12103,13 +11190,10 @@ rm -f core conftest.err conftest.$ac_obj
# before this can be enabled.
hardcode_into_libs=yes
@@ -10893,7 +10893,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -12121,6 +11205,18 @@
+@@ -12121,6 +11205,18 @@ rm -f core conftest.err conftest.$ac_obj
dynamic_linker='GNU/Linux ld.so'
;;
@@ -10912,7 +10912,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -12309,7 +11405,7 @@
+@@ -12309,7 +11405,7 @@ uts4*)
dynamic_linker=no
;;
esac
@@ -10921,7 +10921,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -12411,7 +11507,7 @@
+@@ -12411,7 +11507,7 @@ fi
@@ -10930,7 +10930,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -12436,7 +11532,7 @@
+@@ -12436,7 +11532,7 @@ else
# directories.
hardcode_action=unsupported
fi
@@ -10939,7 +10939,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -12481,18 +11577,14 @@
+@@ -12481,18 +11577,14 @@ else
darwin*)
# if libdl is installed we need to link against it
@@ -10961,7 +10961,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12510,43 +11602,18 @@
+@@ -12510,43 +11602,18 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -11011,7 +11011,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -12559,106 +11626,18 @@
+@@ -12559,106 +11626,18 @@ fi
;;
*)
@@ -11123,7 +11123,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12676,145 +11655,32 @@
+@@ -12676,145 +11655,32 @@ return shl_load ();
return 0;
}
_ACEOF
@@ -11280,7 +11280,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12832,57 +11698,28 @@
+@@ -12832,57 +11698,28 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -11347,7 +11347,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12900,57 +11737,28 @@
+@@ -12900,57 +11737,28 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -11414,7 +11414,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12968,43 +11776,18 @@
+@@ -12968,43 +11776,18 @@ return dld_link ();
return 0;
}
_ACEOF
@@ -11464,7 +11464,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -13043,9 +11826,9 @@
+@@ -13043,9 +11826,9 @@ fi
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -11476,7 +11476,7 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -13054,7 +11837,7 @@
+@@ -13054,7 +11837,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -11485,7 +11485,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13113,11 +11896,11 @@
+@@ -13113,11 +11896,11 @@ int main ()
return status;
}
_LT_EOF
@@ -11500,7 +11500,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13134,14 +11917,14 @@
+@@ -13134,14 +11917,14 @@ rm -fr conftest*
fi
@@ -11518,7 +11518,7 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -13150,7 +11933,7 @@
+@@ -13150,7 +11933,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -11527,7 +11527,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13209,11 +11992,11 @@
+@@ -13209,11 +11992,11 @@ int main ()
return status;
}
_LT_EOF
@@ -11542,7 +11542,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13230,7 +12013,7 @@
+@@ -13230,7 +12013,7 @@ rm -fr conftest*
fi
@@ -11551,7 +11551,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -13269,12 +12052,12 @@
+@@ -13269,12 +12052,12 @@ fi
striplib=
old_striplib=
@@ -11566,7 +11566,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -13283,15 +12066,15 @@
+@@ -13283,15 +12066,15 @@ else
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -11585,7 +11585,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -13309,12 +12092,12 @@
+@@ -13309,12 +12092,12 @@ fi
# Report which library types will actually be built
@@ -11601,7 +11601,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -13335,14 +12118,14 @@
+@@ -13335,14 +12118,14 @@ $as_echo_n "checking whether to build sh
fi
;;
esac
@@ -11619,7 +11619,7 @@
$as_echo "$enable_static" >&6; }
-@@ -13379,9 +12162,9 @@
+@@ -13379,9 +12162,9 @@ CC="$lt_save_CC"
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -11631,7 +11631,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -13394,14 +12177,14 @@
+@@ -13394,14 +12177,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11649,7 +11649,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -13410,10 +12193,10 @@
+@@ -13410,10 +12193,10 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -11662,7 +11662,7 @@
$as_echo "no" >&6; }
fi
-@@ -13425,9 +12208,9 @@
+@@ -13425,9 +12208,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -11674,7 +11674,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -13440,14 +12223,14 @@
+@@ -13440,14 +12223,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11692,7 +11692,7 @@
IFS=$as_save_IFS
;;
-@@ -13455,10 +12238,10 @@
+@@ -13455,10 +12238,10 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -11705,7 +11705,7 @@
$as_echo "no" >&6; }
fi
-@@ -13468,9 +12251,9 @@
+@@ -13468,9 +12251,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -11717,7 +11717,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -13483,14 +12266,14 @@
+@@ -13483,14 +12266,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11735,7 +11735,7 @@
IFS=$as_save_IFS
;;
-@@ -13498,10 +12281,10 @@
+@@ -13498,10 +12281,10 @@ esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -11748,7 +11748,7 @@
$as_echo "no" >&6; }
fi
-@@ -13510,7 +12293,7 @@
+@@ -13510,7 +12293,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -11757,7 +11757,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -13523,13 +12306,13 @@
+@@ -13523,13 +12306,13 @@ fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -11774,7 +11774,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -13537,14 +12320,15 @@
+@@ -13537,14 +12320,15 @@ $as_echo "no" >&6; }
fi
pkg_failed=no
@@ -11796,7 +11796,7 @@
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
gthread-2.0
-@@ -13556,7 +12340,7 @@
+@@ -13556,7 +12340,7 @@ if test -n "$ALL_CFLAGS"; then
gail >= 0.16
unique-1.0
dbus-glib-1
@@ -11805,7 +11805,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
-@@ -13571,8 +12355,8 @@
+@@ -13571,8 +12355,8 @@ if test -n "$ALL_CFLAGS"; then
dbus-glib-1
") 2>&5
ac_status=$?
@@ -11816,7 +11816,7 @@
pkg_cv_ALL_CFLAGS=`$PKG_CONFIG --cflags "
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
-@@ -13589,14 +12373,16 @@
+@@ -13589,14 +12373,16 @@ if test -n "$ALL_CFLAGS"; then
else
pkg_failed=yes
fi
@@ -11840,7 +11840,7 @@
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
gthread-2.0
-@@ -13608,7 +12394,7 @@
+@@ -13608,7 +12394,7 @@ if test -n "$ALL_LIBS"; then
gail >= 0.16
unique-1.0
dbus-glib-1
@@ -11849,7 +11849,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
-@@ -13623,8 +12409,8 @@
+@@ -13623,8 +12409,8 @@ if test -n "$ALL_LIBS"; then
dbus-glib-1
") 2>&5
ac_status=$?
@@ -11860,7 +11860,7 @@
pkg_cv_ALL_LIBS=`$PKG_CONFIG --libs "
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
-@@ -13641,8 +12427,9 @@
+@@ -13641,8 +12427,9 @@ if test -n "$ALL_LIBS"; then
else
pkg_failed=yes
fi
@@ -11872,7 +11872,7 @@
fi
-@@ -13655,7 +12442,7 @@
+@@ -13655,7 +12442,7 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11881,7 +11881,7 @@
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
gthread-2.0
-@@ -13667,9 +12454,9 @@
+@@ -13667,9 +12454,9 @@ fi
gail >= 0.16
unique-1.0
dbus-glib-1
@@ -11893,7 +11893,7 @@
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
gthread-2.0
-@@ -13681,35 +12468,12 @@
+@@ -13681,35 +12468,12 @@ fi
gail >= 0.16
unique-1.0
dbus-glib-1
@@ -11931,7 +11931,7 @@
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
gthread-2.0
-@@ -13731,22 +12495,11 @@
+@@ -13731,22 +12495,11 @@ installed software in a non-standard pre
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.
@@ -11957,7 +11957,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -13755,12 +12508,11 @@
+@@ -13755,12 +12508,11 @@ and ALL_LIBS to avoid the need to call p
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11972,7 +11972,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -13774,151 +12526,12 @@
+@@ -13774,151 +12526,12 @@ _ACEOF
@@ -12129,7 +12129,7 @@
_ACEOF
fi
-@@ -13926,16 +12539,12 @@
+@@ -13926,16 +12539,12 @@ fi
done
if test $ac_cv_header_locale_h = yes; then
@@ -12149,7 +12149,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -13946,46 +12555,19 @@
+@@ -13946,46 +12555,19 @@ return LC_MESSAGES
return 0;
}
_ACEOF
@@ -12202,7 +12202,7 @@
fi
fi
-@@ -13998,155 +12580,20 @@
+@@ -13998,155 +12580,20 @@ _ACEOF
XGETTEXT=:
INTLLIBS=
@@ -12363,7 +12363,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -14159,54 +12606,25 @@
+@@ -14159,54 +12606,25 @@ return !ngettext ("","", 1)
return 0;
}
_ACEOF
@@ -12426,7 +12426,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -14219,167 +12637,48 @@
+@@ -14219,167 +12637,48 @@ return !dgettext ("","")
return 0;
}
_ACEOF
@@ -12617,7 +12617,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14397,55 +12696,26 @@
+@@ -14397,55 +12696,26 @@ return bindtextdomain ();
return 0;
}
_ACEOF
@@ -12682,7 +12682,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14463,55 +12733,26 @@
+@@ -14463,55 +12733,26 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -12747,7 +12747,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14529,43 +12770,18 @@
+@@ -14529,43 +12770,18 @@ return dgettext ();
return 0;
}
_ACEOF
@@ -12797,7 +12797,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -14575,22 +12791,18 @@
+@@ -14575,22 +12791,18 @@ fi
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -12825,7 +12825,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14608,55 +12820,26 @@
+@@ -14608,55 +12820,26 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -12890,7 +12890,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14674,43 +12857,18 @@
+@@ -14674,43 +12857,18 @@ return dcgettext ();
return 0;
}
_ACEOF
@@ -12940,7 +12940,7 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -14732,102 +12890,12 @@
+@@ -14732,102 +12890,12 @@ fi
glib_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
@@ -13048,7 +13048,7 @@
_ACEOF
fi
-@@ -14857,15 +12925,13 @@
+@@ -14857,15 +12925,13 @@ done
if test "$gt_cv_have_gettext" = "yes"; then
@@ -13067,7 +13067,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -14890,118 +12956,28 @@
+@@ -14890,118 +12956,28 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -13194,7 +13194,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -15016,14 +12992,14 @@
+@@ -15016,14 +12992,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -13214,7 +13214,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -15031,9 +13007,9 @@
+@@ -15031,9 +13007,9 @@ fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -13226,7 +13226,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -15046,14 +13022,14 @@
+@@ -15046,14 +13022,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13244,7 +13244,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -15062,19 +13038,19 @@
+@@ -15062,19 +13038,19 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -13268,7 +13268,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -15099,18 +13075,14 @@
+@@ -15099,18 +13075,14 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -13290,7 +13290,7 @@
/* end confdefs.h. */
int
-@@ -15122,121 +13094,14 @@
+@@ -15122,121 +13094,14 @@ extern int _nl_msg_cat_cntr;
return 0;
}
_ACEOF
@@ -13416,7 +13416,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -15251,10 +13116,8 @@
+@@ -15251,10 +13116,8 @@ fi
;;
esac
fi
@@ -13429,7 +13429,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -15268,9 +13131,7 @@
+@@ -15268,9 +13131,7 @@ fi
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -13440,7 +13440,7 @@
fi
-@@ -15278,7 +13139,7 @@
+@@ -15278,7 +13139,7 @@ _ACEOF
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -13449,7 +13449,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -15311,7 +13172,7 @@
+@@ -15311,7 +13172,7 @@ $as_echo "found xgettext program is not
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -13458,7 +13458,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -15336,7 +13197,7 @@
+@@ -15336,7 +13197,7 @@ $as_echo_n "checking for catalogs to be
fi
done
LINGUAS=$NEW_LINGUAS
@@ -13467,7 +13467,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -15390,16 +13251,16 @@
+@@ -15390,16 +13251,16 @@ _ACEOF
@@ -13487,7 +13487,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -15407,35 +13268,31 @@
+@@ -15407,35 +13268,31 @@ $as_echo "$USE_NLS" >&6; }
case "$am__api_version" in
1.01234)
@@ -13529,7 +13529,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -15448,14 +13305,14 @@
+@@ -15448,14 +13305,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13547,7 +13547,7 @@
IFS=$as_save_IFS
;;
-@@ -15463,19 +13320,19 @@
+@@ -15463,19 +13320,19 @@ esac
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -13571,7 +13571,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -15488,14 +13345,14 @@
+@@ -15488,14 +13345,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13589,7 +13589,7 @@
IFS=$as_save_IFS
;;
-@@ -15503,19 +13360,19 @@
+@@ -15503,19 +13360,19 @@ esac
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -13613,7 +13613,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -15528,14 +13385,14 @@
+@@ -15528,14 +13385,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13631,7 +13631,7 @@
IFS=$as_save_IFS
;;
-@@ -15543,18 +13400,16 @@
+@@ -15543,18 +13400,16 @@ esac
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -13653,7 +13653,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 +13531,9 @@
+@@ -15676,9 +13531,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -13665,7 +13665,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -15691,14 +13546,14 @@
+@@ -15691,14 +13546,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13683,7 +13683,7 @@
IFS=$as_save_IFS
;;
-@@ -15706,19 +13561,19 @@
+@@ -15706,19 +13561,19 @@ esac
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -13707,7 +13707,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -15731,14 +13586,14 @@
+@@ -15731,14 +13586,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13725,7 +13725,7 @@
IFS=$as_save_IFS
;;
-@@ -15746,19 +13601,19 @@
+@@ -15746,19 +13601,19 @@ esac
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -13749,7 +13749,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -15771,14 +13626,14 @@
+@@ -15771,14 +13626,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13767,7 +13767,7 @@
IFS=$as_save_IFS
;;
-@@ -15786,19 +13641,19 @@
+@@ -15786,19 +13641,19 @@ esac
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -13791,7 +13791,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -15811,14 +13666,14 @@
+@@ -15811,14 +13666,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13809,7 +13809,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -15827,33 +13682,29 @@
+@@ -15827,33 +13682,29 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -13849,7 +13849,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -15866,14 +13717,14 @@
+@@ -15866,14 +13717,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13867,7 +13867,7 @@
IFS=$as_save_IFS
;;
-@@ -15881,41 +13732,35 @@
+@@ -15881,41 +13732,35 @@ esac
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -13918,7 +13918,7 @@
fi
fi
-@@ -15925,11 +13770,7 @@
+@@ -15925,11 +13770,7 @@ fi
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -13931,7 +13931,7 @@
/* end confdefs.h. */
int
-@@ -15941,120 +13782,13 @@
+@@ -15941,120 +13782,13 @@ extern int _nl_msg_cat_cntr;
return 0;
}
_ACEOF
@@ -14056,7 +14056,7 @@
DATADIRNAME=share
else
DATADIRNAME=lib
-@@ -16066,10 +13800,8 @@
+@@ -16066,10 +13800,8 @@ fi
;;
esac
fi
@@ -14069,7 +14069,7 @@
fi
-@@ -16082,9 +13814,9 @@
+@@ -16082,9 +13814,9 @@ fi
# Extract the first word of "gtkdoc-check", so it can be a program name with args.
set dummy gtkdoc-check; ac_word=$2
@@ -14081,7 +14081,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_CHECK in
-@@ -16097,14 +13829,14 @@
+@@ -16097,14 +13829,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14099,7 +14099,7 @@
IFS=$as_save_IFS
;;
-@@ -16112,10 +13844,10 @@
+@@ -16112,10 +13844,10 @@ esac
fi
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
if test -n "$GTKDOC_CHECK"; then
@@ -14112,7 +14112,7 @@
$as_echo "no" >&6; }
fi
-@@ -16124,9 +13856,9 @@
+@@ -16124,9 +13856,9 @@ fi
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -14124,7 +14124,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_REBASE in
-@@ -16139,14 +13871,14 @@
+@@ -16139,14 +13871,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14142,7 +14142,7 @@
IFS=$as_save_IFS
;;
-@@ -16154,10 +13886,10 @@
+@@ -16154,10 +13886,10 @@ esac
fi
GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
if test -n "$GTKDOC_REBASE"; then
@@ -14155,7 +14155,7 @@
$as_echo "no" >&6; }
fi
-@@ -16168,9 +13900,9 @@
+@@ -16168,9 +13900,9 @@ test -n "$GTKDOC_REBASE" || GTKDOC_REBAS
# Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
set dummy gtkdoc-mkpdf; ac_word=$2
@@ -14167,7 +14167,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_MKPDF in
-@@ -16183,14 +13915,14 @@
+@@ -16183,14 +13915,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14185,7 +14185,7 @@
IFS=$as_save_IFS
;;
-@@ -16198,10 +13930,10 @@
+@@ -16198,10 +13930,10 @@ esac
fi
GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
if test -n "$GTKDOC_MKPDF"; then
@@ -14198,7 +14198,7 @@
$as_echo "no" >&6; }
fi
-@@ -16209,7 +13941,7 @@
+@@ -16209,7 +13941,7 @@ fi
# Check whether --with-html-dir was given.
@@ -14207,7 +14207,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -16219,7 +13951,7 @@
+@@ -16219,7 +13951,7 @@ fi
# Check whether --enable-gtk-doc was given.
@@ -14216,7 +14216,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -16228,33 +13960,31 @@
+@@ -16228,33 +13960,31 @@ fi
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -14258,7 +14258,7 @@
enableval=$enable_gtk_doc_pdf;
else
enable_gtk_doc_pdf=no
-@@ -16311,12 +14041,10 @@
+@@ -16311,12 +14041,10 @@ fi
ENABLE_PROFILER=
# Check whether --enable-profiler was given.
@@ -14273,7 +14273,7 @@
fi
-@@ -16344,9 +14072,9 @@
+@@ -16344,9 +14072,9 @@ for ac_prog in perl5 perl
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -14285,7 +14285,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$PERL"; then
-@@ -16357,24 +14085,24 @@
+@@ -16357,24 +14085,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14315,7 +14315,7 @@
$as_echo "no" >&6; }
fi
-@@ -16384,9 +14112,9 @@
+@@ -16384,9 +14112,9 @@ done
# Extract the first word of "glib-genmarshal", so it can be a program name with args.
set dummy glib-genmarshal; ac_word=$2
@@ -14327,7 +14327,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -16399,14 +14127,14 @@
+@@ -16399,14 +14127,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14345,7 +14345,7 @@
IFS=$as_save_IFS
;;
-@@ -16414,289 +14142,59 @@
+@@ -16414,289 +14142,59 @@ esac
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -14661,7 +14661,7 @@
withval=$with_x;
fi
-@@ -16706,10 +14204,8 @@
+@@ -16706,10 +14204,8 @@ if test "x$with_x" = xno; then
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -14674,7 +14674,7 @@
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
-@@ -16757,21 +14253,25 @@
+@@ -16757,21 +14253,25 @@ fi
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
@@ -14700,7 +14700,7 @@
/usr/local/include/X11R6
/usr/local/include/X11R5
/usr/local/include/X11R4
-@@ -16793,37 +14293,14 @@
+@@ -16793,37 +14293,14 @@ ac_x_header_dirs='
if test "$ac_x_includes" = no; then
# Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
@@ -14740,7 +14740,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 +14308,6 @@
+@@ -16831,7 +14308,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
done
fi
@@ -14748,7 +14748,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
-@@ -16841,11 +14317,7 @@
+@@ -16841,11 +14317,7 @@ if test "$ac_x_libraries" = no; then
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
@@ -14761,7 +14761,7 @@
/* end confdefs.h. */
#include <X11/Xlib.h>
int
-@@ -16856,35 +14328,12 @@
+@@ -16856,35 +14328,12 @@ XrmInitialize ()
return 0;
}
_ACEOF
@@ -14799,7 +14799,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 +14345,8 @@
+@@ -16896,10 +14345,8 @@ do
done
done
fi
@@ -14812,7 +14812,7 @@
fi # $ac_x_libraries = no
case $ac_x_includes,$ac_x_libraries in #(
-@@ -16920,7 +14367,7 @@
+@@ -16920,7 +14367,7 @@ fi
fi # $with_x != no
if test "$have_x" != yes; then
@@ -14821,7 +14821,7 @@
$as_echo "$have_x" >&6; }
no_x=yes
else
-@@ -16931,16 +14378,14 @@
+@@ -16931,16 +14378,14 @@ else
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -14840,7 +14840,7 @@
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
else
-@@ -16953,16 +14398,12 @@
+@@ -16953,16 +14398,12 @@ else
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
@@ -14859,7 +14859,7 @@
/* end confdefs.h. */
int
-@@ -16973,40 +14414,13 @@
+@@ -16973,40 +14414,13 @@ main ()
return 0;
}
_ACEOF
@@ -14904,7 +14904,7 @@
/* end confdefs.h. */
int
-@@ -17017,46 +14431,19 @@
+@@ -17017,46 +14431,19 @@ main ()
return 0;
}
_ACEOF
@@ -14958,7 +14958,7 @@
ac_c_werror_flag=$ac_xsave_c_werror_flag
LIBS=$ac_xsave_LIBS
fi
-@@ -17072,11 +14459,7 @@
+@@ -17072,11 +14459,7 @@ rm -f core conftest.err conftest.$ac_obj
# libraries were built with DECnet support. And Karl Berry says
# the Alpha needs dnet_stub (dnet does not exist).
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
@@ -14971,7 +14971,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17094,44 +14477,17 @@
+@@ -17094,44 +14477,17 @@ return XOpenDisplay ();
return 0;
}
_ACEOF
@@ -15021,7 +15021,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17149,59 +14505,30 @@
+@@ -17149,59 +14505,30 @@ return dnet_ntoa ();
return 0;
}
_ACEOF
@@ -15090,7 +15090,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17219,52 +14546,25 @@
+@@ -17219,52 +14546,25 @@ return dnet_ntoa ();
return 0;
}
_ACEOF
@@ -15151,7 +15151,7 @@
LIBS="$ac_xsave_LIBS"
# msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -17275,105 +14575,20 @@
+@@ -17275,105 +14575,20 @@ rm -f core conftest.err conftest.$ac_obj
# on Irix 5.2, according to T.E. Dickey.
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
@@ -15262,7 +15262,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17391,59 +14606,30 @@
+@@ -17391,59 +14606,30 @@ return gethostbyname ();
return 0;
}
_ACEOF
@@ -15331,7 +15331,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17461,43 +14647,18 @@
+@@ -17461,43 +14647,18 @@ return gethostbyname ();
return 0;
}
_ACEOF
@@ -15381,7 +15381,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
-@@ -17511,105 +14672,20 @@
+@@ -17511,105 +14672,20 @@ fi
# variants that don't use the name server (or something). -lsocket
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
@@ -15492,7 +15492,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17627,148 +14703,38 @@
+@@ -17627,148 +14703,38 @@ return connect ();
return 0;
}
_ACEOF
@@ -15652,7 +15652,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17785,149 +14751,39 @@
+@@ -17785,149 +14751,39 @@ return remove ();
;
return 0;
}
@@ -15824,7 +15824,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17945,43 +14801,18 @@
+@@ -17945,43 +14801,18 @@ return shmat ();
return 0;
}
_ACEOF
@@ -15874,7 +15874,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -17997,18 +14828,14 @@
+@@ -17997,18 +14828,14 @@ fi
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# John Interrante, Karl Berry
@@ -15896,7 +15896,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18026,43 +14853,18 @@
+@@ -18026,43 +14853,18 @@ return IceConnectionNumber ();
return 0;
}
_ACEOF
@@ -15946,7 +15946,7 @@
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -18072,9 +14874,7 @@
+@@ -18072,9 +14874,7 @@ fi
if test x$no_x = xyes ; then
@@ -15957,7 +15957,7 @@
fi
x_libs="$X_LIBS -lX11 $X_EXTRA_LIBS"
-@@ -18090,18 +14890,14 @@
+@@ -18090,18 +14890,14 @@ x_libs_for_checks=$x_libs
# esac
#done
@@ -15979,7 +15979,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18119,48 +14915,21 @@
+@@ -18119,48 +14915,21 @@ return XOpenDisplay ();
return 0;
}
_ACEOF
@@ -16035,7 +16035,7 @@
fi
-@@ -18177,40 +14946,44 @@
+@@ -18177,40 +14946,44 @@ fi
pkg_failed=no
@@ -16099,7 +16099,7 @@
fi
-@@ -18223,52 +14996,56 @@
+@@ -18223,52 +14996,56 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16178,7 +16178,7 @@
fi
-@@ -18281,14 +15058,14 @@
+@@ -18281,14 +15058,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16196,7 +16196,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_EXIF_TRUE=
-@@ -18310,7 +15087,7 @@
+@@ -18310,7 +15087,7 @@ fi
else
EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
EXIF_LIBS=$pkg_cv_EXIF_LIBS
@@ -16205,7 +16205,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18322,9 +15099,7 @@
+@@ -18322,9 +15099,7 @@ else
fi
@@ -16216,7 +16216,7 @@
fi
-@@ -18333,40 +15108,44 @@
+@@ -18333,40 +15108,44 @@ elif test $pkg_failed = untried; then
pkg_failed=no
@@ -16280,7 +16280,7 @@
fi
-@@ -18379,14 +15158,14 @@
+@@ -18379,14 +15158,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16298,7 +16298,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_EXIF_TRUE=
-@@ -18408,7 +15187,7 @@
+@@ -18408,7 +15187,7 @@ fi
else
EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
EXIF_LIBS=$pkg_cv_EXIF_LIBS
@@ -16307,7 +16307,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18420,9 +15199,7 @@
+@@ -18420,9 +15199,7 @@ else
fi
@@ -16318,7 +16318,7 @@
fi
-@@ -18430,7 +15207,7 @@
+@@ -18430,7 +15207,7 @@ fi
else
EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
EXIF_LIBS=$pkg_cv_EXIF_LIBS
@@ -16327,7 +16327,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18442,9 +15219,7 @@
+@@ -18442,9 +15219,7 @@ else
fi
@@ -16338,7 +16338,7 @@
fi
-@@ -18464,7 +15239,7 @@
+@@ -18464,7 +15239,7 @@ fi
# Check whether --enable-xmp was given.
@@ -16347,7 +16347,7 @@
enableval=$enable_xmp;
fi
-@@ -18472,40 +15247,44 @@
+@@ -18472,40 +15247,44 @@ msg_xmp=no
if test "x$enable_xmp" != "xno"; then
pkg_failed=no
@@ -16411,7 +16411,7 @@
fi
-@@ -18518,14 +15297,14 @@
+@@ -18518,14 +15297,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16429,7 +16429,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_EXEMPI_TRUE=
-@@ -18547,7 +15326,7 @@
+@@ -18547,7 +15326,7 @@ fi
else
EXEMPI_CFLAGS=$pkg_cv_EXEMPI_CFLAGS
EXEMPI_LIBS=$pkg_cv_EXEMPI_LIBS
@@ -16438,7 +16438,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18559,9 +15338,7 @@
+@@ -18559,9 +15338,7 @@ else
fi
@@ -16449,7 +16449,7 @@
msg_xmp=yes
-@@ -18569,40 +15346,44 @@
+@@ -18569,40 +15346,44 @@ fi
pkg_failed=no
@@ -16513,7 +16513,7 @@
fi
-@@ -18615,14 +15396,14 @@
+@@ -18615,14 +15396,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16531,7 +16531,7 @@
$as_echo "no" >&6; }
true
elif test $pkg_failed = untried; then
-@@ -18630,12 +15411,10 @@
+@@ -18630,12 +15411,10 @@ elif test $pkg_failed = untried; then
else
EXEMPI_NEW_API_CFLAGS=$pkg_cv_EXEMPI_NEW_API_CFLAGS
EXEMPI_NEW_API_LIBS=$pkg_cv_EXEMPI_NEW_API_LIBS
@@ -16546,7 +16546,7 @@
fi
-@@ -18655,7 +15434,7 @@
+@@ -18655,7 +15434,7 @@ fi
# Check whether --enable-tracker was given.
@@ -16555,7 +16555,7 @@
enableval=$enable_tracker;
fi
-@@ -18663,40 +15442,44 @@
+@@ -18663,40 +15442,44 @@ msg_tracker=no
if test "x$enable_tracker" != "xno"; then
pkg_failed=no
@@ -16619,7 +16619,7 @@
fi
-@@ -18709,52 +15492,56 @@
+@@ -18709,52 +15492,56 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16698,7 +16698,7 @@
fi
-@@ -18767,14 +15554,14 @@
+@@ -18767,14 +15554,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16716,7 +16716,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_TRACKER_TRUE=
-@@ -18796,7 +15583,7 @@
+@@ -18796,7 +15583,7 @@ fi
else
TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
@@ -16725,7 +16725,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18808,9 +15595,7 @@
+@@ -18808,9 +15595,7 @@ else
fi
@@ -16736,7 +16736,7 @@
msg_tracker=yes
-@@ -18820,40 +15605,44 @@
+@@ -18820,40 +15605,44 @@ elif test $pkg_failed = untried; then
pkg_failed=no
@@ -16800,7 +16800,7 @@
fi
-@@ -18866,14 +15655,14 @@
+@@ -18866,14 +15655,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16818,7 +16818,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_TRACKER_TRUE=
-@@ -18895,7 +15684,7 @@
+@@ -18895,7 +15684,7 @@ fi
else
TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
@@ -16827,7 +16827,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18907,9 +15696,7 @@
+@@ -18907,9 +15696,7 @@ else
fi
@@ -16838,7 +16838,7 @@
msg_tracker=yes
-@@ -18918,7 +15705,7 @@
+@@ -18918,7 +15705,7 @@ fi
else
TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
@@ -16847,7 +16847,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18930,14 +15717,10 @@
+@@ -18930,14 +15717,10 @@ else
fi
@@ -16864,7 +16864,7 @@
msg_tracker=yes
-@@ -18959,7 +15742,7 @@
+@@ -18959,7 +15742,7 @@ fi
# Check whether --enable-beagle was given.
@@ -16873,7 +16873,7 @@
enableval=$enable_beagle;
fi
-@@ -18974,40 +15757,44 @@
+@@ -18974,40 +15757,44 @@ if test "x$enable_beagle" != "xno"; then
pkg_failed=no
@@ -16937,7 +16937,7 @@
fi
-@@ -19020,14 +15807,14 @@
+@@ -19020,14 +15807,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16955,7 +16955,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_BEAGLE_TRUE=
-@@ -19042,263 +15829,89 @@
+@@ -19042,263 +15829,89 @@ elif test $pkg_failed = untried; then
HAVE_BEAGLE_TRUE=
HAVE_BEAGLE_FALSE='#'
else
@@ -17283,7 +17283,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19323,59 +15936,30 @@
+@@ -19323,59 +15936,30 @@ for ac_lib in '' selinux; do
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -17352,7 +17352,7 @@
SELINUX_LIBS="-lselinux"
msg_selinux=yes
-@@ -19393,12 +15977,10 @@
+@@ -19393,12 +15977,10 @@ fi
# Check whether --enable-empty_view was given.
@@ -17367,7 +17367,7 @@
fi
-@@ -19415,7 +15997,7 @@
+@@ -19415,7 +15997,7 @@ fi
# Check whether --enable-packagekit was given.
@@ -17376,7 +17376,7 @@
enableval=$enable_packagekit;
fi
-@@ -19423,16 +16005,14 @@
+@@ -19423,16 +16005,14 @@ msg_packagekit=no
if test "x$enable_packagekit" != "xno"; then
msg_packagekit=yes
@@ -17395,7 +17395,7 @@
enableval=$enable_more_warnings; set_more_warnings="$enableval"
else
-@@ -19445,10 +16025,10 @@
+@@ -19445,10 +16025,10 @@ fi
fi
@@ -17408,7 +17408,7 @@
$as_echo "yes" >&6; }
WARNING_CFLAGS="\
-Wall \
-@@ -19460,13 +16040,9 @@
+@@ -19460,13 +16040,9 @@ $as_echo "yes" >&6; }
for option in -Wstrict-aliasing=0 -Wno-pointer-sign; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -17424,7 +17424,7 @@
/* end confdefs.h. */
int
-@@ -19477,37 +16053,16 @@
+@@ -19477,37 +16053,16 @@ main ()
return 0;
}
_ACEOF
@@ -17465,7 +17465,7 @@
$as_echo "$has_option" >&6; }
CFLAGS="$SAVE_CFLAGS"
unset has_option
-@@ -19515,26 +16070,19 @@
+@@ -19515,26 +16070,19 @@ $as_echo "$has_option" >&6; }
done
unset option
else
@@ -17498,7 +17498,7 @@
/* end confdefs.h. */
#include <time.h>
int main ()
-@@ -19549,65 +16097,32 @@
+@@ -19549,65 +16097,32 @@ cat >>conftest.$ac_ext <<_ACEOF
}
_ACEOF
@@ -17571,7 +17571,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19625,228 +16140,62 @@
+@@ -19625,228 +16140,62 @@ return XRenderFindFormat ();
return 0;
}
_ACEOF
@@ -17845,7 +17845,7 @@
_ACEOF
fi
-@@ -19857,9 +16206,9 @@
+@@ -19857,9 +16206,9 @@ done
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -17857,7 +17857,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -19872,14 +16221,14 @@
+@@ -19872,14 +16221,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -17875,7 +17875,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-@@ -19888,19 +16237,17 @@
+@@ -19888,19 +16237,17 @@ esac
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -17898,7 +17898,7 @@
fi
-@@ -19912,13 +16259,13 @@
+@@ -19912,13 +16259,13 @@ fi
# Check whether --with-gconf-source was given.
@@ -17914,7 +17914,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 +16274,20 @@
+@@ -19927,22 +16274,20 @@ $as_echo "Using config source $GCONF_SCH
# Check whether --with-gconf-schema-file-dir was given.
@@ -17941,7 +17941,7 @@
esac
fi
-@@ -19959,9 +16304,9 @@
+@@ -19959,9 +16304,9 @@ fi
# 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
@@ -17953,7 +17953,7 @@
$as_echo_n "(cached) " >&6
else
case $UPDATE_MIME_DATABASE in
-@@ -19974,14 +16319,14 @@
+@@ -19974,14 +16319,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -17971,7 +17971,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_UPDATE_MIME_DATABASE" && ac_cv_path_UPDATE_MIME_DATABASE="no"
-@@ -19990,17 +16335,17 @@
+@@ -19990,17 +16335,17 @@ esac
fi
UPDATE_MIME_DATABASE=$ac_cv_path_UPDATE_MIME_DATABASE
if test -n "$UPDATE_MIME_DATABASE"; then
@@ -17992,7 +17992,7 @@
enableval=$enable_update_mimedb;
else
enable_update_mimedb=yes
-@@ -20018,7 +16363,7 @@
+@@ -20018,7 +16363,7 @@ fi
# Check whether --enable-shave was given.
@@ -18001,7 +18001,7 @@
enableval=$enable_shave;
else
enable_shave=yes
-@@ -20038,9 +16383,9 @@
+@@ -20038,9 +16383,9 @@ fi
# Extract the first word of "sed", so it can be a program name with args.
set dummy sed; ac_word=$2
@@ -18013,7 +18013,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$SED"; then
-@@ -20051,14 +16396,14 @@
+@@ -20051,14 +16396,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18031,7 +18031,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_prog_SED" && ac_cv_prog_SED="false"
-@@ -20066,10 +16411,10 @@
+@@ -20066,10 +16411,10 @@ fi
fi
SED=$ac_cv_prog_SED
if test -n "$SED"; then
@@ -18044,7 +18044,7 @@
$as_echo "no" >&6; }
fi
-@@ -20134,13 +16479,13 @@
+@@ -20134,13 +16479,13 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -18060,7 +18060,7 @@
esac ;;
esac
done
-@@ -20148,8 +16493,8 @@
+@@ -20148,8 +16493,8 @@ $as_echo "$as_me: WARNING: cache variabl
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -18071,7 +18071,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -20172,11 +16517,11 @@
+@@ -20172,11 +16517,11 @@ $as_echo "$as_me: WARNING: cache variabl
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -18085,7 +18085,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -20196,8 +16541,8 @@
+@@ -20196,8 +16541,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i"
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
@@ -18096,7 +18096,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -20213,277 +16558,167 @@
+@@ -20213,277 +16558,167 @@ else
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -18451,7 +18451,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -20493,17 +16728,18 @@
+@@ -20493,17 +16728,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -18477,7 +18477,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -20511,23 +16747,15 @@
+@@ -20511,23 +16747,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -18506,7 +18506,7 @@
as_nl='
'
export as_nl
-@@ -20535,7 +16763,13 @@
+@@ -20535,7 +16763,13 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -18521,7 +18521,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -20546,7 +16780,7 @@
+@@ -20546,7 +16780,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -18530,7 +18530,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -20569,13 +16803,6 @@
+@@ -20569,13 +16803,6 @@ if test "${PATH_SEPARATOR+set}" != set;
}
fi
@@ -18544,7 +18544,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -20585,15 +16812,15 @@
+@@ -20585,15 +16812,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -18563,7 +18563,7 @@
IFS=$as_save_IFS
;;
-@@ -20605,12 +16832,16 @@
+@@ -20605,12 +16832,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -18584,7 +18584,7 @@
done
PS1='$ '
PS2='> '
-@@ -20622,7 +16853,89 @@
+@@ -20622,7 +16853,89 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
@@ -18675,7 +18675,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -20636,8 +16949,12 @@
+@@ -20636,8 +16949,12 @@ else
as_basename=false
fi
@@ -18689,7 +18689,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -20657,76 +16974,25 @@
+@@ -20657,76 +16974,25 @@ $as_echo X/"$0" |
}
s/.*/./; q'`
@@ -18777,7 +18777,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -20755,8 +17021,56 @@
+@@ -20755,8 +17021,56 @@ fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -18835,7 +18835,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -20775,10 +17089,10 @@
+@@ -20775,10 +17089,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
@@ -18848,7 +18848,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -20793,13 +17107,19 @@
+@@ -20793,13 +17107,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
exec 6>&1
@@ -18870,7 +18870,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -20831,10 +17151,11 @@
+@@ -20831,10 +17151,11 @@ _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -18885,7 +18885,7 @@
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
-@@ -20856,16 +17177,16 @@
+@@ -20856,16 +17177,16 @@ $config_headers
Configuration commands:
$config_commands
@@ -18905,7 +18905,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -20908,20 +17229,19 @@
+@@ -20908,20 +17229,19 @@ do
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -18930,7 +18930,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -20929,11 +17249,10 @@
+@@ -20929,11 +17249,10 @@ Try \`$0 --help' for more information."
ac_cs_silent=: ;;
# This is an error.
@@ -18945,7 +18945,7 @@
ac_need_defaults=false ;;
esac
-@@ -21277,9 +17596,7 @@
+@@ -21277,9 +17596,7 @@ do
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -18956,7 +18956,7 @@
esac
done
-@@ -21306,7 +17623,7 @@
+@@ -21306,7 +17623,7 @@ $debug ||
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -18965,7 +18965,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -21317,11 +17634,7 @@
+@@ -21317,11 +17634,7 @@ $debug ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -18978,7 +18978,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -21329,10 +17642,16 @@
+@@ -21329,10 +17642,16 @@ $debug ||
if test -n "$CONFIG_FILES"; then
@@ -18997,7 +18997,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -21346,24 +17665,18 @@
+@@ -21346,24 +17665,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -19025,7 +19025,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -21452,9 +17765,7 @@
+@@ -21452,9 +17765,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -19036,7 +19036,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -21495,9 +17806,7 @@
+@@ -21495,9 +17806,7 @@ for ac_last_try in false false :; do
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -19047,7 +19047,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -21582,9 +17891,7 @@
+@@ -21582,9 +17891,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -19058,7 +19058,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -21597,9 +17904,7 @@
+@@ -21597,9 +17904,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -19069,7 +19069,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -21627,12 +17932,10 @@
+@@ -21627,12 +17932,10 @@ $as_echo "$as_me: error: invalid tag $ac
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -19084,7 +19084,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -21643,7 +17946,7 @@
+@@ -21643,7 +17946,7 @@ $as_echo "$as_me: error: cannot find inp
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -19093,7 +19093,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -21656,9 +17959,7 @@
+@@ -21656,9 +17959,7 @@ $as_echo "$as_me: creating $ac_file" >&6
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -19104,7 +19104,7 @@
esac
;;
esac
-@@ -21686,47 +17987,7 @@
+@@ -21686,47 +17987,7 @@ $as_echo X"$ac_file" |
q
}
s/.*/./; q'`
@@ -19153,7 +19153,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -21783,7 +18044,6 @@
+@@ -21783,7 +18044,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -19161,7 +19161,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -21793,12 +18053,11 @@
+@@ -21793,12 +18053,11 @@ ac_sed_dataroot='
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -19176,7 +19176,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 +18067,7 @@
+@@ -21808,7 +18067,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -19185,7 +19185,7 @@
esac
_ACEOF
-@@ -21837,14 +18096,12 @@
+@@ -21837,14 +18096,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -19202,7 +19202,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 +18111,7 @@
+@@ -21854,9 +18111,7 @@ which seems to be undefined. Please mak
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -19213,7 +19213,7 @@
;;
:H)
#
-@@ -21867,25 +18122,19 @@
+@@ -21867,25 +18122,19 @@ $as_echo "$as_me: error: could not creat
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -19243,7 +19243,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -21923,7 +18172,7 @@
+@@ -21923,7 +18172,7 @@ $as_echo X"$_am_arg" |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -19252,7 +19252,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -22018,47 +18267,7 @@
+@@ -22018,47 +18267,7 @@ $as_echo X"$file" |
q
}
s/.*/./; q'`
@@ -19301,7 +19301,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -22711,9 +18920,7 @@
+@@ -22711,9 +18920,7 @@ _LT_EOF
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -19312,7 +19312,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -22736,15 +18943,12 @@
+@@ -22736,15 +18943,12 @@ $as_echo "$as_me: error: po/Makefile.in.
done # for ac_tag
@@ -19330,7 +19330,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -22765,10 +18969,10 @@
+@@ -22765,10 +18969,10 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -19345,9 +19345,9 @@
Index: nautilus-2.28.1/cut-n-paste-code/libegg/Makefile.in
===================================================================
---- nautilus-2.28.1.orig/cut-n-paste-code/libegg/Makefile.in 2009-10-20 11:17:55.000000000 +0000
-+++ nautilus-2.28.1/cut-n-paste-code/libegg/Makefile.in 2009-10-24 10:11:17.000000000 +0000
-@@ -188,6 +188,7 @@
+--- nautilus-2.28.1.orig/cut-n-paste-code/libegg/Makefile.in 2009-10-20 13:17:55.000000000 +0200
++++ nautilus-2.28.1/cut-n-paste-code/libegg/Makefile.in 2009-10-24 15:18:08.393758931 +0200
+@@ -188,6 +188,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19357,9 +19357,9 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.1/cut-n-paste-code/Makefile.in
===================================================================
---- nautilus-2.28.1.orig/cut-n-paste-code/Makefile.in 2009-10-20 11:17:55.000000000 +0000
-+++ nautilus-2.28.1/cut-n-paste-code/Makefile.in 2009-10-24 10:11:17.000000000 +0000
-@@ -199,6 +199,7 @@
+--- nautilus-2.28.1.orig/cut-n-paste-code/Makefile.in 2009-10-20 13:17:55.000000000 +0200
++++ nautilus-2.28.1/cut-n-paste-code/Makefile.in 2009-10-24 15:18:08.393758931 +0200
+@@ -199,6 +199,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19369,9 +19369,9 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.1/data/icons/Makefile.in
===================================================================
---- nautilus-2.28.1.orig/data/icons/Makefile.in 2009-10-20 11:17:55.000000000 +0000
-+++ nautilus-2.28.1/data/icons/Makefile.in 2009-10-24 10:11:17.000000000 +0000
-@@ -161,6 +161,7 @@
+--- nautilus-2.28.1.orig/data/icons/Makefile.in 2009-10-20 13:17:55.000000000 +0200
++++ nautilus-2.28.1/data/icons/Makefile.in 2009-10-24 15:18:08.393758931 +0200
+@@ -161,6 +161,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19381,23 +19381,9 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.1/data/Makefile.in
===================================================================
---- nautilus-2.28.1.orig/data/Makefile.in 2009-10-20 11:17:55.000000000 +0000
-+++ nautilus-2.28.1/data/Makefile.in 2009-10-24 10:11:17.000000000 +0000
-@@ -89,9 +89,11 @@
- am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
--am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)" \
-+am__installdirs = "$(DESTDIR)$(autostartdir)" \
-+ "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)" \
- "$(DESTDIR)$(nautilusdatadir)"
--DATA = $(desktop_DATA) $(mime_DATA) $(nautilusdata_DATA)
-+DATA = $(autostart_DATA) $(desktop_DATA) $(mime_DATA) \
-+ $(nautilusdata_DATA)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
- AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-@@ -235,6 +237,7 @@
+--- nautilus-2.28.1.orig/data/Makefile.in 2009-10-20 13:17:55.000000000 +0200
++++ nautilus-2.28.1/data/Makefile.in 2009-10-24 15:18:33.389760741 +0200
+@@ -235,6 +235,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19405,120 +19391,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -324,7 +327,6 @@
- desktopdir = $(datadir)/applications
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- desktop_in_files = \
-- nautilus.desktop.in \
- nautilus-home.desktop.in \
- nautilus-computer.desktop.in \
- nautilus-folder-handler.desktop.in \
-@@ -332,6 +334,9 @@
- nautilus-browser.desktop.in \
- nautilus-autorun-software.desktop.in
-
-+autostartdir = $(datadir)/gnome/autostart
-+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-+autostart_in_files = nautilus.desktop.in
- mimedir = $(datadir)/mime/packages
- mime_DATA = $(xml_files)
- nautilusdatadir = $(datadir)/nautilus
-@@ -410,6 +415,26 @@
-
- clean-libtool:
- -rm -rf .libs _libs
-+install-autostartDATA: $(autostart_DATA)
-+ @$(NORMAL_INSTALL)
-+ test -z "$(autostartdir)" || $(MKDIR_P) "$(DESTDIR)$(autostartdir)"
-+ @list='$(autostart_DATA)'; test -n "$(autostartdir)" || list=; \
-+ for p in $$list; do \
-+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; \
-+ done | $(am__base_list) | \
-+ while read files; do \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(autostartdir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(autostartdir)" || exit $$?; \
-+ done
-+
-+uninstall-autostartDATA:
-+ @$(NORMAL_UNINSTALL)
-+ @list='$(autostart_DATA)'; test -n "$(autostartdir)" || list=; \
-+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+ test -n "$$files" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(autostartdir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(autostartdir)" && rm -f $$files
- install-desktopDATA: $(desktop_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
-@@ -669,7 +694,7 @@
- all-am: Makefile $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
-- for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)" "$(DESTDIR)$(nautilusdatadir)"; do \
-+ for dir in "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)" "$(DESTDIR)$(nautilusdatadir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-recursive
-@@ -718,8 +743,8 @@
-
- info-am:
-
--install-data-am: install-desktopDATA install-mimeDATA \
-- install-nautilusdataDATA
-+install-data-am: install-autostartDATA install-desktopDATA \
-+ install-mimeDATA install-nautilusdataDATA
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-dvi: install-dvi-recursive
-@@ -764,8 +789,8 @@
-
- ps-am:
-
--uninstall-am: uninstall-desktopDATA uninstall-mimeDATA \
-- uninstall-nautilusdataDATA
-+uninstall-am: uninstall-autostartDATA uninstall-desktopDATA \
-+ uninstall-mimeDATA uninstall-nautilusdataDATA
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
- .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-@@ -776,20 +801,22 @@
- all all-am check check-am clean clean-generic clean-libtool \
- ctags ctags-recursive distclean distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
-- html-am info info-am install install-am install-data \
-- install-data-am install-data-hook install-desktopDATA \
-- install-dvi install-dvi-am install-exec install-exec-am \
-- install-html install-html-am install-info install-info-am \
-- install-man install-mimeDATA install-nautilusdataDATA \
-- install-pdf install-pdf-am install-ps install-ps-am \
-- install-strip installcheck installcheck-am installdirs \
-- installdirs-am maintainer-clean maintainer-clean-generic \
-- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-- ps ps-am tags tags-recursive uninstall uninstall-am \
-+ html-am info info-am install install-am install-autostartDATA \
-+ install-data install-data-am install-data-hook \
-+ install-desktopDATA install-dvi install-dvi-am install-exec \
-+ install-exec-am install-html install-html-am install-info \
-+ install-info-am install-man install-mimeDATA \
-+ install-nautilusdataDATA install-pdf install-pdf-am install-ps \
-+ install-ps-am install-strip installcheck installcheck-am \
-+ installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic mostlyclean mostlyclean-generic \
-+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-autostartDATA \
- uninstall-desktopDATA uninstall-hook uninstall-mimeDATA \
- uninstall-nautilusdataDATA
-
- @INTLTOOL_XML_RULE@
-+
- @INTLTOOL_DESKTOP_RULE@
-
- install-data-hook:
Index: nautilus-2.28.1/data/patterns/Makefile.in
===================================================================
---- nautilus-2.28.1.orig/data/patterns/Makefile.in 2009-10-20 11:17:55.000000000 +0000
-+++ nautilus-2.28.1/data/patterns/Makefile.in 2009-10-24 10:11:17.000000000 +0000
-@@ -183,6 +183,7 @@
+--- nautilus-2.28.1.orig/data/patterns/Makefile.in 2009-10-20 13:17:55.000000000 +0200
++++ nautilus-2.28.1/data/patterns/Makefile.in 2009-10-24 15:18:08.397762931 +0200
+@@ -183,6 +183,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19528,9 +19405,9 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.1/docs/Makefile.in
===================================================================
---- nautilus-2.28.1.orig/docs/Makefile.in 2009-10-20 11:17:55.000000000 +0000
-+++ nautilus-2.28.1/docs/Makefile.in 2009-10-24 10:11:17.000000000 +0000
-@@ -224,6 +224,7 @@
+--- nautilus-2.28.1.orig/docs/Makefile.in 2009-10-20 13:17:55.000000000 +0200
++++ nautilus-2.28.1/docs/Makefile.in 2009-10-24 15:18:08.397762931 +0200
+@@ -224,6 +224,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19540,9 +19417,9 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.1/docs/reference/libnautilus-extension/Makefile.in
===================================================================
---- nautilus-2.28.1.orig/docs/reference/libnautilus-extension/Makefile.in 2009-10-20 11:17:55.000000000 +0000
-+++ nautilus-2.28.1/docs/reference/libnautilus-extension/Makefile.in 2009-10-24 10:11:17.000000000 +0000
-@@ -166,6 +166,7 @@
+--- nautilus-2.28.1.orig/docs/reference/libnautilus-extension/Makefile.in 2009-10-20 13:17:55.000000000 +0200
++++ nautilus-2.28.1/docs/reference/libnautilus-extension/Makefile.in 2009-10-24 15:18:08.397762931 +0200
+@@ -166,6 +166,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19550,7 +19427,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -329,10 +330,10 @@
+@@ -329,10 +330,10 @@ GTKDOC_LIBS = \
$(NULL)
@GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -19564,7 +19441,7 @@
@GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_RUN = $(LIBTOOL) --mode=execute
# We set GPATH here; this gives us semantics for GNU make
-@@ -573,9 +574,9 @@
+@@ -573,9 +574,9 @@ $(REPORT_FILES): sgml-build.stamp
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
@echo 'gtk-doc: Scanning header files'
@-chmod -R u+w $(srcdir)
@@ -19576,7 +19453,7 @@
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
else \
cd $(srcdir) ; \
-@@ -583,7 +584,7 @@
+@@ -583,7 +584,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_
test -f $$i || touch $$i ; \
done \
fi
@@ -19585,7 +19462,7 @@
$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
@true
-@@ -593,23 +594,23 @@
+@@ -593,23 +594,23 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES)
tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
@echo 'gtk-doc: Rebuilding template files'
@-chmod -R u+w $(srcdir)
@@ -19615,7 +19492,7 @@
sgml.stamp: sgml-build.stamp
@true
-@@ -619,18 +620,18 @@
+@@ -619,18 +620,18 @@ sgml.stamp: sgml-build.stamp
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@echo 'gtk-doc: Building HTML'
@-chmod -R u+w $(srcdir)
@@ -19641,7 +19518,7 @@
##############
-@@ -647,7 +648,7 @@
+@@ -647,7 +648,7 @@ maintainer-clean-local: clean
cd $(srcdir) && rm -rf xml html
install-data-local:
@@ -19650,7 +19527,7 @@
if test "$$installfiles" = '$(srcdir)/html/*'; \
then echo '-- Nothing to install' ; \
else \
-@@ -667,11 +668,12 @@
+@@ -667,11 +668,12 @@ install-data-local:
mv -f $${installdir}/$(DOC_MODULE).devhelp \
$${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
fi; \
@@ -19665,7 +19542,7 @@
installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
else \
installdir="$(DESTDIR)$(TARGET_DIR)"; \
-@@ -688,13 +690,16 @@
+@@ -688,13 +690,16 @@ uninstall-local:
dist-hook: dist-check-gtkdoc dist-hook-local
mkdir $(distdir)/tmpl
@@ -19685,9 +19562,9 @@
Index: nautilus-2.28.1/docs/reference/Makefile.in
===================================================================
---- nautilus-2.28.1.orig/docs/reference/Makefile.in 2009-10-20 11:17:55.000000000 +0000
-+++ nautilus-2.28.1/docs/reference/Makefile.in 2009-10-24 10:11:17.000000000 +0000
-@@ -199,6 +199,7 @@
+--- nautilus-2.28.1.orig/docs/reference/Makefile.in 2009-10-20 13:17:55.000000000 +0200
++++ nautilus-2.28.1/docs/reference/Makefile.in 2009-10-24 15:18:08.397762931 +0200
+@@ -199,6 +199,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19697,9 +19574,9 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.1/eel/Makefile.in
===================================================================
---- nautilus-2.28.1.orig/eel/Makefile.in 2009-10-20 11:17:55.000000000 +0000
-+++ nautilus-2.28.1/eel/Makefile.in 2009-10-24 10:11:17.000000000 +0000
-@@ -52,7 +52,9 @@
+--- nautilus-2.28.1.orig/eel/Makefile.in 2009-10-20 13:17:55.000000000 +0200
++++ nautilus-2.28.1/eel/Makefile.in 2009-10-24 15:18:08.397762931 +0200
+@@ -52,7 +52,9 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
@@ -19710,7 +19587,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 @@
+@@ -208,6 +210,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19718,7 +19595,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -308,6 +311,9 @@
+@@ -308,6 +311,9 @@ INCLUDES = \
libeel_2_la_LDFLAGS = \
-no-undefined \
@@ -19730,9 +19607,9 @@
$(X_LIBS) \
Index: nautilus-2.28.1/icons/Makefile.in
===================================================================
---- nautilus-2.28.1.orig/icons/Makefile.in 2009-10-20 11:17:55.000000000 +0000
-+++ nautilus-2.28.1/icons/Makefile.in 2009-10-24 10:11:17.000000000 +0000
-@@ -183,6 +183,7 @@
+--- nautilus-2.28.1.orig/icons/Makefile.in 2009-10-20 13:17:55.000000000 +0200
++++ nautilus-2.28.1/icons/Makefile.in 2009-10-24 15:18:08.397762931 +0200
+@@ -183,6 +183,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19742,9 +19619,9 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.1/INSTALL
===================================================================
---- nautilus-2.28.1.orig/INSTALL 2009-05-23 18:14:13.000000000 +0000
-+++ nautilus-2.28.1/INSTALL 2009-10-24 10:11:17.000000000 +0000
-@@ -2,15 +2,15 @@
+--- nautilus-2.28.1.orig/INSTALL 2009-05-23 20:14:13.000000000 +0200
++++ nautilus-2.28.1/INSTALL 2009-10-24 15:18:08.401761554 +0200
+@@ -2,15 +2,15 @@ Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
@@ -19763,7 +19640,7 @@
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package.
-@@ -73,9 +73,9 @@
+@@ -73,9 +73,9 @@ The simplest way to compile this package
Compilers and Options
=====================
@@ -19776,7 +19653,7 @@
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
-@@ -88,7 +88,7 @@
+@@ -88,7 +88,7 @@ is an example:
Compiling For Multiple Architectures
====================================
@@ -19785,7 +19662,7 @@
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
-@@ -100,10 +100,24 @@
+@@ -100,10 +100,24 @@ architecture at a time in the source cod
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
@@ -19811,7 +19688,7 @@
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
-@@ -126,7 +140,7 @@
+@@ -126,7 +140,7 @@ option `--program-prefix=PREFIX' or `--p
Optional Features
=================
@@ -19820,7 +19697,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 +152,46 @@
+@@ -138,14 +152,46 @@ find the X include and library files aut
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
@@ -19872,7 +19749,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 +199,8 @@
+@@ -153,7 +199,8 @@ type, such as `sun4', or a canonical nam
where SYSTEM can have one of these forms:
@@ -19882,7 +19759,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 +218,9 @@
+@@ -171,9 +218,9 @@ eventually be run) with `--host=TYPE'.
Sharing Defaults
================
@@ -19895,7 +19772,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 +229,7 @@
+@@ -182,7 +229,7 @@ A warning: not all `configure' scripts l
Defining Variables
==================
@@ -19904,7 +19781,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 +248,19 @@
+@@ -201,11 +248,19 @@ an Autoconf bug. Until the bug is fixed
`configure' Invocation
======================
@@ -19926,7 +19803,7 @@
`--version'
`-V'
-@@ -232,6 +287,16 @@
+@@ -232,6 +287,16 @@ an Autoconf bug. Until the bug is fixed
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
@@ -19945,9 +19822,9 @@
Index: nautilus-2.28.1/libnautilus-extension/Makefile.in
===================================================================
---- nautilus-2.28.1.orig/libnautilus-extension/Makefile.in 2009-10-20 11:17:56.000000000 +0000
-+++ nautilus-2.28.1/libnautilus-extension/Makefile.in 2009-10-24 10:11:17.000000000 +0000
-@@ -222,6 +222,7 @@
+--- nautilus-2.28.1.orig/libnautilus-extension/Makefile.in 2009-10-20 13:17:56.000000000 +0200
++++ nautilus-2.28.1/libnautilus-extension/Makefile.in 2009-10-24 15:18:08.401761554 +0200
+@@ -222,6 +222,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19957,9 +19834,9 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.1/libnautilus-private/Makefile.in
===================================================================
---- nautilus-2.28.1.orig/libnautilus-private/Makefile.in 2009-10-20 11:17:56.000000000 +0000
-+++ nautilus-2.28.1/libnautilus-private/Makefile.in 2009-10-24 10:11:17.000000000 +0000
-@@ -341,6 +341,7 @@
+--- nautilus-2.28.1.orig/libnautilus-private/Makefile.in 2009-10-20 13:17:56.000000000 +0200
++++ nautilus-2.28.1/libnautilus-private/Makefile.in 2009-10-24 15:18:08.401761554 +0200
+@@ -341,6 +341,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19969,8 +19846,8 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.1/ltmain.sh
===================================================================
---- nautilus-2.28.1.orig/ltmain.sh 2009-10-20 11:17:50.000000000 +0000
-+++ nautilus-2.28.1/ltmain.sh 2009-10-24 10:11:17.000000000 +0000
+--- nautilus-2.28.1.orig/ltmain.sh 2009-10-20 13:17:50.000000000 +0200
++++ nautilus-2.28.1/ltmain.sh 2009-10-24 15:18:08.405767510 +0200
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -19989,7 +19866,7 @@
TIMESTAMP=""
package_revision=1.3012
-@@ -5033,7 +5033,10 @@
+@@ -5033,7 +5033,10 @@ func_mode_link ()
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -20001,7 +19878,7 @@
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5344,19 +5347,19 @@
+@@ -5344,19 +5347,19 @@ func_mode_link ()
# 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"
@@ -20031,7 +19908,7 @@
continue
fi # $pass = conv
-@@ -5893,6 +5896,7 @@
+@@ -5893,6 +5896,7 @@ func_mode_link ()
if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
@@ -20039,7 +19916,7 @@
case $deplib in
-L*) path="$deplib" ;;
*.la)
-@@ -6206,6 +6210,9 @@
+@@ -6206,6 +6210,9 @@ func_mode_link ()
revision="$number_minor"
lt_irix_increment=no
;;
@@ -20051,9 +19928,9 @@
no)
Index: nautilus-2.28.1/Makefile.in
===================================================================
---- nautilus-2.28.1.orig/Makefile.in 2009-10-20 11:17:56.000000000 +0000
-+++ nautilus-2.28.1/Makefile.in 2009-10-24 10:11:17.000000000 +0000
-@@ -216,6 +216,7 @@
+--- nautilus-2.28.1.orig/Makefile.in 2009-10-20 13:17:56.000000000 +0200
++++ nautilus-2.28.1/Makefile.in 2009-10-24 15:18:08.405767510 +0200
+@@ -216,6 +216,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20063,9 +19940,9 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.1/src/file-manager/Makefile.in
===================================================================
---- nautilus-2.28.1.orig/src/file-manager/Makefile.in 2009-10-20 11:17:56.000000000 +0000
-+++ nautilus-2.28.1/src/file-manager/Makefile.in 2009-10-24 10:11:17.000000000 +0000
-@@ -223,6 +223,7 @@
+--- nautilus-2.28.1.orig/src/file-manager/Makefile.in 2009-10-20 13:17:56.000000000 +0200
++++ nautilus-2.28.1/src/file-manager/Makefile.in 2009-10-24 15:18:08.405767510 +0200
+@@ -223,6 +223,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20075,9 +19952,9 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.1/src/Makefile.in
===================================================================
---- nautilus-2.28.1.orig/src/Makefile.in 2009-10-20 11:17:56.000000000 +0000
-+++ nautilus-2.28.1/src/Makefile.in 2009-10-24 10:11:17.000000000 +0000
-@@ -342,6 +342,7 @@
+--- nautilus-2.28.1.orig/src/Makefile.in 2009-10-20 13:17:56.000000000 +0200
++++ nautilus-2.28.1/src/Makefile.in 2009-10-24 15:18:08.409760755 +0200
+@@ -342,6 +342,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20087,9 +19964,9 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.1/test/Makefile.in
===================================================================
---- nautilus-2.28.1.orig/test/Makefile.in 2009-10-20 11:17:56.000000000 +0000
-+++ nautilus-2.28.1/test/Makefile.in 2009-10-24 10:11:17.000000000 +0000
-@@ -271,6 +271,7 @@
+--- nautilus-2.28.1.orig/test/Makefile.in 2009-10-20 13:17:56.000000000 +0200
++++ nautilus-2.28.1/test/Makefile.in 2009-10-24 15:18:08.409760755 +0200
+@@ -271,6 +271,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20099,8 +19976,8 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.1/gtk-doc.make
===================================================================
---- nautilus-2.28.1.orig/gtk-doc.make 2009-10-20 11:17:50.000000000 +0000
-+++ nautilus-2.28.1/gtk-doc.make 2009-10-24 10:11:17.000000000 +0000
+--- nautilus-2.28.1.orig/gtk-doc.make 2009-10-20 13:17:50.000000000 +0200
++++ nautilus-2.28.1/gtk-doc.make 2009-10-24 15:18:08.409760755 +0200
@@ -5,13 +5,13 @@
####################################
@@ -20118,7 +19995,7 @@
endif
# We set GPATH here; this gives us semantics for GNU make
-@@ -62,9 +62,9 @@
+@@ -62,9 +62,9 @@ $(REPORT_FILES): sgml-build.stamp
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
@echo 'gtk-doc: Scanning header files'
@-chmod -R u+w $(srcdir)
@@ -20130,7 +20007,7 @@
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
else \
cd $(srcdir) ; \
-@@ -72,7 +72,7 @@
+@@ -72,7 +72,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_
test -f $$i || touch $$i ; \
done \
fi
@@ -20139,7 +20016,7 @@
$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
@true
-@@ -82,23 +82,24 @@
+@@ -82,23 +82,24 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES)
tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
@echo 'gtk-doc: Rebuilding template files'
@-chmod -R u+w $(srcdir)
@@ -20170,7 +20047,7 @@
sgml.stamp: sgml-build.stamp
@true
-@@ -108,18 +109,18 @@
+@@ -108,18 +109,18 @@ sgml.stamp: sgml-build.stamp
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@echo 'gtk-doc: Building HTML'
@-chmod -R u+w $(srcdir)
@@ -20196,7 +20073,7 @@
##############
-@@ -136,7 +137,7 @@
+@@ -136,7 +137,7 @@ maintainer-clean-local: clean
cd $(srcdir) && rm -rf xml html
install-data-local:
@@ -20205,7 +20082,7 @@
if test "$$installfiles" = '$(srcdir)/html/*'; \
then echo '-- Nothing to install' ; \
else \
-@@ -156,11 +157,12 @@
+@@ -156,11 +157,12 @@ install-data-local:
mv -f $${installdir}/$(DOC_MODULE).devhelp \
$${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
fi; \
@@ -20220,7 +20097,7 @@
installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
else \
installdir="$(DESTDIR)$(TARGET_DIR)"; \
-@@ -180,12 +182,15 @@
+@@ -180,12 +182,15 @@ endif
dist-hook: dist-check-gtkdoc dist-hook-local
mkdir $(distdir)/tmpl
@@ -20239,8 +20116,8 @@
.PHONY : dist-hook-local docs
Index: nautilus-2.28.1/config.sub
===================================================================
---- nautilus-2.28.1.orig/config.sub 2009-10-20 11:17:55.000000000 +0000
-+++ nautilus-2.28.1/config.sub 2009-10-24 10:11:17.000000000 +0000
+--- nautilus-2.28.1.orig/config.sub 2009-10-20 13:17:55.000000000 +0200
++++ nautilus-2.28.1/config.sub 2009-10-24 15:18:08.409760755 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -20254,7 +20131,7 @@
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
-@@ -153,6 +153,9 @@
+@@ -153,6 +153,9 @@ case $os in
os=
basic_machine=$1
;;
@@ -20264,7 +20141,7 @@
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
-@@ -467,6 +470,10 @@
+@@ -467,6 +470,10 @@ case $basic_machine in
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
@@ -20275,7 +20152,7 @@
c90)
basic_machine=c90-cray
os=-unicos
-@@ -1260,7 +1267,7 @@
+@@ -1260,7 +1267,7 @@ case $os in
# 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* \
@@ -20284,7 +20161,7 @@
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
| -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-@@ -1613,7 +1620,7 @@
+@@ -1613,7 +1620,7 @@ case $basic_machine in
-sunos*)
vendor=sun
;;
@@ -20295,9 +20172,9 @@
-beos*)
Index: nautilus-2.28.1/m4/Makefile.in
===================================================================
---- nautilus-2.28.1.orig/m4/Makefile.in 2009-10-20 11:17:56.000000000 +0000
-+++ nautilus-2.28.1/m4/Makefile.in 2009-10-24 10:11:17.000000000 +0000
-@@ -160,6 +160,7 @@
+--- nautilus-2.28.1.orig/m4/Makefile.in 2009-10-20 13:17:56.000000000 +0200
++++ nautilus-2.28.1/m4/Makefile.in 2009-10-24 15:18:08.409760755 +0200
+@@ -160,6 +160,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20307,9 +20184,9 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
Index: nautilus-2.28.1/m4/libtool.m4
===================================================================
---- nautilus-2.28.1.orig/m4/libtool.m4 2009-10-20 11:17:50.000000000 +0000
-+++ nautilus-2.28.1/m4/libtool.m4 2009-10-24 10:11:17.000000000 +0000
-@@ -2470,13 +2470,10 @@
+--- nautilus-2.28.1.orig/m4/libtool.m4 2009-10-20 13:17:50.000000000 +0200
++++ nautilus-2.28.1/m4/libtool.m4 2009-10-24 15:18:08.413765733 +0200
+@@ -2470,13 +2470,10 @@ linux* | k*bsd*-gnu)
# before this can be enabled.
hardcode_into_libs=yes
@@ -20324,7 +20201,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -2488,6 +2485,18 @@
+@@ -2488,6 +2485,18 @@ linux* | k*bsd*-gnu)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -20343,7 +20220,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -3079,7 +3088,7 @@
+@@ -3079,7 +3088,7 @@ linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -20352,7 +20229,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
-@@ -3760,7 +3769,7 @@
+@@ -3760,7 +3769,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
@@ -20361,7 +20238,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -4185,6 +4194,9 @@
+@@ -4185,6 +4194,9 @@ m4_if([$1], [CXX], [
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'
;;
@@ -20371,7 +20248,7 @@
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -4249,6 +4261,9 @@
+@@ -4249,6 +4261,9 @@ dnl Note also adjust exclude_expsyms for
openbsd*)
with_gnu_ld=no
;;
@@ -20381,7 +20258,7 @@
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4431,7 +4446,7 @@
+@@ -4431,7 +4446,7 @@ _LT_EOF
fi
;;
@@ -20390,7 +20267,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 +4621,7 @@
+@@ -4606,6 +4621,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -20398,7 +20275,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -4844,7 +4860,7 @@
+@@ -4844,7 +4860,7 @@ _LT_EOF
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
Modified: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=22113&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/series [utf-8] Sat Oct 24 13:33:25 2009
@@ -3,7 +3,6 @@
02_eel_libadd.patch
10_load_session.patch
12_list-view_expand.patch
-13_autostart.patch
20_open-with_install.patch
90_relibtoolize.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list