r24049 - in /desktop/unstable/nautilus/debian: changelog patches/02_eel_libadd.patch patches/04_tracker_0.8.patch patches/90_relibtoolize.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Apr 27 17:06:23 UTC 2010
Author: joss
Date: Tue Apr 27 17:06:19 2010
New Revision: 24049
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24049
Log:
* New upstream release.
* 02_eel_libadd.patch, 04_tracker_0.8.patch: dropped, merged upstream.
* 90_relibtoolize.patch: updated for the new version.
Removed:
desktop/unstable/nautilus/debian/patches/02_eel_libadd.patch
desktop/unstable/nautilus/debian/patches/04_tracker_0.8.patch
Modified:
desktop/unstable/nautilus/debian/changelog
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=24049&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog [utf-8] (original)
+++ desktop/unstable/nautilus/debian/changelog [utf-8] Tue Apr 27 17:06:19 2010
@@ -1,8 +1,11 @@
-nautilus (2.30.0-2) UNRELEASED; urgency=low
+nautilus (2.30.1-1) unstable; urgency=low
* Bump shlibs for libnautilus-extension1. Closes: #577856.
-
- -- Josselin Mouette <joss at debian.org> Fri, 23 Apr 2010 21:56:49 +0200
+ * New upstream release.
+ * 02_eel_libadd.patch, 04_tracker_0.8.patch: dropped, merged upstream.
+ * 90_relibtoolize.patch: updated for the new version.
+
+ -- Josselin Mouette <joss at debian.org> Tue, 27 Apr 2010 19:06:00 +0200
nautilus (2.30.0-1) experimental; urgency=low
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=24049&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch [utf-8] Tue Apr 27 17:06:19 2010
@@ -6,10 +6,10 @@
autoconf
rm -rf autom4te.cache config.h.in~
-Index: nautilus-2.30.0/aclocal.m4
+Index: nautilus-2.30.1/aclocal.m4
===================================================================
---- nautilus-2.30.0.orig/aclocal.m4 2010-04-13 23:22:31.291709659 +0200
-+++ nautilus-2.30.0/aclocal.m4 2010-04-13 23:21:43.175714435 +0200
+--- nautilus-2.30.1.orig/aclocal.m4 2010-04-26 13:24:09.000000000 +0200
++++ nautilus-2.30.1/aclocal.m4 2010-04-27 19:04:35.801525608 +0200
@@ -13,1691 +13,1693 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -3208,10 +3208,10 @@
m4_include([m4/gtk-doc.m4])
m4_include([m4/intltool.m4])
-Index: nautilus-2.30.0/config.guess
+Index: nautilus-2.30.1/config.guess
===================================================================
---- nautilus-2.30.0.orig/config.guess 2010-04-13 23:22:34.147717291 +0200
-+++ nautilus-2.30.0/config.guess 2010-04-13 23:22:09.255721834 +0200
+--- nautilus-2.30.1.orig/config.guess 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1/config.guess 2010-04-27 19:04:35.805526674 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -3225,7 +3225,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
-@@ -56,8 +56,9 @@
+@@ -56,8 +56,9 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
@@ -3237,10 +3237,10 @@
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-Index: nautilus-2.30.0/config.h.in
+Index: nautilus-2.30.1/config.h.in
===================================================================
---- nautilus-2.30.0.orig/config.h.in 2010-04-13 23:22:31.351717859 +0200
-+++ nautilus-2.30.0/config.h.in 2010-04-13 23:22:14.487715058 +0200
+--- nautilus-2.30.1.orig/config.h.in 2010-04-26 13:24:11.000000000 +0200
++++ nautilus-2.30.1/config.h.in 2010-04-27 19:04:35.805526674 +0200
@@ -154,6 +154,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -3251,10 +3251,10 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-Index: nautilus-2.30.0/config.sub
+Index: nautilus-2.30.1/config.sub
===================================================================
---- nautilus-2.30.0.orig/config.sub 2010-04-13 23:22:34.335714983 +0200
-+++ nautilus-2.30.0/config.sub 2010-04-13 23:22:09.263718105 +0200
+--- nautilus-2.30.1.orig/config.sub 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1/config.sub 2010-04-27 19:04:35.805526674 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -3268,7 +3268,7 @@
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
-@@ -75,8 +75,9 @@
+@@ -75,8 +75,9 @@ Report bugs and patches to <config-patch
version="\
GNU config.sub ($timestamp)
@@ -3280,7 +3280,7 @@
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -380,7 +381,8 @@
+@@ -380,7 +381,8 @@ case $basic_machine in
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
@@ -3290,7 +3290,7 @@
| tron-* \
| ubicom32-* \
| v850-* | v850e-* | vax-* \
-@@ -1085,6 +1087,11 @@
+@@ -1085,6 +1087,11 @@ case $basic_machine in
basic_machine=tic6x-unknown
os=-coff
;;
@@ -3302,7 +3302,7 @@
tile*)
basic_machine=tile-unknown
os=-linux-gnu
-@@ -1435,6 +1442,8 @@
+@@ -1435,6 +1442,8 @@ case $os in
-dicos*)
os=-dicos
;;
@@ -3311,15 +3311,15 @@
-none)
;;
*)
-Index: nautilus-2.30.0/configure
+Index: nautilus-2.30.1/configure
===================================================================
---- nautilus-2.30.0.orig/configure 2010-04-13 23:22:40.491715570 +0200
-+++ nautilus-2.30.0/configure 2010-04-13 23:22:20.315711319 +0200
+--- nautilus-2.30.1.orig/configure 2010-04-26 13:24:11.000000000 +0200
++++ nautilus-2.30.1/configure 2010-04-27 19:05:01.006025328 +0200
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for nautilus 2.30.0.
-+# Generated by GNU Autoconf 2.65 for nautilus 2.30.0.
+-# Generated by GNU Autoconf 2.63 for nautilus 2.30.1.
++# Generated by GNU Autoconf 2.65 for nautilus 2.30.1.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus>.
#
@@ -3346,7 +3346,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -22,23 +26,15 @@
+@@ -22,23 +26,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -3375,7 +3375,7 @@
as_nl='
'
export as_nl
-@@ -46,7 +42,13 @@
+@@ -46,7 +42,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
@@ -3390,7 +3390,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -57,7 +59,7 @@
+@@ -57,7 +59,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -3399,7 +3399,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -80,13 +82,6 @@
+@@ -80,13 +82,6 @@ if test "${PATH_SEPARATOR+set}" != set;
}
fi
@@ -3413,7 +3413,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -96,15 +91,15 @@
+@@ -96,15 +91,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -3432,7 +3432,7 @@
IFS=$as_save_IFS
;;
-@@ -116,12 +111,16 @@
+@@ -116,12 +111,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
@@ -3453,7 +3453,7 @@
done
PS1='$ '
PS2='> '
-@@ -133,330 +132,301 @@
+@@ -133,330 +132,301 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
@@ -4031,7 +4031,7 @@
sed -n '
p
/[$]LINENO/=
-@@ -473,8 +443,7 @@
+@@ -473,8 +443,7 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
@@ -4041,7 +4041,7 @@
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
-@@ -484,29 +453,18 @@
+@@ -484,29 +453,18 @@ test \$exitcode = 0") || {
exit
}
@@ -4076,7 +4076,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -536,7 +494,7 @@
+@@ -536,7 +494,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
@@ -4085,7 +4085,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -555,10 +513,10 @@
+@@ -555,10 +513,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
@@ -4098,7 +4098,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -573,7 +531,6 @@
+@@ -573,7 +531,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
@@ -4106,7 +4106,7 @@
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
-@@ -722,7 +679,8 @@
+@@ -722,7 +679,8 @@ fi
@@ -4116,7 +4116,7 @@
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-@@ -740,7 +698,6 @@
+@@ -740,7 +698,6 @@ cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
@@ -4124,15 +4124,15 @@
# Identity of this package.
PACKAGE_NAME='nautilus'
-@@ -748,6 +705,7 @@
- PACKAGE_VERSION='2.30.0'
- PACKAGE_STRING='nautilus 2.30.0'
+@@ -748,6 +705,7 @@ PACKAGE_TARNAME='nautilus'
+ PACKAGE_VERSION='2.30.1'
+ PACKAGE_STRING='nautilus 2.30.1'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus'
+PACKAGE_URL=''
ac_unique_file="src"
# Factoring default headers for most tests.
-@@ -1001,6 +959,7 @@
+@@ -1001,6 +959,7 @@ bindir
program_transform_name
prefix
exec_prefix
@@ -4140,7 +4140,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1163,8 +1122,7 @@
+@@ -1163,8 +1122,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 &&
@@ -4150,7 +4150,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1190,8 +1148,7 @@
+@@ -1190,8 +1148,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 &&
@@ -4160,7 +4160,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1395,8 +1352,7 @@
+@@ -1395,8 +1352,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 &&
@@ -4170,7 +4170,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1412,8 +1368,7 @@
+@@ -1412,8 +1368,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 &&
@@ -4180,7 +4180,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1443,17 +1398,17 @@
+@@ -1443,17 +1398,17 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -4204,7 +4204,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1470,15 +1425,13 @@
+@@ -1470,15 +1425,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -4222,7 +4222,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1501,8 +1454,7 @@
+@@ -1501,8 +1454,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -4232,7 +4232,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1532,11 +1484,9 @@
+@@ -1532,11 +1484,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 .` ||
@@ -4246,7 +4246,7 @@
# Find the source files, if location was not specified.
-@@ -1575,13 +1525,11 @@
+@@ -1575,13 +1525,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -4262,7 +4262,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1701,9 +1649,9 @@
+@@ -1701,9 +1649,9 @@ Optional Features:
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--disable-nls do not use Native Language Support
@@ -4275,7 +4275,7 @@
--enable-profiler Enable profiler
--disable-xmp build without xmp support
--enable-empty-view Enable empty view
-@@ -1712,7 +1660,7 @@
+@@ -1712,7 +1660,7 @@ Optional Features:
--disable-schemas-install
Disable the schemas installation
--disable-update-mimedb disable the update-mime-database after install
@@ -4284,7 +4284,7 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-@@ -1733,7 +1681,7 @@
+@@ -1733,7 +1681,7 @@ Some influential environment variables:
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
@@ -4293,10 +4293,10 @@
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
-@@ -1817,21 +1765,378 @@
+@@ -1817,21 +1765,378 @@ test -n "$ac_init_help" && exit $ac_stat
if $ac_init_version; then
cat <<\_ACEOF
- nautilus configure 2.30.0
+ nautilus configure 2.30.1
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.65
@@ -4670,13 +4670,13 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by nautilus $as_me 2.30.0, which was
+ It was created by nautilus $as_me 2.30.1, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
-@@ -1867,8 +2172,8 @@
+@@ -1867,8 +2172,8 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4687,7 +4687,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1905,9 +2210,9 @@
+@@ -1905,9 +2210,9 @@ do
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -4699,7 +4699,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1923,13 +2228,13 @@
+@@ -1923,13 +2228,13 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -4716,7 +4716,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -1954,13 +2259,13 @@
+@@ -1954,13 +2259,13 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -4732,7 +4732,7 @@
esac ;;
esac
done
-@@ -2032,39 +2337,41 @@
+@@ -2032,39 +2337,41 @@ _ASBOX
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -4779,7 +4779,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2082,8 +2389,8 @@
+@@ -2082,8 +2389,8 @@ fi
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -4790,7 +4790,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2091,10 +2398,10 @@
+@@ -2091,10 +2398,10 @@ $as_echo "$as_me: loading site script $a
done
if test -r "$cache_file"; then
@@ -4805,7 +4805,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2102,7 +2409,7 @@
+@@ -2102,7 +2409,7 @@ $as_echo "$as_me: loading cache $cache_f
esac
fi
else
@@ -4814,7 +4814,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2117,11 +2424,11 @@
+@@ -2117,11 +2424,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,)
@@ -4828,7 +4828,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2131,17 +2438,17 @@
+@@ -2131,17 +2438,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
@@ -4850,7 +4850,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2153,43 +2460,20 @@
+@@ -2153,43 +2460,20 @@ $as_echo "$as_me: current value: \`$ac
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -4901,7 +4901,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2209,24 +2493,16 @@
+@@ -2209,24 +2493,16 @@ am__api_version='1.11'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -4934,7 +4934,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2252,10 +2528,10 @@
+@@ -2252,10 +2528,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.
@@ -4947,7 +4947,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2263,11 +2539,11 @@
+@@ -2263,11 +2539,11 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4963,7 +4963,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2304,7 +2580,7 @@
+@@ -2304,7 +2580,7 @@ case $as_dir/ in
;;
esac
@@ -4972,7 +4972,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2320,7 +2596,7 @@
+@@ -2320,7 +2596,7 @@ fi
INSTALL=$ac_install_sh
fi
fi
@@ -4981,7 +4981,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2331,7 +2607,7 @@
+@@ -2331,7 +2607,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -4990,7 +4990,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2342,15 +2618,11 @@
+@@ -2342,15 +2618,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -5008,7 +5008,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2372,11 +2644,8 @@
+@@ -2372,11 +2644,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".
@@ -5022,7 +5022,7 @@
fi
test "$2" = conftest.file
-@@ -2385,13 +2654,10 @@
+@@ -2385,13 +2654,10 @@ then
# Ok.
:
else
@@ -5039,7 +5039,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2419,7 +2685,7 @@
+@@ -2419,7 +2685,7 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -5048,7 +5048,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2440,9 +2706,9 @@
+@@ -2440,9 +2706,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
@@ -5060,7 +5060,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2453,24 +2719,24 @@
+@@ -2453,24 +2719,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5090,7 +5090,7 @@
$as_echo "no" >&6; }
fi
-@@ -2480,9 +2746,9 @@
+@@ -2480,9 +2746,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
@@ -5102,7 +5102,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2493,24 +2759,24 @@
+@@ -2493,24 +2759,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5132,7 +5132,7 @@
$as_echo "no" >&6; }
fi
-@@ -2519,7 +2785,7 @@
+@@ -2519,7 +2785,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5141,7 +5141,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2532,10 +2798,10 @@
+@@ -2532,10 +2798,10 @@ fi
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -5154,7 +5154,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2543,7 +2809,7 @@
+@@ -2543,7 +2809,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5163,7 +5163,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 #(
-@@ -2555,11 +2821,12 @@
+@@ -2555,11 +2821,12 @@ do
esac
done
done
@@ -5177,7 +5177,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2567,11 +2834,10 @@
+@@ -2567,11 +2834,10 @@ fi
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
@@ -5190,7 +5190,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2584,9 +2850,9 @@
+@@ -2584,9 +2850,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
@@ -5202,7 +5202,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2597,24 +2863,24 @@
+@@ -2597,24 +2863,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5232,7 +5232,7 @@
$as_echo "no" >&6; }
fi
-@@ -2622,11 +2888,11 @@
+@@ -2622,11 +2888,11 @@ fi
test -n "$AWK" && break
done
@@ -5246,7 +5246,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2644,11 +2910,11 @@
+@@ -2644,11 +2910,11 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -5260,7 +5260,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2668,9 +2934,7 @@
+@@ -2668,9 +2934,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
@@ -5271,7 +5271,7 @@
fi
fi
-@@ -2721,7 +2985,7 @@
+@@ -2721,7 +2985,7 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma
AMTAR=${AMTAR-"${am_missing_run}tar"}
@@ -5280,7 +5280,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'
-@@ -2794,13 +3058,13 @@
+@@ -2794,13 +3058,13 @@ do
done
rm -rf conftest.dir
@@ -5296,7 +5296,7 @@
$as_echo "$am_cv_prog_tar_ustar" >&6; }
-@@ -2808,7 +3072,7 @@
+@@ -2808,7 +3072,7 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
# Check whether --enable-silent-rules was given.
@@ -5305,7 +5305,7 @@
enableval=$enable_silent_rules;
fi
-@@ -2820,16 +3084,16 @@
+@@ -2820,16 +3084,16 @@ esac
AM_BACKSLASH='\'
@@ -5325,7 +5325,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2872,7 +3136,7 @@
+@@ -2872,7 +3136,7 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -5334,7 +5334,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -2900,12 +3164,12 @@
+@@ -2900,12 +3164,12 @@ if test "$am__include" = "#"; then
fi
@@ -5349,7 +5349,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -2930,9 +3194,9 @@
+@@ -2930,9 +3194,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
@@ -5361,7 +5361,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2943,24 +3207,24 @@
+@@ -2943,24 +3207,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5391,7 +5391,7 @@
$as_echo "no" >&6; }
fi
-@@ -2970,9 +3234,9 @@
+@@ -2970,9 +3234,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
@@ -5403,7 +5403,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -2983,24 +3247,24 @@
+@@ -2983,24 +3247,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5433,7 +5433,7 @@
$as_echo "no" >&6; }
fi
-@@ -3009,7 +3273,7 @@
+@@ -3009,7 +3273,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5442,7 +5442,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3023,9 +3287,9 @@
+@@ -3023,9 +3287,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
@@ -5454,7 +5454,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3036,24 +3300,24 @@
+@@ -3036,24 +3300,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5484,7 +5484,7 @@
$as_echo "no" >&6; }
fi
-@@ -3063,9 +3327,9 @@
+@@ -3063,9 +3327,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
@@ -5496,7 +5496,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3077,18 +3341,18 @@
+@@ -3077,18 +3341,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5518,7 +5518,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3107,10 +3371,10 @@
+@@ -3107,10 +3371,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -5531,7 +5531,7 @@
$as_echo "no" >&6; }
fi
-@@ -3122,9 +3386,9 @@
+@@ -3122,9 +3386,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
@@ -5543,7 +5543,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3135,24 +3399,24 @@
+@@ -3135,24 +3399,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5573,7 +5573,7 @@
$as_echo "no" >&6; }
fi
-@@ -3166,9 +3430,9 @@
+@@ -3166,9 +3430,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
@@ -5585,7 +5585,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3179,24 +3443,24 @@
+@@ -3179,24 +3443,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5615,7 +5615,7 @@
$as_echo "no" >&6; }
fi
-@@ -3209,7 +3473,7 @@
+@@ -3209,7 +3473,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5624,7 +5624,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3220,57 +3484,37 @@
+@@ -3220,57 +3484,37 @@ fi
fi
@@ -5702,7 +5702,7 @@
/* end confdefs.h. */
int
-@@ -3286,8 +3530,8 @@
+@@ -3286,8 +3530,8 @@ ac_clean_files="$ac_clean_files a.out a.
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -5713,7 +5713,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3303,17 +3547,17 @@
+@@ -3303,17 +3547,17 @@ do
done
rm -f $ac_rmfiles
@@ -5736,7 +5736,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,
-@@ -3330,7 +3574,7 @@
+@@ -3330,7 +3574,7 @@ do
# certainly right.
break;;
*.* )
@@ -5745,7 +5745,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3349,84 +3593,42 @@
+@@ -3349,84 +3593,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
else
ac_file=''
fi
@@ -5851,7 +5851,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
-@@ -3441,32 +3643,83 @@
+@@ -3441,32 +3643,83 @@ for ac_file in conftest.exe conftest con
esac
done
else
@@ -5951,7 +5951,7 @@
/* end confdefs.h. */
int
-@@ -3478,17 +3731,17 @@
+@@ -3478,17 +3731,17 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -5974,7 +5974,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3501,31 +3754,23 @@
+@@ -3501,31 +3754,23 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -6013,7 +6013,7 @@
/* end confdefs.h. */
int
-@@ -3539,37 +3784,16 @@
+@@ -3539,37 +3784,16 @@ main ()
return 0;
}
_ACEOF
@@ -6054,7 +6054,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3578,20 +3802,16 @@
+@@ -3578,20 +3802,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -6078,7 +6078,7 @@
/* end confdefs.h. */
int
-@@ -3602,35 +3822,11 @@
+@@ -3602,35 +3822,11 @@ main ()
return 0;
}
_ACEOF
@@ -6117,7 +6117,7 @@
/* end confdefs.h. */
int
-@@ -3641,36 +3837,12 @@
+@@ -3641,36 +3837,12 @@ main ()
return 0;
}
_ACEOF
@@ -6158,7 +6158,7 @@
/* end confdefs.h. */
int
-@@ -3681,42 +3853,17 @@
+@@ -3681,42 +3853,17 @@ main ()
return 0;
}
_ACEOF
@@ -6203,7 +6203,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3733,18 +3880,14 @@
+@@ -3733,18 +3880,14 @@ else
CFLAGS=
fi
fi
@@ -6225,7 +6225,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3801,32 +3944,9 @@
+@@ -3801,32 +3944,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -6259,7 +6259,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3837,17 +3957,19 @@
+@@ -3837,17 +3957,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -6282,7 +6282,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3857,9 +3979,9 @@
+@@ -3857,9 +3979,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -6294,7 +6294,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3967,7 +4089,7 @@
+@@ -3967,7 +4089,7 @@ else
fi
fi
@@ -6303,7 +6303,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3988,14 +4110,14 @@
+@@ -3988,14 +4110,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
@@ -6320,7 +6320,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -4010,11 +4132,7 @@
+@@ -4010,11 +4132,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.
@@ -6333,7 +6333,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4023,78 +4141,34 @@
+@@ -4023,78 +4141,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -6417,7 +6417,7 @@
break
fi
-@@ -4106,7 +4180,7 @@
+@@ -4106,7 +4180,7 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
@@ -6426,7 +6426,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -4117,11 +4191,7 @@
+@@ -4117,11 +4191,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.
@@ -6439,7 +6439,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4130,87 +4200,40 @@
+@@ -4130,87 +4200,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -6536,7 +6536,7 @@
fi
ac_ext=c
-@@ -4220,9 +4243,9 @@
+@@ -4220,9 +4243,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -6548,7 +6548,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4233,7 +4256,7 @@
+@@ -4233,7 +4256,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6557,7 +6557,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
-@@ -4253,7 +4276,7 @@
+@@ -4253,7 +4276,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
@@ -6566,7 +6566,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"
-@@ -4268,26 +4291,24 @@
+@@ -4268,26 +4291,24 @@ esac
$ac_path_GREP_found && break 3
done
done
@@ -6598,7 +6598,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4301,7 +4322,7 @@
+@@ -4301,7 +4322,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6607,7 +6607,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
-@@ -4321,7 +4342,7 @@
+@@ -4321,7 +4342,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
@@ -6616,7 +6616,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"
-@@ -4336,12 +4357,10 @@
+@@ -4336,12 +4357,10 @@ esac
$ac_path_EGREP_found && break 3
done
done
@@ -6631,7 +6631,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4349,21 +4368,17 @@
+@@ -4349,21 +4368,17 @@ fi
fi
fi
@@ -6657,7 +6657,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -4378,48 +4393,23 @@
+@@ -4378,48 +4393,23 @@ main ()
return 0;
}
_ACEOF
@@ -6711,7 +6711,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4429,18 +4419,14 @@
+@@ -4429,18 +4419,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -6733,7 +6733,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4450,14 +4436,10 @@
+@@ -4450,14 +4436,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.
@@ -6750,7 +6750,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -4484,118 +4466,34 @@
+@@ -4484,118 +4466,34 @@ main ()
return 0;
}
_ACEOF
@@ -6882,7 +6882,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -4605,19 +4503,14 @@
+@@ -4605,19 +4503,14 @@ fi
done
@@ -6905,7 +6905,7 @@
/* end confdefs.h. */
#ifndef __APPLE_CC__
not a universal capable compiler
-@@ -4625,46 +4518,34 @@
+@@ -4625,46 +4518,34 @@ cat >>conftest.$ac_ext <<_ACEOF
typedef int dummy;
_ACEOF
@@ -6974,7 +6974,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-@@ -4682,30 +4563,9 @@
+@@ -4682,30 +4563,9 @@ main ()
return 0;
}
_ACEOF
@@ -7007,7 +7007,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-@@ -4721,49 +4581,18 @@
+@@ -4721,49 +4581,18 @@ main ()
return 0;
}
_ACEOF
@@ -7060,7 +7060,7 @@
/* end confdefs.h. */
#include <limits.h>
-@@ -4778,30 +4607,9 @@
+@@ -4778,30 +4607,9 @@ main ()
return 0;
}
_ACEOF
@@ -7093,7 +7093,7 @@
/* end confdefs.h. */
#include <limits.h>
-@@ -4816,51 +4624,20 @@
+@@ -4816,51 +4624,20 @@ main ()
return 0;
}
_ACEOF
@@ -7149,7 +7149,7 @@
/* end confdefs.h. */
short int ascii_mm[] =
{ 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-@@ -4886,24 +4663,7 @@
+@@ -4886,24 +4663,7 @@ return use_ascii (foo) == use_ebcdic (fo
return 0;
}
_ACEOF
@@ -7175,7 +7175,7 @@
if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
ac_cv_c_bigendian=yes
fi
-@@ -4915,20 +4675,10 @@
+@@ -4915,20 +4675,10 @@ $as_echo "$ac_try_echo") >&5
ac_cv_c_bigendian=unknown
fi
fi
@@ -7197,7 +7197,7 @@
/* end confdefs.h. */
$ac_includes_default
int
-@@ -4948,79 +4698,41 @@
+@@ -4948,79 +4698,41 @@ main ()
return 0;
}
_ACEOF
@@ -7289,7 +7289,7 @@
/* end confdefs.h. */
int
-@@ -5080,41 +4792,18 @@
+@@ -5080,41 +4792,18 @@ main ()
return 0;
}
_ACEOF
@@ -7335,7 +7335,7 @@
fi
-@@ -5126,9 +4815,9 @@
+@@ -5126,9 +4815,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
@@ -7347,7 +7347,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5139,24 +4828,24 @@
+@@ -5139,24 +4828,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7377,7 +7377,7 @@
$as_echo "no" >&6; }
fi
-@@ -5166,9 +4855,9 @@
+@@ -5166,9 +4855,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
@@ -7389,7 +7389,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -5179,24 +4868,24 @@
+@@ -5179,24 +4868,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7419,7 +7419,7 @@
$as_echo "no" >&6; }
fi
-@@ -5205,7 +4894,7 @@
+@@ -5205,7 +4894,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7428,7 +7428,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5219,9 +4908,9 @@
+@@ -5219,9 +4908,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
@@ -7440,7 +7440,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5232,24 +4921,24 @@
+@@ -5232,24 +4921,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7470,7 +7470,7 @@
$as_echo "no" >&6; }
fi
-@@ -5259,9 +4948,9 @@
+@@ -5259,9 +4948,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
@@ -7482,7 +7482,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5273,18 +4962,18 @@
+@@ -5273,18 +4962,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7504,7 +7504,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -5303,10 +4992,10 @@
+@@ -5303,10 +4992,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7517,7 +7517,7 @@
$as_echo "no" >&6; }
fi
-@@ -5318,9 +5007,9 @@
+@@ -5318,9 +5007,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
@@ -7529,7 +7529,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5331,24 +5020,24 @@
+@@ -5331,24 +5020,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7559,7 +7559,7 @@
$as_echo "no" >&6; }
fi
-@@ -5362,9 +5051,9 @@
+@@ -5362,9 +5051,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
@@ -7571,7 +7571,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -5375,24 +5064,24 @@
+@@ -5375,24 +5064,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7601,7 +7601,7 @@
$as_echo "no" >&6; }
fi
-@@ -5405,7 +5094,7 @@
+@@ -5405,7 +5094,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7610,7 +7610,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5416,62 +5105,42 @@
+@@ -5416,62 +5105,42 @@ fi
fi
@@ -7695,7 +7695,7 @@
/* end confdefs.h. */
int
-@@ -5485,37 +5154,16 @@
+@@ -5485,37 +5154,16 @@ main ()
return 0;
}
_ACEOF
@@ -7736,7 +7736,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -5524,20 +5172,16 @@
+@@ -5524,20 +5172,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -7760,7 +7760,7 @@
/* end confdefs.h. */
int
-@@ -5548,35 +5192,11 @@
+@@ -5548,35 +5192,11 @@ main ()
return 0;
}
_ACEOF
@@ -7799,7 +7799,7 @@
/* end confdefs.h. */
int
-@@ -5587,36 +5207,12 @@
+@@ -5587,36 +5207,12 @@ main ()
return 0;
}
_ACEOF
@@ -7840,7 +7840,7 @@
/* end confdefs.h. */
int
-@@ -5627,42 +5223,17 @@
+@@ -5627,42 +5223,17 @@ main ()
return 0;
}
_ACEOF
@@ -7885,7 +7885,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -5679,18 +5250,14 @@
+@@ -5679,18 +5250,14 @@ else
CFLAGS=
fi
fi
@@ -7907,7 +7907,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -5747,32 +5314,9 @@
+@@ -5747,32 +5314,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -7941,7 +7941,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -5783,17 +5327,19 @@
+@@ -5783,17 +5327,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -7964,7 +7964,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5803,9 +5349,9 @@
+@@ -5803,9 +5349,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -7976,7 +7976,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5913,7 +5459,7 @@
+@@ -5913,7 +5459,7 @@ else
fi
fi
@@ -7985,7 +7985,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -5933,14 +5479,14 @@
+@@ -5933,14 +5479,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
@@ -8002,7 +8002,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -5955,11 +5501,7 @@
+@@ -5955,11 +5501,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.
@@ -8015,7 +8015,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5968,78 +5510,34 @@
+@@ -5968,78 +5510,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -8099,7 +8099,7 @@
break
fi
-@@ -6051,7 +5549,7 @@
+@@ -6051,7 +5549,7 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
@@ -8108,7 +8108,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -6062,11 +5560,7 @@
+@@ -6062,11 +5560,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.
@@ -8121,7 +8121,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -6075,87 +5569,40 @@
+@@ -6075,87 +5569,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -8218,7 +8218,7 @@
fi
ac_ext=c
-@@ -6164,115 +5611,23 @@
+@@ -6164,115 +5611,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
@@ -8339,7 +8339,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -6290,17 +5645,17 @@
+@@ -6290,17 +5645,17 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -8360,7 +8360,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -6332,35 +5687,27 @@
+@@ -6332,35 +5687,27 @@ fi
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -8403,7 +8403,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -6376,28 +5723,24 @@
+@@ -6376,28 +5723,24 @@ IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -8437,7 +8437,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -6420,9 +5763,9 @@
+@@ -6420,9 +5763,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
@@ -8449,7 +8449,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AS"; then
-@@ -6433,24 +5776,24 @@
+@@ -6433,24 +5776,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8479,7 +8479,7 @@
$as_echo "no" >&6; }
fi
-@@ -6460,9 +5803,9 @@
+@@ -6460,9 +5803,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
@@ -8491,7 +8491,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AS"; then
-@@ -6473,24 +5816,24 @@
+@@ -6473,24 +5816,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8521,7 +8521,7 @@
$as_echo "no" >&6; }
fi
-@@ -6499,7 +5842,7 @@
+@@ -6499,7 +5842,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8530,7 +8530,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6512,9 +5855,9 @@
+@@ -6512,9 +5855,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
@@ -8542,7 +8542,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DLLTOOL"; then
-@@ -6525,24 +5868,24 @@
+@@ -6525,24 +5868,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8572,7 +8572,7 @@
$as_echo "no" >&6; }
fi
-@@ -6552,9 +5895,9 @@
+@@ -6552,9 +5895,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
@@ -8584,7 +8584,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DLLTOOL"; then
-@@ -6565,24 +5908,24 @@
+@@ -6565,24 +5908,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8614,7 +8614,7 @@
$as_echo "no" >&6; }
fi
-@@ -6591,7 +5934,7 @@
+@@ -6591,7 +5934,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8623,7 +8623,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6604,9 +5947,9 @@
+@@ -6604,9 +5947,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
@@ -8635,7 +8635,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -6617,24 +5960,24 @@
+@@ -6617,24 +5960,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8665,7 +8665,7 @@
$as_echo "no" >&6; }
fi
-@@ -6644,9 +5987,9 @@
+@@ -6644,9 +5987,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
@@ -8677,7 +8677,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -6657,24 +6000,24 @@
+@@ -6657,24 +6000,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8707,7 +8707,7 @@
$as_echo "no" >&6; }
fi
-@@ -6683,7 +6026,7 @@
+@@ -6683,7 +6026,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8716,7 +8716,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6718,7 +6061,7 @@
+@@ -6718,7 +6061,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
case `pwd` in
*\ * | *\ *)
@@ -8725,7 +8725,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -6741,9 +6084,9 @@
+@@ -6741,9 +6084,9 @@ macro_revision='1.3017'
ltmain="$ac_aux_dir/ltmain.sh"
@@ -8737,7 +8737,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -6751,7 +6094,7 @@
+@@ -6751,7 +6094,7 @@ else
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -8746,7 +8746,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -6760,7 +6103,7 @@
+@@ -6760,7 +6103,7 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8755,7 +8755,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
-@@ -6780,7 +6123,7 @@
+@@ -6780,7 +6123,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
@@ -8764,7 +8764,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"
-@@ -6795,19 +6138,17 @@
+@@ -6795,19 +6138,17 @@ esac
$ac_path_SED_found && break 3
done
done
@@ -8787,7 +8787,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -6825,9 +6166,9 @@
+@@ -6825,9 +6166,9 @@ Xsed="$SED -e 1s/^X//"
@@ -8799,7 +8799,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -6841,7 +6182,7 @@
+@@ -6841,7 +6182,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8808,7 +8808,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
-@@ -6861,7 +6202,7 @@
+@@ -6861,7 +6202,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
@@ -8817,7 +8817,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"
-@@ -6876,12 +6217,10 @@
+@@ -6876,12 +6217,10 @@ esac
$ac_path_FGREP_found && break 3
done
done
@@ -8832,7 +8832,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -6889,7 +6228,7 @@
+@@ -6889,7 +6228,7 @@ fi
fi
fi
@@ -8841,7 +8841,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -6915,7 +6254,7 @@
+@@ -6915,7 +6254,7 @@ test -z "$GREP" && GREP=grep
# Check whether --with-gnu-ld was given.
@@ -8850,7 +8850,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -6924,7 +6263,7 @@
+@@ -6924,7 +6263,7 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -8859,7 +8859,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -6954,13 +6293,13 @@
+@@ -6954,13 +6293,13 @@ $as_echo_n "checking for ld used by $CC.
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -8876,7 +8876,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -6991,18 +6330,16 @@
+@@ -6991,18 +6330,16 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -8900,7 +8900,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -7015,7 +6352,7 @@
+@@ -7015,7 +6352,7 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
@@ -8909,7 +8909,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -7027,9 +6364,9 @@
+@@ -7027,9 +6364,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -8921,7 +8921,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -7076,7 +6413,7 @@
+@@ -7076,7 +6413,7 @@ else
: ${lt_cv_path_NM=no}
fi
fi
@@ -8930,7 +8930,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -7087,9 +6424,9 @@
+@@ -7087,9 +6424,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
@@ -8942,7 +8942,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -7100,24 +6437,24 @@
+@@ -7100,24 +6437,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8972,7 +8972,7 @@
$as_echo "no" >&6; }
fi
-@@ -7131,9 +6468,9 @@
+@@ -7131,9 +6468,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
@@ -8984,7 +8984,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -7144,24 +6481,24 @@
+@@ -7144,24 +6481,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9014,7 +9014,7 @@
$as_echo "no" >&6; }
fi
-@@ -7174,7 +6511,7 @@
+@@ -7174,7 +6511,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9023,7 +9023,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7194,33 +6531,33 @@
+@@ -7194,33 +6531,33 @@ test -z "$NM" && NM=nm
@@ -9065,7 +9065,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -7338,10 +6675,10 @@
+@@ -7338,10 +6675,10 @@ else
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -9078,7 +9078,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -7355,7 +6692,7 @@
+@@ -7355,7 +6692,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -9087,7 +9087,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -7365,17 +6702,17 @@
+@@ -7365,17 +6702,17 @@ xsi_shell=no
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -9108,7 +9108,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -7410,14 +6747,14 @@
+@@ -7410,14 +6747,14 @@ esac
@@ -9126,7 +9126,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -7446,9 +6783,9 @@
+@@ -7446,9 +6783,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
@@ -9138,7 +9138,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -7459,24 +6796,24 @@
+@@ -7459,24 +6796,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9168,7 +9168,7 @@
$as_echo "no" >&6; }
fi
-@@ -7486,9 +6823,9 @@
+@@ -7486,9 +6823,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
@@ -9180,7 +9180,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -7499,24 +6836,24 @@
+@@ -7499,24 +6836,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9210,7 +9210,7 @@
$as_echo "no" >&6; }
fi
-@@ -7525,7 +6862,7 @@
+@@ -7525,7 +6862,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9219,7 +9219,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7542,9 +6879,9 @@
+@@ -7542,9 +6879,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
@@ -9231,7 +9231,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -7659,11 +6996,11 @@
+@@ -7659,11 +6996,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
@@ -9245,7 +9245,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
-@@ -7738,7 +7075,7 @@
+@@ -7738,7 +7075,7 @@ tpf*)
esac
fi
@@ -9254,7 +9254,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
-@@ -7758,9 +7095,9 @@
+@@ -7758,9 +7095,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
@@ -9266,7 +9266,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -7771,24 +7108,24 @@
+@@ -7771,24 +7108,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9296,7 +9296,7 @@
$as_echo "no" >&6; }
fi
-@@ -7798,9 +7135,9 @@
+@@ -7798,9 +7135,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
@@ -9308,7 +9308,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -7811,24 +7148,24 @@
+@@ -7811,24 +7148,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9338,7 +9338,7 @@
$as_echo "no" >&6; }
fi
-@@ -7837,7 +7174,7 @@
+@@ -7837,7 +7174,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9347,7 +9347,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7863,9 +7200,9 @@
+@@ -7863,9 +7200,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
@@ -9359,7 +9359,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -7876,24 +7213,24 @@
+@@ -7876,24 +7213,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9389,7 +9389,7 @@
$as_echo "no" >&6; }
fi
-@@ -7903,9 +7240,9 @@
+@@ -7903,9 +7240,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
@@ -9401,7 +9401,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -7916,24 +7253,24 @@
+@@ -7916,24 +7253,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9431,7 +9431,7 @@
$as_echo "no" >&6; }
fi
-@@ -7942,7 +7279,7 @@
+@@ -7942,7 +7279,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9440,7 +9440,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7962,9 +7299,9 @@
+@@ -7962,9 +7299,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
@@ -9452,7 +9452,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -7975,24 +7312,24 @@
+@@ -7975,24 +7312,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9482,7 +9482,7 @@
$as_echo "no" >&6; }
fi
-@@ -8002,9 +7339,9 @@
+@@ -8002,9 +7339,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
@@ -9494,7 +9494,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -8015,24 +7352,24 @@
+@@ -8015,24 +7352,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9524,7 +9524,7 @@
$as_echo "no" >&6; }
fi
-@@ -8041,7 +7378,7 @@
+@@ -8041,7 +7378,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9533,7 +9533,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8119,9 +7456,9 @@
+@@ -8119,9 +7456,9 @@ compiler=$CC
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -9545,7 +9545,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -8237,18 +7574,18 @@
+@@ -8237,18 +7574,18 @@ void nm_test_func(void){}
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -9570,7 +9570,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -8301,11 +7638,11 @@
+@@ -8301,11 +7638,11 @@ _LT_EOF
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -9585,7 +9585,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -8339,10 +7676,10 @@
+@@ -8339,10 +7676,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
@@ -9598,7 +9598,7 @@
$as_echo "ok" >&6; }
fi
-@@ -8368,7 +7705,7 @@
+@@ -8368,7 +7705,7 @@ fi
# Check whether --enable-libtool-lock was given.
@@ -9607,7 +9607,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -8380,11 +7717,11 @@
+@@ -8380,11 +7717,11 @@ case $host in
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9622,7 +9622,7 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -8398,12 +7735,12 @@
+@@ -8398,12 +7735,12 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -9639,7 +9639,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -8437,11 +7774,11 @@
+@@ -8437,11 +7774,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
@@ -9654,7 +9654,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -8490,9 +7827,9 @@
+@@ -8490,9 +7827,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"
@@ -9666,7 +9666,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -8501,11 +7838,7 @@
+@@ -8501,11 +7838,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
@@ -9679,7 +9679,7 @@
/* end confdefs.h. */
int
-@@ -8516,38 +7849,13 @@
+@@ -8516,38 +7849,13 @@ main ()
return 0;
}
_ACEOF
@@ -9722,7 +9722,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -8555,7 +7863,7 @@
+@@ -8555,7 +7863,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -9731,7 +9731,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
-@@ -8565,11 +7873,11 @@
+@@ -8565,11 +7873,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9746,7 +9746,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -8595,9 +7903,9 @@
+@@ -8595,9 +7903,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
@@ -9758,7 +9758,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -8608,24 +7916,24 @@
+@@ -8608,24 +7916,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9788,7 +9788,7 @@
$as_echo "no" >&6; }
fi
-@@ -8635,9 +7943,9 @@
+@@ -8635,9 +7943,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
@@ -9800,7 +9800,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -8648,24 +7956,24 @@
+@@ -8648,24 +7956,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9830,7 +9830,7 @@
$as_echo "no" >&6; }
fi
-@@ -8674,7 +7982,7 @@
+@@ -8674,7 +7982,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9839,7 +9839,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8687,9 +7995,9 @@
+@@ -8687,9 +7995,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
@@ -9851,7 +9851,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -8700,24 +8008,24 @@
+@@ -8700,24 +8008,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9881,7 +9881,7 @@
$as_echo "no" >&6; }
fi
-@@ -8727,9 +8035,9 @@
+@@ -8727,9 +8035,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
@@ -9893,7 +9893,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -8740,24 +8048,24 @@
+@@ -8740,24 +8048,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9923,7 +9923,7 @@
$as_echo "no" >&6; }
fi
-@@ -8766,7 +8074,7 @@
+@@ -8766,7 +8074,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9932,7 +9932,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8779,9 +8087,9 @@
+@@ -8779,9 +8087,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
@@ -9944,7 +9944,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -8792,24 +8100,24 @@
+@@ -8792,24 +8100,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9974,7 +9974,7 @@
$as_echo "no" >&6; }
fi
-@@ -8819,9 +8127,9 @@
+@@ -8819,9 +8127,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
@@ -9986,7 +9986,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -8832,24 +8140,24 @@
+@@ -8832,24 +8140,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10016,7 +10016,7 @@
$as_echo "no" >&6; }
fi
-@@ -8858,7 +8166,7 @@
+@@ -8858,7 +8166,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10025,7 +10025,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8871,9 +8179,9 @@
+@@ -8871,9 +8179,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
@@ -10037,7 +10037,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -8884,24 +8192,24 @@
+@@ -8884,24 +8192,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10067,7 +10067,7 @@
$as_echo "no" >&6; }
fi
-@@ -8911,9 +8219,9 @@
+@@ -8911,9 +8219,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
@@ -10079,7 +10079,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -8924,24 +8232,24 @@
+@@ -8924,24 +8232,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10109,7 +10109,7 @@
$as_echo "no" >&6; }
fi
-@@ -8950,7 +8258,7 @@
+@@ -8950,7 +8258,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10118,7 +10118,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8963,9 +8271,9 @@
+@@ -8963,9 +8271,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
@@ -10130,7 +10130,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -8976,24 +8284,24 @@
+@@ -8976,24 +8284,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10160,7 +10160,7 @@
$as_echo "no" >&6; }
fi
-@@ -9003,9 +8311,9 @@
+@@ -9003,9 +8311,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
@@ -10172,7 +10172,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -9016,24 +8324,24 @@
+@@ -9016,24 +8324,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10202,7 +10202,7 @@
$as_echo "no" >&6; }
fi
-@@ -9042,7 +8350,7 @@
+@@ -9042,7 +8350,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10211,7 +10211,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9078,9 +8386,9 @@
+@@ -9078,9 +8386,9 @@ fi
@@ -10223,7 +10223,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -9105,22 +8413,18 @@
+@@ -9105,22 +8413,18 @@ else
rm -f conftest.*
fi
fi
@@ -10250,7 +10250,7 @@
/* end confdefs.h. */
int
-@@ -9131,42 +8435,17 @@
+@@ -9131,42 +8435,17 @@ main ()
return 0;
}
_ACEOF
@@ -10298,7 +10298,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -9203,62 +8482,13 @@
+@@ -9203,62 +8482,13 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
;;
esac
@@ -10366,7 +10366,7 @@
_ACEOF
fi
-@@ -9276,7 +8506,7 @@
+@@ -9276,7 +8506,7 @@ done
# Check whether --enable-shared was given.
@@ -10375,7 +10375,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -9309,7 +8539,7 @@
+@@ -9309,7 +8539,7 @@ fi
# Check whether --with-pic was given.
@@ -10384,7 +10384,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -9325,7 +8555,7 @@
+@@ -9325,7 +8555,7 @@ test -z "$pic_mode" && pic_mode=default
# Check whether --enable-fast-install was given.
@@ -10393,7 +10393,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -9406,9 +8636,9 @@
+@@ -9406,9 +8636,9 @@ if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
fi
@@ -10405,7 +10405,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -9421,7 +8651,7 @@
+@@ -9421,7 +8651,7 @@ else
fi
rmdir .libs 2>/dev/null
fi
@@ -10414,7 +10414,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -9514,9 +8744,9 @@
+@@ -9514,9 +8744,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -10426,7 +10426,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9567,10 +8797,10 @@
+@@ -9567,10 +8797,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -10439,7 +10439,7 @@
$as_echo "no" >&6; }
fi
-@@ -9580,9 +8810,9 @@
+@@ -9580,9 +8810,9 @@ fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -10451,7 +10451,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9633,10 +8863,10 @@
+@@ -9633,10 +8863,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -10464,7 +10464,7 @@
$as_echo "no" >&6; }
fi
-@@ -9717,9 +8947,9 @@
+@@ -9717,9 +8947,9 @@ lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -10476,7 +10476,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9735,11 +8965,11 @@
+@@ -9735,11 +8965,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -10490,7 +10490,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.
-@@ -9752,7 +8982,7 @@
+@@ -9752,7 +8982,7 @@ else
$RM conftest*
fi
@@ -10499,7 +10499,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -9772,7 +9002,7 @@
+@@ -9772,7 +9002,7 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -10508,7 +10508,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -9904,7 +9134,7 @@
+@@ -9904,7 +9134,7 @@ $as_echo_n "checking for $compiler optio
lt_prog_compiler_static='-non_shared'
;;
@@ -10517,7 +10517,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -10044,7 +9274,7 @@
+@@ -10044,7 +9274,7 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -10526,7 +10526,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -10056,9 +9286,9 @@
+@@ -10056,9 +9286,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
@@ -10538,7 +10538,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -10074,11 +9304,11 @@
+@@ -10074,11 +9304,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -10552,7 +10552,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.
-@@ -10091,7 +9321,7 @@
+@@ -10091,7 +9321,7 @@ else
$RM conftest*
fi
@@ -10561,7 +10561,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -10115,9 +9345,9 @@
+@@ -10115,9 +9345,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\"
@@ -10573,7 +10573,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -10143,7 +9373,7 @@
+@@ -10143,7 +9373,7 @@ else
LDFLAGS="$save_LDFLAGS"
fi
@@ -10582,7 +10582,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -10158,9 +9388,9 @@
+@@ -10158,9 +9388,9 @@ fi
@@ -10594,7 +10594,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10179,11 +9409,11 @@
+@@ -10179,11 +9409,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -10608,7 +10608,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -10205,7 +9435,7 @@
+@@ -10205,7 +9435,7 @@ else
$RM conftest*
fi
@@ -10617,7 +10617,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10213,9 +9443,9 @@
+@@ -10213,9 +9443,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
@@ -10629,7 +10629,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10234,11 +9464,11 @@
+@@ -10234,11 +9464,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -10643,7 +10643,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -10260,7 +9490,7 @@
+@@ -10260,7 +9490,7 @@ else
$RM conftest*
fi
@@ -10652,7 +10652,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10269,7 +9499,7 @@
+@@ -10269,7 +9499,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
@@ -10661,7 +10661,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -10277,10 +9507,10 @@
+@@ -10277,10 +9507,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
@@ -10674,7 +10674,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -10293,7 +9523,7 @@
+@@ -10293,7 +9523,7 @@ fi
@@ -10683,7 +10683,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -10353,6 +9583,9 @@
+@@ -10353,6 +9583,9 @@ $as_echo_n "checking whether the $compil
openbsd*)
with_gnu_ld=no
;;
@@ -10693,7 +10693,7 @@
esac
ld_shlibs=yes
-@@ -10374,6 +9607,7 @@
+@@ -10374,6 +9607,7 @@ $as_echo_n "checking whether the $compil
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -10701,7 +10701,7 @@
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -10465,7 +9699,7 @@
+@@ -10465,7 +9699,7 @@ _LT_EOF
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -10710,7 +10710,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -10535,7 +9769,7 @@
+@@ -10535,7 +9769,7 @@ _LT_EOF
fi
;;
@@ -10719,7 +10719,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10710,6 +9944,7 @@
+@@ -10710,6 +9944,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -10727,7 +10727,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10735,11 +9970,7 @@
+@@ -10735,11 +9970,7 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -10740,7 +10740,7 @@
/* end confdefs.h. */
int
-@@ -10750,27 +9981,7 @@
+@@ -10750,27 +9981,7 @@ main ()
return 0;
}
_ACEOF
@@ -10769,7 +10769,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10784,16 +9995,9 @@
+@@ -10784,16 +9995,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
@@ -10788,7 +10788,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10806,11 +10010,7 @@
+@@ -10806,11 +10010,7 @@ if test -z "$aix_libpath"; then aix_libp
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -10801,7 +10801,7 @@
/* end confdefs.h. */
int
-@@ -10821,27 +10021,7 @@
+@@ -10821,27 +10021,7 @@ main ()
return 0;
}
_ACEOF
@@ -10830,7 +10830,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10855,16 +10035,9 @@
+@@ -10855,16 +10035,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
@@ -10849,7 +10849,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -11076,42 +10249,16 @@
+@@ -11076,42 +10249,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"
@@ -10897,7 +10897,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'
-@@ -11124,7 +10271,7 @@
+@@ -11124,7 +10271,7 @@ rm -f core conftest.err conftest.$ac_obj
link_all_deplibs=yes
;;
@@ -10906,7 +10906,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11367,7 +10514,7 @@
+@@ -11367,7 +10514,7 @@ rm -f core conftest.err conftest.$ac_obj
fi
fi
@@ -10915,7 +10915,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -11404,16 +10551,16 @@
+@@ -11404,16 +10551,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.
@@ -10936,7 +10936,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -11427,11 +10574,11 @@
+@@ -11427,11 +10574,11 @@ $as_echo_n "checking whether -lc should
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -10951,7 +10951,7 @@
then
archive_cmds_need_lc=no
else
-@@ -11442,7 +10589,7 @@
+@@ -11442,7 +10589,7 @@ $as_echo_n "checking whether -lc should
cat conftest.err 1>&5
fi
$RM conftest*
@@ -10960,7 +10960,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -11606,7 +10753,7 @@
+@@ -11606,7 +10753,7 @@ esac
@@ -10969,7 +10969,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -12014,7 +11161,7 @@
+@@ -12014,7 +11161,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -10978,7 +10978,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -12028,11 +11175,7 @@
+@@ -12028,11 +11175,7 @@ linux* | k*bsd*-gnu)
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -10991,7 +10991,7 @@
/* end confdefs.h. */
int
-@@ -12043,41 +11186,13 @@
+@@ -12043,41 +11186,13 @@ main ()
return 0;
}
_ACEOF
@@ -11037,7 +11037,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -12086,13 +11201,10 @@
+@@ -12086,13 +11201,10 @@ rm -f core conftest.err conftest.$ac_obj
# before this can be enabled.
hardcode_into_libs=yes
@@ -11052,7 +11052,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -12104,6 +11216,18 @@
+@@ -12104,6 +11216,18 @@ rm -f core conftest.err conftest.$ac_obj
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11071,7 +11071,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -12292,7 +11416,7 @@
+@@ -12292,7 +11416,7 @@ uts4*)
dynamic_linker=no
;;
esac
@@ -11080,7 +11080,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -12394,7 +11518,7 @@
+@@ -12394,7 +11518,7 @@ fi
@@ -11089,7 +11089,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -12419,7 +11543,7 @@
+@@ -12419,7 +11543,7 @@ else
# directories.
hardcode_action=unsupported
fi
@@ -11098,7 +11098,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -12464,18 +11588,14 @@
+@@ -12464,18 +11588,14 @@ else
darwin*)
# if libdl is installed we need to link against it
@@ -11120,7 +11120,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12493,43 +11613,18 @@
+@@ -12493,43 +11613,18 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -11170,7 +11170,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -12542,33 +11637,19 @@
+@@ -12542,33 +11637,19 @@ fi
;;
*)
@@ -11214,7 +11214,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -12577,13 +11658,6 @@
+@@ -12577,13 +11658,6 @@ cat >>conftest.$ac_ext <<_ACEOF
extern "C"
#endif
char shl_load ();
@@ -11228,7 +11228,7 @@
int
main ()
{
-@@ -12592,56 +11666,32 @@
+@@ -12592,56 +11666,32 @@ return shl_load ();
return 0;
}
_ACEOF
@@ -11304,7 +11304,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12650,81 +11700,38 @@
+@@ -12650,81 +11700,38 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -11403,7 +11403,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -12733,13 +11740,6 @@
+@@ -12733,13 +11740,6 @@ cat >>conftest.$ac_ext <<_ACEOF
extern "C"
#endif
char dlopen ();
@@ -11417,7 +11417,7 @@
int
main ()
{
-@@ -12748,192 +11748,28 @@
+@@ -12748,192 +11748,28 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -11619,7 +11619,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12951,43 +11787,18 @@
+@@ -12951,43 +11787,18 @@ return dld_link ();
return 0;
}
_ACEOF
@@ -11669,7 +11669,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -13026,9 +11837,9 @@
+@@ -13026,9 +11837,9 @@ fi
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -11681,7 +11681,7 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -13037,7 +11848,7 @@
+@@ -13037,7 +11848,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -11690,7 +11690,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13096,11 +11907,11 @@
+@@ -13096,11 +11907,11 @@ int main ()
return status;
}
_LT_EOF
@@ -11705,7 +11705,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13117,14 +11928,14 @@
+@@ -13117,14 +11928,14 @@ rm -fr conftest*
fi
@@ -11723,7 +11723,7 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -13133,7 +11944,7 @@
+@@ -13133,7 +11944,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -11732,7 +11732,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13192,11 +12003,11 @@
+@@ -13192,11 +12003,11 @@ int main ()
return status;
}
_LT_EOF
@@ -11747,7 +11747,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13213,7 +12024,7 @@
+@@ -13213,7 +12024,7 @@ rm -fr conftest*
fi
@@ -11756,7 +11756,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -13252,12 +12063,12 @@
+@@ -13252,12 +12063,12 @@ fi
striplib=
old_striplib=
@@ -11771,7 +11771,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -13266,15 +12077,15 @@
+@@ -13266,15 +12077,15 @@ else
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -11790,7 +11790,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -13292,12 +12103,12 @@
+@@ -13292,12 +12103,12 @@ fi
# Report which library types will actually be built
@@ -11806,7 +11806,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -13318,14 +12129,14 @@
+@@ -13318,14 +12129,14 @@ $as_echo_n "checking whether to build sh
fi
;;
esac
@@ -11824,7 +11824,7 @@
$as_echo "$enable_static" >&6; }
-@@ -13362,9 +12173,9 @@
+@@ -13362,9 +12173,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
@@ -11836,7 +11836,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -13377,14 +12188,14 @@
+@@ -13377,14 +12188,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11854,7 +11854,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -13393,28 +12204,23 @@
+@@ -13393,28 +12204,23 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -11888,7 +11888,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -13432,43 +12238,18 @@
+@@ -13432,43 +12238,18 @@ return floor ();
return 0;
}
_ACEOF
@@ -11938,7 +11938,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
_ACEOF
-@@ -13484,9 +12265,9 @@
+@@ -13484,9 +12265,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
@@ -11950,7 +11950,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -13499,14 +12280,14 @@
+@@ -13499,14 +12280,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11968,7 +11968,7 @@
IFS=$as_save_IFS
;;
-@@ -13514,10 +12295,10 @@
+@@ -13514,10 +12295,10 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -11981,7 +11981,7 @@
$as_echo "no" >&6; }
fi
-@@ -13527,9 +12308,9 @@
+@@ -13527,9 +12308,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
@@ -11993,7 +11993,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -13542,14 +12323,14 @@
+@@ -13542,14 +12323,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12011,7 +12011,7 @@
IFS=$as_save_IFS
;;
-@@ -13557,10 +12338,10 @@
+@@ -13557,10 +12338,10 @@ esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -12024,7 +12024,7 @@
$as_echo "no" >&6; }
fi
-@@ -13569,7 +12350,7 @@
+@@ -13569,7 +12350,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -12033,7 +12033,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -13582,13 +12363,13 @@
+@@ -13582,13 +12363,13 @@ fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -12050,7 +12050,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -13596,14 +12377,15 @@
+@@ -13596,14 +12377,15 @@ $as_echo "no" >&6; }
fi
pkg_failed=no
@@ -12072,7 +12072,7 @@
glib-2.0 >= 2.24.0
gnome-desktop-2.0 >= 2.29.91
gthread-2.0
-@@ -13615,7 +12397,7 @@
+@@ -13615,7 +12397,7 @@ if test -n "$ALL_CFLAGS"; then
gail >= 0.16
unique-1.0
dbus-glib-1
@@ -12081,7 +12081,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= 2.24.0
gnome-desktop-2.0 >= 2.29.91
-@@ -13630,8 +12412,8 @@
+@@ -13630,8 +12412,8 @@ if test -n "$ALL_CFLAGS"; then
dbus-glib-1
") 2>&5
ac_status=$?
@@ -12092,7 +12092,7 @@
pkg_cv_ALL_CFLAGS=`$PKG_CONFIG --cflags "
glib-2.0 >= 2.24.0
gnome-desktop-2.0 >= 2.29.91
-@@ -13648,14 +12430,16 @@
+@@ -13648,14 +12430,16 @@ if test -n "$ALL_CFLAGS"; then
else
pkg_failed=yes
fi
@@ -12116,7 +12116,7 @@
glib-2.0 >= 2.24.0
gnome-desktop-2.0 >= 2.29.91
gthread-2.0
-@@ -13667,7 +12451,7 @@
+@@ -13667,7 +12451,7 @@ if test -n "$ALL_LIBS"; then
gail >= 0.16
unique-1.0
dbus-glib-1
@@ -12125,7 +12125,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= 2.24.0
gnome-desktop-2.0 >= 2.29.91
-@@ -13682,8 +12466,8 @@
+@@ -13682,8 +12466,8 @@ if test -n "$ALL_LIBS"; then
dbus-glib-1
") 2>&5
ac_status=$?
@@ -12136,7 +12136,7 @@
pkg_cv_ALL_LIBS=`$PKG_CONFIG --libs "
glib-2.0 >= 2.24.0
gnome-desktop-2.0 >= 2.29.91
-@@ -13700,8 +12484,9 @@
+@@ -13700,8 +12484,9 @@ if test -n "$ALL_LIBS"; then
else
pkg_failed=yes
fi
@@ -12148,7 +12148,7 @@
fi
-@@ -13714,7 +12499,7 @@
+@@ -13714,7 +12499,7 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12157,7 +12157,7 @@
glib-2.0 >= 2.24.0
gnome-desktop-2.0 >= 2.29.91
gthread-2.0
-@@ -13726,9 +12511,9 @@
+@@ -13726,9 +12511,9 @@ fi
gail >= 0.16
unique-1.0
dbus-glib-1
@@ -12169,7 +12169,7 @@
glib-2.0 >= 2.24.0
gnome-desktop-2.0 >= 2.29.91
gthread-2.0
-@@ -13740,35 +12525,12 @@
+@@ -13740,35 +12525,12 @@ fi
gail >= 0.16
unique-1.0
dbus-glib-1
@@ -12207,7 +12207,7 @@
glib-2.0 >= 2.24.0
gnome-desktop-2.0 >= 2.29.91
gthread-2.0
-@@ -13790,12 +12552,11 @@
+@@ -13790,12 +12552,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.
@@ -12223,7 +12223,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -13804,22 +12565,11 @@
+@@ -13804,22 +12565,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/>.
@@ -12248,7 +12248,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -13833,151 +12583,12 @@
+@@ -13833,151 +12583,12 @@ _ACEOF
@@ -12405,7 +12405,7 @@
_ACEOF
fi
-@@ -13985,16 +12596,12 @@
+@@ -13985,16 +12596,12 @@ fi
done
if test $ac_cv_header_locale_h = yes; then
@@ -12425,7 +12425,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -14005,46 +12612,19 @@
+@@ -14005,46 +12612,19 @@ return LC_MESSAGES
return 0;
}
_ACEOF
@@ -12478,7 +12478,7 @@
fi
fi
-@@ -14057,155 +12637,20 @@
+@@ -14057,155 +12637,20 @@ _ACEOF
XGETTEXT=:
INTLLIBS=
@@ -12639,7 +12639,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -14218,201 +12663,57 @@
+@@ -14218,201 +12663,57 @@ return !ngettext ("","", 1)
return 0;
}
_ACEOF
@@ -12868,7 +12868,7 @@
_ACEOF
fi
-@@ -14427,18 +12728,14 @@
+@@ -14427,18 +12728,14 @@ done
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -12890,7 +12890,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14456,55 +12753,26 @@
+@@ -14456,55 +12753,26 @@ return bindtextdomain ();
return 0;
}
_ACEOF
@@ -12955,7 +12955,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14522,55 +12790,26 @@
+@@ -14522,55 +12790,26 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -13020,7 +13020,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14588,43 +12827,18 @@
+@@ -14588,43 +12827,18 @@ return dgettext ();
return 0;
}
_ACEOF
@@ -13070,7 +13070,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -14634,22 +12848,18 @@
+@@ -14634,22 +12848,18 @@ fi
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -13098,7 +13098,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14667,55 +12877,26 @@
+@@ -14667,55 +12877,26 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -13163,7 +13163,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14733,43 +12914,18 @@
+@@ -14733,43 +12914,18 @@ return dcgettext ();
return 0;
}
_ACEOF
@@ -13213,7 +13213,7 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -14791,102 +12947,12 @@
+@@ -14791,102 +12947,12 @@ fi
glib_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
@@ -13321,7 +13321,7 @@
_ACEOF
fi
-@@ -14916,15 +12982,13 @@
+@@ -14916,15 +12982,13 @@ done
if test "$gt_cv_have_gettext" = "yes"; then
@@ -13340,7 +13340,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -14949,118 +13013,28 @@
+@@ -14949,118 +13013,28 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -13467,7 +13467,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -15075,14 +13049,14 @@
+@@ -15075,14 +13049,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -13487,7 +13487,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -15090,9 +13064,9 @@
+@@ -15090,9 +13064,9 @@ fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -13499,7 +13499,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -15105,14 +13079,14 @@
+@@ -15105,14 +13079,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13517,7 +13517,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -15121,19 +13095,19 @@
+@@ -15121,19 +13095,19 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -13541,7 +13541,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -15154,148 +13128,37 @@
+@@ -15154,148 +13128,37 @@ else
IFS="$ac_save_ifs"
test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
;;
@@ -13709,7 +13709,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -15310,10 +13173,8 @@
+@@ -15310,10 +13173,8 @@ fi
;;
esac
fi
@@ -13722,7 +13722,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -15327,9 +13188,7 @@
+@@ -15327,9 +13188,7 @@ fi
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -13733,7 +13733,7 @@
fi
-@@ -15337,7 +13196,7 @@
+@@ -15337,7 +13196,7 @@ _ACEOF
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -13742,7 +13742,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -15370,7 +13229,7 @@
+@@ -15370,7 +13229,7 @@ $as_echo "found xgettext program is not
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -13751,7 +13751,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -15395,7 +13254,7 @@
+@@ -15395,7 +13254,7 @@ $as_echo_n "checking for catalogs to be
fi
done
LINGUAS=$NEW_LINGUAS
@@ -13760,7 +13760,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -15449,16 +13308,16 @@
+@@ -15449,16 +13308,16 @@ _ACEOF
@@ -13780,7 +13780,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -15466,35 +13325,31 @@
+@@ -15466,35 +13325,31 @@ $as_echo "$USE_NLS" >&6; }
case "$am__api_version" in
1.01234)
@@ -13822,7 +13822,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -15507,14 +13362,14 @@
+@@ -15507,14 +13362,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13840,7 +13840,7 @@
IFS=$as_save_IFS
;;
-@@ -15522,19 +13377,19 @@
+@@ -15522,19 +13377,19 @@ esac
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -13864,7 +13864,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -15547,14 +13402,14 @@
+@@ -15547,14 +13402,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13882,7 +13882,7 @@
IFS=$as_save_IFS
;;
-@@ -15562,19 +13417,19 @@
+@@ -15562,19 +13417,19 @@ esac
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -13906,7 +13906,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -15587,14 +13442,14 @@
+@@ -15587,14 +13442,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13924,7 +13924,7 @@
IFS=$as_save_IFS
;;
-@@ -15602,18 +13457,16 @@
+@@ -15602,18 +13457,16 @@ esac
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -13946,7 +13946,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 $< $@'
-@@ -15735,9 +13588,9 @@
+@@ -15735,9 +13588,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
@@ -13958,7 +13958,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -15750,14 +13603,14 @@
+@@ -15750,14 +13603,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13976,7 +13976,7 @@
IFS=$as_save_IFS
;;
-@@ -15765,19 +13618,19 @@
+@@ -15765,19 +13618,19 @@ esac
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -14000,7 +14000,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -15790,14 +13643,14 @@
+@@ -15790,14 +13643,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14018,7 +14018,7 @@
IFS=$as_save_IFS
;;
-@@ -15805,19 +13658,19 @@
+@@ -15805,19 +13658,19 @@ esac
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -14042,7 +14042,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -15830,14 +13683,14 @@
+@@ -15830,14 +13683,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14060,7 +14060,7 @@
IFS=$as_save_IFS
;;
-@@ -15845,19 +13698,19 @@
+@@ -15845,19 +13698,19 @@ esac
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -14084,7 +14084,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -15870,14 +13723,14 @@
+@@ -15870,14 +13723,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14102,7 +14102,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -15886,33 +13739,29 @@
+@@ -15886,33 +13739,29 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -14142,7 +14142,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -15925,14 +13774,14 @@
+@@ -15925,14 +13774,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14160,7 +14160,7 @@
IFS=$as_save_IFS
;;
-@@ -15940,41 +13789,35 @@
+@@ -15940,41 +13789,35 @@ esac
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -14211,7 +14211,7 @@
fi
fi
-@@ -15984,11 +13827,7 @@
+@@ -15984,11 +13827,7 @@ fi
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -14224,7 +14224,7 @@
/* end confdefs.h. */
int
-@@ -16000,120 +13839,13 @@
+@@ -16000,120 +13839,13 @@ extern int _nl_msg_cat_cntr;
return 0;
}
_ACEOF
@@ -14349,7 +14349,7 @@
DATADIRNAME=share
else
DATADIRNAME=lib
-@@ -16125,10 +13857,8 @@
+@@ -16125,10 +13857,8 @@ fi
;;
esac
fi
@@ -14362,7 +14362,7 @@
fi
-@@ -16141,9 +13871,9 @@
+@@ -16141,9 +13871,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
@@ -14374,7 +14374,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_CHECK in
-@@ -16156,14 +13886,14 @@
+@@ -16156,14 +13886,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14392,7 +14392,7 @@
IFS=$as_save_IFS
;;
-@@ -16171,10 +13901,10 @@
+@@ -16171,10 +13901,10 @@ esac
fi
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
if test -n "$GTKDOC_CHECK"; then
@@ -14405,7 +14405,7 @@
$as_echo "no" >&6; }
fi
-@@ -16183,9 +13913,9 @@
+@@ -16183,9 +13913,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
@@ -14417,7 +14417,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_REBASE in
-@@ -16198,14 +13928,14 @@
+@@ -16198,14 +13928,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14435,7 +14435,7 @@
IFS=$as_save_IFS
;;
-@@ -16213,10 +13943,10 @@
+@@ -16213,10 +13943,10 @@ esac
fi
GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
if test -n "$GTKDOC_REBASE"; then
@@ -14448,7 +14448,7 @@
$as_echo "no" >&6; }
fi
-@@ -16227,9 +13957,9 @@
+@@ -16227,9 +13957,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
@@ -14460,7 +14460,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_MKPDF in
-@@ -16242,14 +13972,14 @@
+@@ -16242,14 +13972,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14478,7 +14478,7 @@
IFS=$as_save_IFS
;;
-@@ -16257,10 +13987,10 @@
+@@ -16257,10 +13987,10 @@ esac
fi
GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
if test -n "$GTKDOC_MKPDF"; then
@@ -14491,7 +14491,7 @@
$as_echo "no" >&6; }
fi
-@@ -16268,7 +13998,7 @@
+@@ -16268,7 +13998,7 @@ fi
# Check whether --with-html-dir was given.
@@ -14500,7 +14500,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -16278,7 +14008,7 @@
+@@ -16278,7 +14008,7 @@ fi
# Check whether --enable-gtk-doc was given.
@@ -14509,7 +14509,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -16287,33 +14017,31 @@
+@@ -16287,33 +14017,31 @@ fi
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -14551,7 +14551,7 @@
enableval=$enable_gtk_doc_pdf;
else
enable_gtk_doc_pdf=no
-@@ -16370,12 +14098,10 @@
+@@ -16370,12 +14098,10 @@ fi
ENABLE_PROFILER=
# Check whether --enable-profiler was given.
@@ -14566,7 +14566,7 @@
fi
-@@ -16403,9 +14129,9 @@
+@@ -16403,9 +14129,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
@@ -14578,7 +14578,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$PERL"; then
-@@ -16416,24 +14142,24 @@
+@@ -16416,24 +14142,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14608,7 +14608,7 @@
$as_echo "no" >&6; }
fi
-@@ -16443,9 +14169,9 @@
+@@ -16443,9 +14169,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
@@ -14620,7 +14620,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -16458,177 +14184,37 @@
+@@ -16458,177 +14184,37 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14820,7 +14820,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -16637,102 +14223,12 @@
+@@ -16637,102 +14223,12 @@ fi
done
@@ -14927,7 +14927,7 @@
_ACEOF
fi
-@@ -16750,12 +14246,12 @@
+@@ -16750,12 +14246,12 @@ x_cflags="`$PKG_CONFIG --cflags pangox`"
x_extra_libs=
if test $pango_omitted_x_deps = yes ; then
@@ -14942,7 +14942,7 @@
withval=$with_x;
fi
-@@ -16765,10 +14261,8 @@
+@@ -16765,10 +14261,8 @@ if test "x$with_x" = xno; then
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -14955,7 +14955,7 @@
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
-@@ -16816,21 +14310,25 @@
+@@ -16816,21 +14310,25 @@ fi
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
@@ -14981,7 +14981,7 @@
/usr/local/include/X11R6
/usr/local/include/X11R5
/usr/local/include/X11R4
-@@ -16852,37 +14350,14 @@
+@@ -16852,37 +14350,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.
@@ -15021,7 +15021,7 @@
for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
-@@ -16890,7 +14365,6 @@
+@@ -16890,7 +14365,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
done
fi
@@ -15029,7 +15029,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
-@@ -16900,11 +14374,7 @@
+@@ -16900,11 +14374,7 @@ if test "$ac_x_libraries" = no; then
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
@@ -15042,7 +15042,7 @@
/* end confdefs.h. */
#include <X11/Xlib.h>
int
-@@ -16915,35 +14385,12 @@
+@@ -16915,35 +14385,12 @@ XrmInitialize ()
return 0;
}
_ACEOF
@@ -15080,7 +15080,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!
-@@ -16955,10 +14402,8 @@
+@@ -16955,10 +14402,8 @@ do
done
done
fi
@@ -15093,7 +15093,7 @@
fi # $ac_x_libraries = no
case $ac_x_includes,$ac_x_libraries in #(
-@@ -16979,7 +14424,7 @@
+@@ -16979,7 +14424,7 @@ fi
fi # $with_x != no
if test "$have_x" != yes; then
@@ -15102,7 +15102,7 @@
$as_echo "$have_x" >&6; }
no_x=yes
else
-@@ -16990,16 +14435,14 @@
+@@ -16990,16 +14435,14 @@ else
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -15121,7 +15121,7 @@
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
else
-@@ -17012,16 +14455,12 @@
+@@ -17012,16 +14455,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 . . . .
@@ -15140,7 +15140,7 @@
/* end confdefs.h. */
int
-@@ -17032,40 +14471,13 @@
+@@ -17032,40 +14471,13 @@ main ()
return 0;
}
_ACEOF
@@ -15185,7 +15185,7 @@
/* end confdefs.h. */
int
-@@ -17076,46 +14488,19 @@
+@@ -17076,46 +14488,19 @@ main ()
return 0;
}
_ACEOF
@@ -15239,7 +15239,7 @@
ac_c_werror_flag=$ac_xsave_c_werror_flag
LIBS=$ac_xsave_LIBS
fi
-@@ -17131,11 +14516,7 @@
+@@ -17131,11 +14516,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"
@@ -15252,7 +15252,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17153,44 +14534,17 @@
+@@ -17153,44 +14534,17 @@ return XOpenDisplay ();
return 0;
}
_ACEOF
@@ -15302,7 +15302,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17208,59 +14562,30 @@
+@@ -17208,59 +14562,30 @@ return dnet_ntoa ();
return 0;
}
_ACEOF
@@ -15371,7 +15371,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17278,52 +14603,25 @@
+@@ -17278,52 +14603,25 @@ return dnet_ntoa ();
return 0;
}
_ACEOF
@@ -15432,7 +15432,7 @@
LIBS="$ac_xsave_LIBS"
# msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -17334,105 +14632,20 @@
+@@ -17334,105 +14632,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.
@@ -15543,7 +15543,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17450,59 +14663,30 @@
+@@ -17450,59 +14663,30 @@ return gethostbyname ();
return 0;
}
_ACEOF
@@ -15612,7 +15612,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17520,43 +14704,18 @@
+@@ -17520,43 +14704,18 @@ return gethostbyname ();
return 0;
}
_ACEOF
@@ -15662,7 +15662,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
-@@ -17570,105 +14729,20 @@
+@@ -17570,105 +14729,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.
@@ -15773,7 +15773,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17686,148 +14760,38 @@
+@@ -17686,148 +14760,38 @@ return connect ();
return 0;
}
_ACEOF
@@ -15933,7 +15933,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17845,148 +14809,38 @@
+@@ -17845,148 +14809,38 @@ return remove ();
return 0;
}
_ACEOF
@@ -16093,7 +16093,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18004,43 +14858,18 @@
+@@ -18004,43 +14858,18 @@ return shmat ();
return 0;
}
_ACEOF
@@ -16143,7 +16143,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -18056,18 +14885,14 @@
+@@ -18056,18 +14885,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
@@ -16165,7 +16165,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18085,43 +14910,18 @@
+@@ -18085,43 +14910,18 @@ return IceConnectionNumber ();
return 0;
}
_ACEOF
@@ -16215,7 +16215,7 @@
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -18131,9 +14931,7 @@
+@@ -18131,9 +14931,7 @@ fi
if test x$no_x = xyes ; then
@@ -16226,7 +16226,7 @@
fi
x_libs="$X_LIBS -lX11 $X_EXTRA_LIBS"
-@@ -18149,18 +14947,14 @@
+@@ -18149,18 +14947,14 @@ x_libs_for_checks=$x_libs
# esac
#done
@@ -16248,7 +16248,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18175,51 +14969,24 @@
+@@ -18175,51 +14969,24 @@ main ()
{
return XOpenDisplay ();
;
@@ -16310,7 +16310,7 @@
fi
-@@ -18236,40 +15003,44 @@
+@@ -18236,40 +15003,44 @@ fi
pkg_failed=no
@@ -16374,7 +16374,7 @@
fi
-@@ -18282,52 +15053,56 @@
+@@ -18282,52 +15053,56 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16453,7 +16453,7 @@
fi
-@@ -18340,14 +15115,14 @@
+@@ -18340,14 +15115,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16471,7 +16471,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_EXIF_TRUE=
-@@ -18369,7 +15144,7 @@
+@@ -18369,7 +15144,7 @@ fi
else
EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
EXIF_LIBS=$pkg_cv_EXIF_LIBS
@@ -16480,7 +16480,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18381,9 +15156,7 @@
+@@ -18381,9 +15156,7 @@ else
fi
@@ -16491,7 +16491,7 @@
fi
-@@ -18392,40 +15165,44 @@
+@@ -18392,40 +15165,44 @@ elif test $pkg_failed = untried; then
pkg_failed=no
@@ -16555,7 +16555,7 @@
fi
-@@ -18438,14 +15215,14 @@
+@@ -18438,14 +15215,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16573,7 +16573,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_EXIF_TRUE=
-@@ -18467,7 +15244,7 @@
+@@ -18467,7 +15244,7 @@ fi
else
EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
EXIF_LIBS=$pkg_cv_EXIF_LIBS
@@ -16582,7 +16582,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18479,9 +15256,7 @@
+@@ -18479,9 +15256,7 @@ else
fi
@@ -16593,7 +16593,7 @@
fi
-@@ -18489,7 +15264,7 @@
+@@ -18489,7 +15264,7 @@ fi
else
EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
EXIF_LIBS=$pkg_cv_EXIF_LIBS
@@ -16602,7 +16602,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18501,9 +15276,7 @@
+@@ -18501,9 +15276,7 @@ else
fi
@@ -16613,7 +16613,7 @@
fi
-@@ -18523,7 +15296,7 @@
+@@ -18523,7 +15296,7 @@ fi
# Check whether --enable-xmp was given.
@@ -16622,7 +16622,7 @@
enableval=$enable_xmp;
fi
-@@ -18531,40 +15304,44 @@
+@@ -18531,40 +15304,44 @@ msg_xmp=no
if test "x$enable_xmp" != "xno"; then
pkg_failed=no
@@ -16686,7 +16686,7 @@
fi
-@@ -18577,14 +15354,14 @@
+@@ -18577,14 +15354,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16704,7 +16704,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_EXEMPI_TRUE=
-@@ -18606,7 +15383,7 @@
+@@ -18606,7 +15383,7 @@ fi
else
EXEMPI_CFLAGS=$pkg_cv_EXEMPI_CFLAGS
EXEMPI_LIBS=$pkg_cv_EXEMPI_LIBS
@@ -16713,7 +16713,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18618,9 +15395,7 @@
+@@ -18618,9 +15395,7 @@ else
fi
@@ -16724,7 +16724,7 @@
msg_xmp=yes
-@@ -18628,40 +15403,44 @@
+@@ -18628,40 +15403,44 @@ fi
pkg_failed=no
@@ -16788,7 +16788,7 @@
fi
-@@ -18674,14 +15453,14 @@
+@@ -18674,14 +15453,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16806,7 +16806,7 @@
$as_echo "no" >&6; }
true
elif test $pkg_failed = untried; then
-@@ -18689,12 +15468,10 @@
+@@ -18689,12 +15468,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
@@ -16821,7 +16821,7 @@
fi
-@@ -18706,18 +15483,14 @@
+@@ -18706,18 +15483,14 @@ fi
SELINUX_LIBS=
msg_selinux=no
@@ -16843,7 +16843,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18735,200 +15508,32 @@
+@@ -18735,200 +15508,32 @@ return is_selinux_enabled ();
return 0;
}
_ACEOF
@@ -17058,7 +17058,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18953,59 +15558,30 @@
+@@ -18953,59 +15558,30 @@ for ac_lib in '' selinux; do
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -17127,7 +17127,7 @@
SELINUX_LIBS="-lselinux"
msg_selinux=yes
-@@ -19023,12 +15599,10 @@
+@@ -19023,12 +15599,10 @@ fi
# Check whether --enable-empty_view was given.
@@ -17142,7 +17142,7 @@
fi
-@@ -19045,7 +15619,7 @@
+@@ -19045,7 +15619,7 @@ fi
# Check whether --enable-packagekit was given.
@@ -17151,7 +17151,7 @@
enableval=$enable_packagekit;
fi
-@@ -19053,16 +15627,14 @@
+@@ -19053,16 +15627,14 @@ msg_packagekit=no
if test "x$enable_packagekit" != "xno"; then
msg_packagekit=yes
@@ -17170,7 +17170,7 @@
enableval=$enable_more_warnings; set_more_warnings="$enableval"
else
-@@ -19075,10 +15647,10 @@
+@@ -19075,10 +15647,10 @@ fi
fi
@@ -17183,7 +17183,7 @@
$as_echo "yes" >&6; }
WARNING_CFLAGS="\
-Wall \
-@@ -19090,13 +15662,9 @@
+@@ -19090,13 +15662,9 @@ $as_echo "yes" >&6; }
for option in -Wstrict-aliasing=0 -Wno-pointer-sign; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -17199,7 +17199,7 @@
/* end confdefs.h. */
int
-@@ -19107,37 +15675,16 @@
+@@ -19107,37 +15675,16 @@ main ()
return 0;
}
_ACEOF
@@ -17240,7 +17240,7 @@
$as_echo "$has_option" >&6; }
CFLAGS="$SAVE_CFLAGS"
unset has_option
-@@ -19145,26 +15692,19 @@
+@@ -19145,26 +15692,19 @@ $as_echo "$has_option" >&6; }
done
unset option
else
@@ -17273,7 +17273,7 @@
/* end confdefs.h. */
#include <time.h>
int main ()
-@@ -19179,65 +15719,32 @@
+@@ -19179,65 +15719,32 @@ cat >>conftest.$ac_ext <<_ACEOF
}
_ACEOF
@@ -17346,7 +17346,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19255,43 +15762,18 @@
+@@ -19255,43 +15762,18 @@ return XRenderFindFormat ();
return 0;
}
_ACEOF
@@ -17396,7 +17396,7 @@
have_render=true
else
:
-@@ -19300,9 +15782,7 @@
+@@ -19300,9 +15782,7 @@ fi
if $have_render ; then
RENDER_LIBS="-lXrender -lXext"
@@ -17407,7 +17407,7 @@
fi
-@@ -19326,157 +15806,18 @@
+@@ -19326,157 +15806,18 @@ LIBNAUTILUS_EXTENSION_LIBS="`$PKG_CONFIG
CORE_MODULES="glib-2.0 gnome-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 unique-1.0 dbus-glib-1 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES"
CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags $WARNING_CFLAGS"
@@ -17572,7 +17572,7 @@
_ACEOF
fi
-@@ -19487,9 +15828,9 @@
+@@ -19487,9 +15828,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
@@ -17584,7 +17584,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -19502,14 +15843,14 @@
+@@ -19502,14 +15843,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -17602,7 +17602,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-@@ -19518,19 +15859,17 @@
+@@ -19518,19 +15859,17 @@ esac
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -17625,7 +17625,7 @@
fi
-@@ -19542,13 +15881,13 @@
+@@ -19542,13 +15881,13 @@ fi
# Check whether --with-gconf-source was given.
@@ -17641,7 +17641,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -19557,22 +15896,20 @@
+@@ -19557,22 +15896,20 @@ $as_echo "Using config source $GCONF_SCH
# Check whether --with-gconf-schema-file-dir was given.
@@ -17668,7 +17668,7 @@
esac
fi
-@@ -19589,9 +15926,9 @@
+@@ -19589,9 +15926,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
@@ -17680,7 +17680,7 @@
$as_echo_n "(cached) " >&6
else
case $UPDATE_MIME_DATABASE in
-@@ -19604,14 +15941,14 @@
+@@ -19604,14 +15941,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -17698,7 +17698,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_UPDATE_MIME_DATABASE" && ac_cv_path_UPDATE_MIME_DATABASE="no"
-@@ -19620,17 +15957,17 @@
+@@ -19620,17 +15957,17 @@ esac
fi
UPDATE_MIME_DATABASE=$ac_cv_path_UPDATE_MIME_DATABASE
if test -n "$UPDATE_MIME_DATABASE"; then
@@ -17719,7 +17719,7 @@
enableval=$enable_update_mimedb;
else
enable_update_mimedb=yes
-@@ -19675,13 +16012,13 @@
+@@ -19675,13 +16012,13 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -17735,7 +17735,7 @@
esac ;;
esac
done
-@@ -19689,8 +16026,8 @@
+@@ -19689,8 +16026,8 @@ $as_echo "$as_me: WARNING: cache variabl
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -17746,7 +17746,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -19713,11 +16050,11 @@
+@@ -19713,11 +16050,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" &&
@@ -17760,7 +17760,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -19737,8 +16074,8 @@
+@@ -19737,8 +16074,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.
@@ -17771,7 +17771,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -19754,193 +16091,119 @@
+@@ -19754,193 +16091,119 @@ else
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -18018,7 +18018,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -19950,17 +16213,18 @@
+@@ -19950,17 +16213,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -18044,7 +18044,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -19968,23 +16232,15 @@
+@@ -19968,23 +16232,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -18073,7 +18073,7 @@
as_nl='
'
export as_nl
-@@ -19992,7 +16248,13 @@
+@@ -19992,7 +16248,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
@@ -18088,7 +18088,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -20003,7 +16265,7 @@
+@@ -20003,7 +16265,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -18097,7 +18097,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -20026,13 +16288,6 @@
+@@ -20026,13 +16288,6 @@ if test "${PATH_SEPARATOR+set}" != set;
}
fi
@@ -18111,7 +18111,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -20042,15 +16297,15 @@
+@@ -20042,15 +16297,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -18130,7 +18130,7 @@
IFS=$as_save_IFS
;;
-@@ -20062,12 +16317,16 @@
+@@ -20062,12 +16317,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
@@ -18151,7 +18151,7 @@
done
PS1='$ '
PS2='> '
-@@ -20079,7 +16338,89 @@
+@@ -20079,7 +16338,89 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
@@ -18242,7 +18242,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -20093,8 +16434,12 @@
+@@ -20093,8 +16434,12 @@ else
as_basename=false
fi
@@ -18256,7 +18256,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -20114,76 +16459,25 @@
+@@ -20114,76 +16459,25 @@ $as_echo X/"$0" |
}
s/.*/./; q'`
@@ -18344,7 +18344,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -20212,8 +16506,56 @@
+@@ -20212,8 +16506,56 @@ fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -18402,7 +18402,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -20232,10 +16574,10 @@
+@@ -20232,10 +16574,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
@@ -18415,7 +18415,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -20250,13 +16592,19 @@
+@@ -20250,13 +16592,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
exec 6>&1
@@ -18431,13 +18431,13 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by nautilus $as_me 2.30.0, which was
+ This file was extended by nautilus $as_me 2.30.1, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -20288,13 +16636,15 @@
+@@ -20288,13 +16636,15 @@ _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -18456,7 +18456,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -20313,16 +16663,17 @@
+@@ -20313,16 +16663,17 @@ $config_headers
Configuration commands:
$config_commands
@@ -18467,7 +18467,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- nautilus config.status 2.30.0
+ nautilus config.status 2.30.1
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
@@ -18478,7 +18478,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -20358,6 +16709,8 @@
+@@ -20358,6 +16709,8 @@ do
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -18487,7 +18487,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -20365,20 +16718,19 @@
+@@ -20365,20 +16718,19 @@ do
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -18512,7 +18512,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -20386,11 +16738,10 @@
+@@ -20386,11 +16738,10 @@ Try \`$0 --help' for more information."
ac_cs_silent=: ;;
# This is an error.
@@ -18527,7 +18527,7 @@
ac_need_defaults=false ;;
esac
-@@ -20731,9 +17082,7 @@
+@@ -20731,9 +17082,7 @@ do
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -18538,7 +18538,7 @@
esac
done
-@@ -20760,7 +17109,7 @@
+@@ -20760,7 +17109,7 @@ $debug ||
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -18547,7 +18547,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -20771,11 +17120,7 @@
+@@ -20771,11 +17120,7 @@ $debug ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -18560,7 +18560,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -20783,10 +17128,16 @@
+@@ -20783,10 +17128,16 @@ $debug ||
if test -n "$CONFIG_FILES"; then
@@ -18579,7 +18579,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -20800,24 +17151,18 @@
+@@ -20800,24 +17151,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -18607,7 +18607,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -20839,7 +17184,7 @@
+@@ -20839,7 +17184,7 @@ s/'"$ac_delim"'$//
t delim
:nl
h
@@ -18616,7 +18616,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -20853,7 +17198,7 @@
+@@ -20853,7 +17198,7 @@ s/.\{148\}//
t nl
:delim
h
@@ -18625,7 +18625,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -20906,9 +17251,7 @@
+@@ -20906,9 +17251,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -18636,7 +18636,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -20949,9 +17292,7 @@
+@@ -20949,9 +17292,7 @@ for ac_last_try in false false :; do
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -18647,7 +18647,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -21036,9 +17377,7 @@
+@@ -21036,9 +17377,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -18658,7 +18658,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -21051,9 +17390,7 @@
+@@ -21051,9 +17390,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -18669,7 +18669,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -21081,12 +17418,10 @@
+@@ -21081,12 +17418,10 @@ $as_echo "$as_me: error: invalid tag $ac
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -18684,7 +18684,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -21097,7 +17432,7 @@
+@@ -21097,7 +17432,7 @@ $as_echo "$as_me: error: cannot find inp
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -18693,7 +18693,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -21110,9 +17445,7 @@
+@@ -21110,9 +17445,7 @@ $as_echo "$as_me: creating $ac_file" >&6
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -18704,7 +18704,7 @@
esac
;;
esac
-@@ -21140,47 +17473,7 @@
+@@ -21140,47 +17473,7 @@ $as_echo X"$ac_file" |
q
}
s/.*/./; q'`
@@ -18753,7 +18753,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -21237,7 +17530,6 @@
+@@ -21237,7 +17530,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=
@@ -18761,7 +18761,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -21247,12 +17539,11 @@
+@@ -21247,12 +17539,11 @@ ac_sed_dataroot='
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -18776,7 +18776,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
-@@ -21262,7 +17553,7 @@
+@@ -21262,7 +17553,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -18785,7 +18785,7 @@
esac
_ACEOF
-@@ -21291,14 +17582,12 @@
+@@ -21291,14 +17582,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 \
@@ -18802,7 +18802,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;}
-@@ -21308,9 +17597,7 @@
+@@ -21308,9 +17597,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 \
@@ -18813,7 +18813,7 @@
;;
:H)
#
-@@ -21321,25 +17608,19 @@
+@@ -21321,25 +17608,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" \
@@ -18843,7 +18843,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -21377,7 +17658,7 @@
+@@ -21377,7 +17658,7 @@ $as_echo X"$_am_arg" |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -18852,7 +18852,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -21472,47 +17753,7 @@
+@@ -21472,47 +17753,7 @@ $as_echo X"$file" |
q
}
s/.*/./; q'`
@@ -18901,7 +18901,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -22165,9 +18406,7 @@
+@@ -22165,9 +18406,7 @@ _LT_EOF
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -18912,7 +18912,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -22190,15 +18429,12 @@
+@@ -22190,15 +18429,12 @@ $as_echo "$as_me: error: po/Makefile.in.
done # for ac_tag
@@ -18930,7 +18930,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -22219,10 +18455,10 @@
+@@ -22219,10 +18455,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.
@@ -18943,11 +18943,11 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-Index: nautilus-2.30.0/cut-n-paste-code/Makefile.in
+Index: nautilus-2.30.1/cut-n-paste-code/Makefile.in
===================================================================
---- nautilus-2.30.0.orig/cut-n-paste-code/Makefile.in 2010-04-13 23:22:33.791716084 +0200
-+++ nautilus-2.30.0/cut-n-paste-code/Makefile.in 2010-04-13 23:22:09.459709541 +0200
-@@ -198,6 +198,7 @@
+--- nautilus-2.30.1.orig/cut-n-paste-code/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1/cut-n-paste-code/Makefile.in 2010-04-27 19:04:35.825524676 +0200
+@@ -198,6 +198,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18955,11 +18955,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.30.0/cut-n-paste-code/libegg/Makefile.in
+Index: nautilus-2.30.1/cut-n-paste-code/libegg/Makefile.in
===================================================================
---- nautilus-2.30.0.orig/cut-n-paste-code/libegg/Makefile.in 2010-04-13 23:22:33.927711892 +0200
-+++ nautilus-2.30.0/cut-n-paste-code/libegg/Makefile.in 2010-04-13 23:22:09.647709190 +0200
-@@ -197,6 +197,7 @@
+--- nautilus-2.30.1.orig/cut-n-paste-code/libegg/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1/cut-n-paste-code/libegg/Makefile.in 2010-04-27 19:04:35.825524676 +0200
+@@ -197,6 +197,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18967,11 +18967,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.30.0/data/Makefile.in
+Index: nautilus-2.30.1/data/Makefile.in
===================================================================
---- nautilus-2.30.0.orig/data/Makefile.in 2010-04-13 23:22:31.411713487 +0200
-+++ nautilus-2.30.0/data/Makefile.in 2010-04-13 23:22:09.775710973 +0200
-@@ -234,6 +234,7 @@
+--- nautilus-2.30.1.orig/data/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1/data/Makefile.in 2010-04-27 19:04:35.825524676 +0200
+@@ -234,6 +234,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18979,11 +18979,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.30.0/data/icons/Makefile.in
+Index: nautilus-2.30.1/data/icons/Makefile.in
===================================================================
---- nautilus-2.30.0.orig/data/icons/Makefile.in 2010-04-13 23:22:31.611716055 +0200
-+++ nautilus-2.30.0/data/icons/Makefile.in 2010-04-13 23:22:09.879710809 +0200
-@@ -160,6 +160,7 @@
+--- nautilus-2.30.1.orig/data/icons/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1/data/icons/Makefile.in 2010-04-27 19:04:35.825524676 +0200
+@@ -160,6 +160,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18991,11 +18991,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.30.0/data/patterns/Makefile.in
+Index: nautilus-2.30.1/data/patterns/Makefile.in
===================================================================
---- nautilus-2.30.0.orig/data/patterns/Makefile.in 2010-04-13 23:22:31.499716029 +0200
-+++ nautilus-2.30.0/data/patterns/Makefile.in 2010-04-13 23:22:09.983710361 +0200
-@@ -182,6 +182,7 @@
+--- nautilus-2.30.1.orig/data/patterns/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1/data/patterns/Makefile.in 2010-04-27 19:04:35.825524676 +0200
+@@ -182,6 +182,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19003,11 +19003,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.30.0/docs/Makefile.in
+Index: nautilus-2.30.1/docs/Makefile.in
===================================================================
---- nautilus-2.30.0.orig/docs/Makefile.in 2010-04-13 23:22:31.731710675 +0200
-+++ nautilus-2.30.0/docs/Makefile.in 2010-04-13 23:22:10.107711355 +0200
-@@ -223,6 +223,7 @@
+--- nautilus-2.30.1.orig/docs/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1/docs/Makefile.in 2010-04-27 19:04:35.829526721 +0200
+@@ -223,6 +223,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19015,11 +19015,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.30.0/docs/reference/Makefile.in
+Index: nautilus-2.30.1/docs/reference/Makefile.in
===================================================================
---- nautilus-2.30.0.orig/docs/reference/Makefile.in 2010-04-13 23:22:31.883717744 +0200
-+++ nautilus-2.30.0/docs/reference/Makefile.in 2010-04-13 23:22:10.211708406 +0200
-@@ -198,6 +198,7 @@
+--- nautilus-2.30.1.orig/docs/reference/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1/docs/reference/Makefile.in 2010-04-27 19:04:35.829526721 +0200
+@@ -198,6 +198,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19027,11 +19027,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.30.0/docs/reference/libnautilus-extension/Makefile.in
+Index: nautilus-2.30.1/docs/reference/libnautilus-extension/Makefile.in
===================================================================
---- nautilus-2.30.0.orig/docs/reference/libnautilus-extension/Makefile.in 2010-04-13 23:22:32.039713022 +0200
-+++ nautilus-2.30.0/docs/reference/libnautilus-extension/Makefile.in 2010-04-13 23:22:10.343711533 +0200
-@@ -165,6 +165,7 @@
+--- nautilus-2.30.1.orig/docs/reference/libnautilus-extension/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1/docs/reference/libnautilus-extension/Makefile.in 2010-04-27 19:04:35.829526721 +0200
+@@ -165,6 +165,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19039,22 +19039,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.30.0/eel/Makefile.in
+Index: nautilus-2.30.1/eel/Makefile.in
===================================================================
---- nautilus-2.30.0.orig/eel/Makefile.in 2010-04-13 23:22:32.459711776 +0200
-+++ nautilus-2.30.0/eel/Makefile.in 2010-04-13 23:22:10.535710277 +0200
-@@ -52,7 +52,9 @@
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- LTLIBRARIES = $(noinst_LTLIBRARIES)
--libeel_2_la_LIBADD =
-+am__DEPENDENCIES_1 =
-+libeel_2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am__objects_1 =
- am_libeel_2_la_OBJECTS = eel-accessibility.lo eel-alert-dialog.lo \
- eel-art-extensions.lo eel-art-gtk-extensions.lo \
-@@ -217,6 +219,7 @@
+--- nautilus-2.30.1.orig/eel/Makefile.in 2010-04-27 19:05:33.617527073 +0200
++++ nautilus-2.30.1/eel/Makefile.in 2010-04-27 19:04:58.238028011 +0200
+@@ -219,6 +219,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19062,21 +19051,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -312,6 +315,9 @@
-
- libeel_2_la_LDFLAGS = \
- -no-undefined \
-+ $(NULL)
-+
-+libeel_2_la_LIBADD = \
- $(CORE_LIBS) \
- $(RENDER_LIBS) \
- $(X_LIBS) \
-Index: nautilus-2.30.0/icons/Makefile.in
+Index: nautilus-2.30.1/icons/Makefile.in
===================================================================
---- nautilus-2.30.0.orig/icons/Makefile.in 2010-04-13 23:22:39.959713730 +0200
-+++ nautilus-2.30.0/icons/Makefile.in 2010-04-13 23:22:10.659710160 +0200
-@@ -182,6 +182,7 @@
+--- nautilus-2.30.1.orig/icons/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1/icons/Makefile.in 2010-04-27 19:04:35.829526721 +0200
+@@ -182,6 +182,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19084,11 +19063,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.30.0/libnautilus-extension/Makefile.in
+Index: nautilus-2.30.1/libnautilus-extension/Makefile.in
===================================================================
---- nautilus-2.30.0.orig/libnautilus-extension/Makefile.in 2010-04-13 23:22:34.595713177 +0200
-+++ nautilus-2.30.0/libnautilus-extension/Makefile.in 2010-04-13 23:22:10.839709906 +0200
-@@ -232,6 +232,7 @@
+--- nautilus-2.30.1.orig/libnautilus-extension/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1/libnautilus-extension/Makefile.in 2010-04-27 19:04:35.829526721 +0200
+@@ -232,6 +232,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19096,11 +19075,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.30.0/libnautilus-private/Makefile.in
+Index: nautilus-2.30.1/libnautilus-private/Makefile.in
===================================================================
---- nautilus-2.30.0.orig/libnautilus-private/Makefile.in 2010-04-13 23:22:29.371713140 +0200
-+++ nautilus-2.30.0/libnautilus-private/Makefile.in 2010-04-13 23:22:11.067710725 +0200
-@@ -264,6 +264,7 @@
+--- nautilus-2.30.1.orig/libnautilus-private/Makefile.in 2010-04-26 13:24:13.000000000 +0200
++++ nautilus-2.30.1/libnautilus-private/Makefile.in 2010-04-27 19:04:35.829526721 +0200
+@@ -264,6 +264,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19108,10 +19087,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.30.0/ltmain.sh
+Index: nautilus-2.30.1/ltmain.sh
===================================================================
---- nautilus-2.30.0.orig/ltmain.sh 2010-04-13 23:22:33.671713087 +0200
-+++ nautilus-2.30.0/ltmain.sh 2010-04-13 23:21:18.239710577 +0200
+--- nautilus-2.30.1.orig/ltmain.sh 2010-04-26 13:24:06.000000000 +0200
++++ nautilus-2.30.1/ltmain.sh 2010-04-27 19:04:35.829526721 +0200
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -19130,7 +19109,7 @@
TIMESTAMP=""
package_revision=1.3017
-@@ -5033,7 +5033,10 @@
+@@ -5033,7 +5033,10 @@ func_mode_link ()
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -19142,7 +19121,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"
@@ -19172,7 +19151,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
@@ -19180,7 +19159,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
;;
@@ -19190,11 +19169,11 @@
esac
;;
no)
-Index: nautilus-2.30.0/m4/libtool.m4
+Index: nautilus-2.30.1/m4/libtool.m4
===================================================================
---- nautilus-2.30.0.orig/m4/libtool.m4 2010-04-13 23:22:40.327711730 +0200
-+++ nautilus-2.30.0/m4/libtool.m4 2010-04-13 23:21:18.415717628 +0200
-@@ -2445,7 +2445,7 @@
+--- nautilus-2.30.1.orig/m4/libtool.m4 2010-04-26 13:24:06.000000000 +0200
++++ nautilus-2.30.1/m4/libtool.m4 2010-04-27 19:04:35.833526811 +0200
+@@ -2445,7 +2445,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -19203,7 +19182,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2470,13 +2470,10 @@
+@@ -2470,13 +2470,10 @@ linux* | k*bsd*-gnu)
# before this can be enabled.
hardcode_into_libs=yes
@@ -19218,7 +19197,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'
;;
@@ -19237,7 +19216,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -3075,11 +3084,11 @@
+@@ -3075,11 +3084,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
@@ -19251,7 +19230,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -3696,7 +3705,7 @@
+@@ -3696,7 +3705,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
@@ -19260,7 +19239,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -3760,7 +3769,7 @@
+@@ -3760,7 +3769,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
@@ -19269,7 +19248,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -3980,7 +3989,7 @@
+@@ -3980,7 +3989,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -19278,7 +19257,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -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'
;;
@@ -19288,7 +19267,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
;;
@@ -19298,7 +19277,7 @@
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4270,6 +4285,7 @@
+@@ -4270,6 +4285,7 @@ dnl Note also adjust exclude_expsyms for
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -19306,7 +19285,7 @@
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -4361,7 +4377,7 @@
+@@ -4361,7 +4377,7 @@ _LT_EOF
_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -19315,7 +19294,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -4431,7 +4447,7 @@
+@@ -4431,7 +4447,7 @@ _LT_EOF
fi
;;
@@ -19324,7 +19303,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -4606,6 +4622,7 @@
+@@ -4606,6 +4622,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -19332,7 +19311,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -4844,7 +4861,7 @@
+@@ -4844,7 +4861,7 @@ _LT_EOF
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -19341,7 +19320,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -5844,7 +5861,7 @@
+@@ -5844,7 +5861,7 @@ if test "$_lt_caught_CXX_error" != yes;
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
@@ -19350,11 +19329,11 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-Index: nautilus-2.30.0/src/Makefile.in
+Index: nautilus-2.30.1/src/Makefile.in
===================================================================
---- nautilus-2.30.0.orig/src/Makefile.in 2010-04-13 23:22:34.887715739 +0200
-+++ nautilus-2.30.0/src/Makefile.in 2010-04-13 23:22:11.275710973 +0200
-@@ -353,6 +353,7 @@
+--- nautilus-2.30.1.orig/src/Makefile.in 2010-04-26 13:24:13.000000000 +0200
++++ nautilus-2.30.1/src/Makefile.in 2010-04-27 19:04:35.833526811 +0200
+@@ -353,6 +353,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19362,11 +19341,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.30.0/src/file-manager/Makefile.in
+Index: nautilus-2.30.1/src/file-manager/Makefile.in
===================================================================
---- nautilus-2.30.0.orig/src/file-manager/Makefile.in 2010-04-13 23:22:35.031716192 +0200
-+++ nautilus-2.30.0/src/file-manager/Makefile.in 2010-04-13 23:22:11.427711054 +0200
-@@ -232,6 +232,7 @@
+--- nautilus-2.30.1.orig/src/file-manager/Makefile.in 2010-04-26 13:24:13.000000000 +0200
++++ nautilus-2.30.1/src/file-manager/Makefile.in 2010-04-27 19:04:35.833526811 +0200
+@@ -232,6 +232,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19374,11 +19353,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.30.0/test/Makefile.in
+Index: nautilus-2.30.1/test/Makefile.in
===================================================================
---- nautilus-2.30.0.orig/test/Makefile.in 2010-04-13 23:22:39.263713355 +0200
-+++ nautilus-2.30.0/test/Makefile.in 2010-04-13 23:22:11.659710160 +0200
-@@ -280,6 +280,7 @@
+--- nautilus-2.30.1.orig/test/Makefile.in 2010-04-26 13:24:13.000000000 +0200
++++ nautilus-2.30.1/test/Makefile.in 2010-04-27 19:04:35.833526811 +0200
+@@ -280,6 +280,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19386,3 +19365,341 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
+Index: nautilus-2.30.1/INSTALL
+===================================================================
+--- nautilus-2.30.1.orig/INSTALL 2010-04-27 19:05:32.629526504 +0200
++++ nautilus-2.30.1/INSTALL 2010-04-27 19:04:59.294026191 +0200
+@@ -2,18 +2,24 @@ Installation Instructions
+ *************************
+
+ Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+-2006, 2007 Free Software Foundation, Inc.
++2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+-This file is free documentation; the Free Software Foundation gives
+-unlimited permission to copy, distribute and modify it.
++ Copying and distribution of this file, with or without modification,
++are permitted in any medium without royalty provided the copyright
++notice and this notice are preserved. This file is offered as-is,
++without warranty of any kind.
+
+ Basic Installation
+ ==================
+
+-Briefly, the shell commands `./configure; make; make install' should
++ Briefly, the shell commands `./configure; make; make install' should
+ configure, build, and install this package. The following
+ more-detailed instructions are generic; see the `README' file for
+-instructions specific to this package.
++instructions specific to this package. Some packages provide this
++`INSTALL' file but do not implement all of the features documented
++below. The lack of an optional feature in a given package is not
++necessarily a bug. More recommendations for GNU packages can be found
++in *note Makefile Conventions: (standards)Makefile Conventions.
+
+ The `configure' shell script attempts to guess correct values for
+ various system-dependent variables used during compilation. It uses
+@@ -42,7 +48,7 @@ may remove or edit it.
+ you want to change it or regenerate `configure' using a newer version
+ of `autoconf'.
+
+-The simplest way to compile this package is:
++ The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+@@ -53,12 +59,22 @@ The simplest way to compile this package
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+- the package.
++ the package, generally using the just-built uninstalled binaries.
+
+ 4. Type `make install' to install the programs and any data files and
+- documentation.
++ documentation. When installing into a prefix owned by root, it is
++ recommended that the package be configured and built as a regular
++ user, and only the `make install' phase executed with root
++ privileges.
++
++ 5. Optionally, type `make installcheck' to repeat any self-tests, but
++ this time using the binaries in their final installed location.
++ This target does not install anything. Running this target as a
++ regular user, particularly if the prior `make install' required
++ root privileges, verifies that the installation completed
++ correctly.
+
+- 5. You can remove the program binaries and object files from the
++ 6. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+@@ -67,15 +83,22 @@ The simplest way to compile this package
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+- 6. Often, you can also type `make uninstall' to remove the installed
+- files again.
++ 7. Often, you can also type `make uninstall' to remove the installed
++ files again. In practice, not all packages have tested that
++ uninstallation works correctly, even though it is required by the
++ GNU Coding Standards.
++
++ 8. Some packages, particularly those that use Automake, provide `make
++ distcheck', which can by used by developers to test that all other
++ targets like `make install' and `make uninstall' work correctly.
++ This target is generally not run by end users.
+
+ Compilers and Options
+ =====================
+
+-Some systems require unusual options for compilation or linking that the
+-`configure' script does not know about. Run `./configure --help' for
+-details on some of the pertinent environment variables.
++ Some systems require unusual options for compilation or linking that
++the `configure' script does not know about. Run `./configure --help'
++for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+ by setting variables in the command line or in the environment. Here
+@@ -88,25 +111,41 @@ is an example:
+ Compiling For Multiple Architectures
+ ====================================
+
+-You can compile the package for more than one kind of computer at the
++ You can compile the package for more than one kind of computer at the
+ 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
+ the `configure' script. `configure' automatically checks for the
+-source code in the directory that `configure' is in and in `..'.
++source code in the directory that `configure' is in and in `..'. This
++is known as a "VPATH" build.
+
+ With a non-GNU `make', it is safer to compile the package for one
+ architecture at a time in the source code directory. After you have
+ installed the package for one architecture, use `make distclean' before
+ reconfiguring for another architecture.
+
++ On MacOS X 10.5 and later systems, you can create libraries and
++executables that work on multiple system types--known as "fat" or
++"universal" binaries--by specifying multiple `-arch' options to the
++compiler but only a single `-arch' option to the preprocessor. Like
++this:
++
++ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
++ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
++ CPP="gcc -E" CXXCPP="g++ -E"
++
++ This is not guaranteed to produce working output in all cases, you
++may have to build one architecture at a time and combine the results
++using the `lipo' tool if you have problems.
++
+ Installation Names
+ ==================
+
+-By default, `make install' installs the package's commands under
++ By default, `make install' installs the package's commands under
+ `/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'.
++`configure' the option `--prefix=PREFIX', where PREFIX must be an
++absolute file name.
+
+ You can specify separate installation prefixes for
+ architecture-specific files and architecture-independent files. If you
+@@ -117,16 +156,47 @@ Documentation and other data files still
+ In addition, if you use an unusual directory layout you can give
+ options like `--bindir=DIR' to specify different values for particular
+ kinds of files. Run `configure --help' for a list of the directories
+-you can set and what kinds of files go in them.
++you can set and what kinds of files go in them. In general, the
++default for these options is expressed in terms of `${prefix}', so that
++specifying just `--prefix' will affect all of the other directory
++specifications that were not explicitly provided.
++
++ The most portable way to affect installation locations is to pass the
++correct locations to `configure'; however, many packages provide one or
++both of the following shortcuts of passing variable assignments to the
++`make install' command line to change installation locations without
++having to reconfigure or recompile.
++
++ The first method involves providing an override variable for each
++affected directory. For example, `make install
++prefix=/alternate/directory' will choose an alternate location for all
++directory configuration variables that were expressed in terms of
++`${prefix}'. Any directories that were specified during `configure',
++but not in terms of `${prefix}', must each be overridden at install
++time for the entire installation to be relocated. The approach of
++makefile variable overrides for each directory variable is required by
++the GNU Coding Standards, and ideally causes no recompilation.
++However, some platforms have known limitations with the semantics of
++shared libraries that end up requiring recompilation when using this
++method, particularly noticeable in packages that use GNU Libtool.
++
++ The second method involves providing the `DESTDIR' variable. For
++example, `make install DESTDIR=/alternate/directory' will prepend
++`/alternate/directory' before all installation names. The approach of
++`DESTDIR' overrides is not required by the GNU Coding Standards, and
++does not work on platforms that have drive letters. On the other hand,
++it does better at avoiding recompilation issues, and works well even
++when some directory options were not specified in terms of `${prefix}'
++at `configure' time.
++
++Optional Features
++=================
+
+ If the package supports it, you can cause programs to be installed
+ with an extra prefix or suffix on their names by giving `configure' the
+ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+-Optional Features
+-=================
+-
+-Some packages pay attention to `--enable-FEATURE' options to
++ Some packages pay attention to `--enable-FEATURE' options to
+ `configure', where FEATURE indicates an optional part of the package.
+ They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+ is something like `gnu-as' or `x' (for the X Window System). The
+@@ -138,14 +208,53 @@ find the X include and library files aut
+ you can use the `configure' options `--x-includes=DIR' and
+ `--x-libraries=DIR' to specify their locations.
+
++ Some packages offer the ability to configure how verbose the
++execution of `make' will be. For these packages, running `./configure
++--enable-silent-rules' sets the default to minimal output, which can be
++overridden with `make V=1'; while running `./configure
++--disable-silent-rules' sets the default to verbose, which can be
++overridden with `make V=0'.
++
++Particular systems
++==================
++
++ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
++CC is not installed, it is recommended to use the following options in
++order to use an ANSI C compiler:
++
++ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
++
++and if that doesn't work, install pre-built binaries of GCC for HP-UX.
++
++ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
++parse its `<wchar.h>' header file. The option `-nodtk' can be used as
++a workaround. If GNU CC is not installed, it is therefore recommended
++to try
++
++ ./configure CC="cc"
++
++and if that doesn't work, try
++
++ ./configure CC="cc -nodtk"
++
++ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
++directory contains several dysfunctional programs; working variants of
++these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
++in your `PATH', put it _after_ `/usr/bin'.
++
++ On Haiku, software installed for all users goes in `/boot/common',
++not `/usr/local'. It is recommended to use the following options:
++
++ ./configure --prefix=/boot/common
++
+ Specifying the System Type
+ ==========================
+
+-There may be some features `configure' cannot figure out automatically,
+-but needs to determine by the type of machine the package will run on.
+-Usually, assuming the package is built to be run on the _same_
+-architectures, `configure' can figure that out, but if it prints a
+-message saying it cannot guess the machine type, give it the
++ There may be some features `configure' cannot figure out
++automatically, but needs to determine by the type of machine the package
++will run on. Usually, assuming the package is built to be run on the
++_same_ architectures, `configure' can figure that out, but if it prints
++a message saying it cannot guess the machine type, give it the
+ `--build=TYPE' option. TYPE can either be a short name for the system
+ type, such as `sun4', or a canonical name which has the form:
+
+@@ -153,7 +262,8 @@ type, such as `sun4', or a canonical nam
+
+ where SYSTEM can have one of these forms:
+
+- OS KERNEL-OS
++ OS
++ KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+ `config.sub' isn't included in this package, then this package doesn't
+@@ -171,9 +281,9 @@ eventually be run) with `--host=TYPE'.
+ Sharing Defaults
+ ================
+
+-If you want to set default values for `configure' scripts to share, you
+-can create a site shell script called `config.site' that gives default
+-values for variables like `CC', `cache_file', and `prefix'.
++ If you want to set default values for `configure' scripts to share,
++you can create a site shell script called `config.site' that gives
++default values for variables like `CC', `cache_file', and `prefix'.
+ `configure' looks for `PREFIX/share/config.site' if it exists, then
+ `PREFIX/etc/config.site' if it exists. Or, you can set the
+ `CONFIG_SITE' environment variable to the location of the site script.
+@@ -182,7 +292,7 @@ A warning: not all `configure' scripts l
+ Defining Variables
+ ==================
+
+-Variables not defined in a site shell script can be set in the
++ Variables not defined in a site shell script can be set in the
+ environment passed to `configure'. However, some packages may run
+ configure again during the build, and the customized values of these
+ variables may be lost. In order to avoid this problem, you should set
+@@ -201,11 +311,19 @@ an Autoconf bug. Until the bug is fixed
+ `configure' Invocation
+ ======================
+
+-`configure' recognizes the following options to control how it operates.
++ `configure' recognizes the following options to control how it
++operates.
+
+ `--help'
+ `-h'
+- Print a summary of the options to `configure', and exit.
++ Print a summary of all of the options to `configure', and exit.
++
++`--help=short'
++`--help=recursive'
++ Print a summary of the options unique to this package's
++ `configure', and exit. The `short' variant lists options used
++ only in the top level, while the `recursive' variant lists options
++ also present in any nested packages.
+
+ `--version'
+ `-V'
+@@ -232,6 +350,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.
+
++`--prefix=DIR'
++ Use DIR as the installation prefix. *note Installation Names::
++ for more details, including other options available for fine-tuning
++ the installation locations.
++
++`--no-create'
++`-n'
++ Run the configure checks, but stop before creating any output
++ files.
++
+ `configure' also accepts some other, not widely useful, options. Run
+ `configure --help' for more details.
+
+Index: nautilus-2.30.1/Makefile.in
+===================================================================
+--- nautilus-2.30.1.orig/Makefile.in 2010-04-27 19:05:32.589526098 +0200
++++ nautilus-2.30.1/Makefile.in 2010-04-27 19:04:59.358025664 +0200
+@@ -215,6 +215,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_REQUIRED = @PANGO_REQUIRED@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
Modified: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=24049&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/series [utf-8] Tue Apr 27 17:06:19 2010
@@ -1,7 +1,5 @@
#10_location_titlebar.patch
-02_eel_libadd.patch
03_deprecated.patch
-04_tracker_0.8.patch
10_load_session.patch
12_list-view_expand.patch
20_open-with_install.patch
More information about the pkg-gnome-commits
mailing list