r23619 - in /desktop/unstable/nautilus/debian: changelog patches/03_deprecated.patch patches/90_relibtoolize.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Apr 9 00:02:18 UTC 2010
Author: joss
Date: Fri Apr 9 00:02:12 2010
New Revision: 23619
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23619
Log:
* 03_deprecated.patch: new patch. Don’t use -D*DISABLE_DEPRECATED for
a production build, it often FTBFS. Closes: #576977.
* 90_relibtoolize.patch: updated accordingly.
Added:
desktop/unstable/nautilus/debian/patches/03_deprecated.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=23619&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog [utf-8] (original)
+++ desktop/unstable/nautilus/debian/changelog [utf-8] Fri Apr 9 00:02:12 2010
@@ -1,3 +1,11 @@
+nautilus (2.28.4-2) unstable; urgency=low
+
+ * 03_deprecated.patch: new patch. Don’t use -D*DISABLE_DEPRECATED for
+ a production build, it often FTBFS. Closes: #576977.
+ * 90_relibtoolize.patch: updated accordingly.
+
+ -- Josselin Mouette <joss at debian.org> Fri, 09 Apr 2010 02:00:34 +0200
+
nautilus (2.28.4-1) unstable; urgency=low
* New upstream bugfix release.
Added: desktop/unstable/nautilus/debian/patches/03_deprecated.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/03_deprecated.patch?rev=23619&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/03_deprecated.patch (added)
+++ desktop/unstable/nautilus/debian/patches/03_deprecated.patch [utf-8] Fri Apr 9 00:02:12 2010
@@ -1,0 +1,13 @@
+Index: nautilus-2.28.4/configure.in
+===================================================================
+--- nautilus-2.28.4.orig/configure.in 2010-04-09 01:58:36.670222898 +0200
++++ nautilus-2.28.4/configure.in 2010-04-09 01:58:49.622718158 +0200
+@@ -398,7 +398,7 @@ AC_SUBST(CORE_CFLAGS)
+ CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
+ AC_SUBST(CORE_LIBS)
+
+-DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
++DISABLE_DEPRECATED_CFLAGS=""
+ AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
+
+ dnl Multimedia keys
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=23619&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch [utf-8] Fri Apr 9 00:02:12 2010
@@ -6,10 +6,16 @@
autoconf
rm -rf autom4te.cache config.h.in~
-Index: quilt-bEU2iR/aclocal.m4
+Index: nautilus-2.28.4/aclocal.m4
===================================================================
---- quilt-bEU2iR.orig/aclocal.m4 2009-12-15 10:12:53.000000000 +0100
-+++ quilt-bEU2iR/aclocal.m4 2009-12-15 14:38:29.000000000 +0100
+--- nautilus-2.28.4.orig/aclocal.m4 2010-04-09 01:58:09.078718475 +0200
++++ nautilus-2.28.4/aclocal.m4 2010-04-09 01:59:15.734717077 +0200
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.11 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -13,1664 +13,1666 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -1319,7 +1325,7 @@
+[am__api_version='1.11'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version. Point them to the right macro.
-+m4_if([$1], [1.11], [],
++m4_if([$1], [1.11.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -1344,7 +1350,7 @@
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+[AM_AUTOMAKE_VERSION([1.11])dnl
++[AM_AUTOMAKE_VERSION([1.11.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -1636,22 +1642,27 @@
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
+-
+-# Helper functions for option handling. -*- Autoconf -*-
+# serial 10
--# Helper functions for option handling. -*- Autoconf -*-
+-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
--# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-
-# serial 4
+
+-# _AM_MANGLE_OPTION(NAME)
+-# -----------------------
+-AC_DEFUN([_AM_MANGLE_OPTION],
+-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
@@ -1668,10 +1679,11 @@
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
--# _AM_MANGLE_OPTION(NAME)
--# -----------------------
--AC_DEFUN([_AM_MANGLE_OPTION],
--[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+-# _AM_SET_OPTION(NAME)
+-# ------------------------------
+-# Set option NAME. Presently that only means defining a flag for this option.
+-AC_DEFUN([_AM_SET_OPTION],
+-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
@@ -1679,12 +1691,6 @@
+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
--# _AM_SET_OPTION(NAME)
--# ------------------------------
--# Set option NAME. Presently that only means defining a flag for this option.
--AC_DEFUN([_AM_SET_OPTION],
--[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
--
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
@@ -1950,13 +1956,18 @@
# with or without modifications, as long as this notice is preserved.
-# serial 2
-+#serial 5
-
+-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
++#serial 5
+
+-# AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
+-# Public sister of _AM_SUBST_NOTMAKE.
+-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -2012,12 +2023,9 @@
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
--# AM_SUBST_NOTMAKE(VARIABLE)
--# ---------------------------
--# Public sister of _AM_SUBST_NOTMAKE.
--AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-# Check how to create a tarball. -*- Autoconf -*-
+
+-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
@@ -2030,8 +2038,7 @@
+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
-
--# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
++
+# Do all the work for Automake. -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -3160,24 +3167,58 @@
m4_include([m4/gtk-doc.m4])
m4_include([m4/intltool.m4])
-Index: quilt-bEU2iR/config.guess
+Index: nautilus-2.28.4/config.guess
===================================================================
---- quilt-bEU2iR.orig/config.guess 2009-12-15 10:12:56.000000000 +0100
-+++ quilt-bEU2iR/config.guess 2009-12-15 14:38:32.000000000 +0100
+--- nautilus-2.28.4.orig/config.guess 2010-04-09 01:58:09.066716741 +0200
++++ nautilus-2.28.4/config.guess 2010-04-09 01:59:17.062714488 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
-timestamp='2009-04-27'
-+timestamp='2009-06-10'
++timestamp='2009-12-30'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-@@ -170,7 +170,7 @@
+@@ -27,16 +27,16 @@ timestamp='2009-04-27'
+ # the same distribution terms that you use for the rest of that program.
+
+
+-# Originally written by Per Bothner <per at bothner.com>.
+-# Please send patches to <config-patches at gnu.org>. Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Originally written by Per Bothner. Please send patches (context
++# diff format) to <config-patches at gnu.org> and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub. If it succeeds, it prints the system name on stdout, and
+ # exits with 0. Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+ me=`echo "$0" | sed -e 's,.*/,,'`
+
+@@ -56,8 +56,9 @@ version="\
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -170,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -3186,7 +3227,17 @@
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
-@@ -656,7 +656,7 @@
+@@ -333,6 +334,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++ echo i386-pc-auroraux${UNAME_RELEASE}
++ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
+@@ -656,7 +660,7 @@ EOF
# => hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
@@ -3195,7 +3246,22 @@
then
HP_ARCH="hppa2.0w"
else
-@@ -822,6 +822,9 @@
+@@ -807,12 +811,12 @@ EOF
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
+- *:Interix*:[3456]*)
++ *:Interix*:*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+- EM64T | authenticamd | genuineintel)
++ authenticamd | genuineintel | EM64T)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+@@ -822,6 +826,9 @@ EOF
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -3205,24 +3271,59 @@
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -882,40 +885,17 @@
+@@ -851,6 +858,20 @@ EOF
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
++ alpha:Linux:*:*)
++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++ EV5) UNAME_MACHINE=alphaev5 ;;
++ EV56) UNAME_MACHINE=alphaev56 ;;
++ PCA56) UNAME_MACHINE=alphapca56 ;;
++ PCA57) UNAME_MACHINE=alphapca56 ;;
++ EV6) UNAME_MACHINE=alphaev6 ;;
++ EV67) UNAME_MACHINE=alphaev67 ;;
++ EV68*) UNAME_MACHINE=alphaev68 ;;
++ esac
++ objdump --private-headers /bin/sh | grep -q ld.so.1
++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++ exit ;;
+ arm*:Linux:*:*)
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+@@ -873,6 +894,17 @@ EOF
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit ;;
++ i*86:Linux:*:*)
++ LIBC=gnu
++ eval $set_cc_for_build
++ sed 's/^ //' << EOF >$dummy.c
++ #ifdef __dietlibc__
++ LIBC=dietlibc
++ #endif
++EOF
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++ exit ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+@@ -882,78 +914,34 @@ EOF
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- mips:Linux:*:*)
-+ mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #undef CPU
- #undef mips
- #undef mipsel
-+ #undef ${UNAME_MACHINE}
-+ #undef ${UNAME_MACHINE}el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mipsel
-+ CPU=${UNAME_MACHINE}el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+- #else
+- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips
- #else
- CPU=
@@ -3237,33 +3338,99 @@
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- mips64:Linux:*:*)
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #undef CPU
++ mips:Linux:*:* | mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
- #undef mips64
- #undef mips64el
-- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++ #undef ${UNAME_MACHINE}
++ #undef ${UNAME_MACHINE}el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mips64el
-- #else
-- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
++ CPU=${UNAME_MACHINE}el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips64
+ CPU=${UNAME_MACHINE}
#else
CPU=
#endif
-@@ -947,7 +927,7 @@
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
+ #endif
+ EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^CPU/{
+- s: ::g
+- p
+- }'`"
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ or32:Linux:*:*)
+ echo or32-unknown-linux-gnu
+ exit ;;
+- ppc:Linux:*:*)
+- echo powerpc-unknown-linux-gnu
+- exit ;;
+- ppc64:Linux:*:*)
+- echo powerpc64-unknown-linux-gnu
+- exit ;;
+- alpha:Linux:*:*)
+- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+- EV5) UNAME_MACHINE=alphaev5 ;;
+- EV56) UNAME_MACHINE=alphaev56 ;;
+- PCA56) UNAME_MACHINE=alphapca56 ;;
+- PCA57) UNAME_MACHINE=alphapca56 ;;
+- EV6) UNAME_MACHINE=alphaev6 ;;
+- EV67) UNAME_MACHINE=alphaev67 ;;
+- EV68*) UNAME_MACHINE=alphaev68 ;;
+- esac
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+ objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+- exit ;;
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
exit ;;
-@@ -1001,14 +981,6 @@
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
++ parisc64:Linux:*:* | hppa64:Linux:*:*)
++ echo hppa64-unknown-linux-gnu
++ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -962,8 +950,11 @@ EOF
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit ;;
+- parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-unknown-linux-gnu
++ ppc64:Linux:*:*)
++ echo powerpc64-unknown-linux-gnu
++ exit ;;
++ ppc:Linux:*:*)
++ echo powerpc-unknown-linux-gnu
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+@@ -986,66 +977,6 @@ EOF
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+- i*86:Linux:*:*)
+- # The BFD linker knows what the default object file format is, so
+- # first see if it will tell us. cd to the root directory to prevent
+- # problems with other programs or directories called `ld' in the path.
+- # Set LC_ALL=C to ensure ld outputs messages in English.
+- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+- | sed -ne '/supported targets:/!d
+- s/[ ][ ]*/ /g
+- s/.*supported targets: *//
+- s/ .*//
+- p'`
+- case "$ld_supported_targets" in
+- elf32-i386)
+- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+- ;;
- a.out-i386-linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit ;;
@@ -3272,10 +3439,47 @@
- # one that does not give us useful --help.
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
-@@ -1074,7 +1046,7 @@
+- esac
+- # Determine whether the default compiler is a.out or elf
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #include <features.h>
+- #ifdef __ELF__
+- # ifdef __GLIBC__
+- # if __GLIBC__ >= 2
+- LIBC=gnu
+- # else
+- LIBC=gnulibc1
+- # endif
+- # else
+- LIBC=gnulibc1
+- # endif
+- #else
+- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+- LIBC=gnu
+- #else
+- LIBC=gnuaout
+- #endif
+- #endif
+- #ifdef __dietlibc__
+- LIBC=dietlibc
+- #endif
+-EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^LIBC/{
+- s: ::g
+- p
+- }'`"
+- test x"${LIBC}" != x && {
+- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+- exit
+- }
+- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+- ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+@@ -1074,7 +1005,7 @@ EOF
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
@@ -3284,7 +3488,7 @@
echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
-@@ -1182,7 +1154,7 @@
+@@ -1182,7 +1113,7 @@ EOF
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
@@ -3293,10 +3497,27 @@
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
-Index: quilt-bEU2iR/config.h.in
+@@ -1275,6 +1206,16 @@ EOF
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
++ i386)
++ eval $set_cc_for_build
++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_64BIT_ARCH >/dev/null
++ then
++ UNAME_PROCESSOR="x86_64"
++ fi
++ fi ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+Index: nautilus-2.28.4/config.h.in
===================================================================
---- quilt-bEU2iR.orig/config.h.in 2009-12-15 10:12:56.000000000 +0100
-+++ quilt-bEU2iR/config.h.in 2009-12-15 14:38:10.000000000 +0100
+--- nautilus-2.28.4.orig/config.h.in 2010-04-09 01:58:09.050715407 +0200
++++ nautilus-2.28.4/config.h.in 2010-04-09 01:58:59.554215624 +0200
@@ -160,6 +160,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -3307,10 +3528,10 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-Index: quilt-bEU2iR/configure
+Index: nautilus-2.28.4/configure
===================================================================
---- quilt-bEU2iR.orig/configure 2009-12-15 10:12:55.000000000 +0100
-+++ quilt-bEU2iR/configure 2009-12-15 14:38:40.000000000 +0100
+--- nautilus-2.28.4.orig/configure 2010-04-09 01:58:09.038719539 +0200
++++ nautilus-2.28.4/configure 2010-04-09 01:59:20.086712160 +0200
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -3342,7 +3563,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
@@ -3371,7 +3592,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
@@ -3386,7 +3607,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;
@@ -3395,7 +3616,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
@@ -3409,7 +3630,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.
@@ -3428,7 +3649,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
@@ -3449,7 +3670,7 @@
done
PS1='$ '
PS2='> '
-@@ -133,330 +132,301 @@
+@@ -133,330 +132,301 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
@@ -4027,7 +4248,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" ||
@@ -4037,7 +4258,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
}
@@ -4072,7 +4293,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
@@ -4081,7 +4302,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
@@ -4094,7 +4315,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -573,7 +531,6 @@
+@@ -573,7 +531,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
@@ -4102,7 +4323,7 @@
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
-@@ -722,7 +679,8 @@
+@@ -722,7 +679,8 @@ fi
@@ -4112,7 +4333,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=
@@ -4120,7 +4341,7 @@
# Identity of this package.
PACKAGE_NAME='nautilus'
-@@ -748,6 +705,7 @@
+@@ -748,6 +705,7 @@ PACKAGE_TARNAME='nautilus'
PACKAGE_VERSION='2.28.4'
PACKAGE_STRING='nautilus 2.28.4'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus'
@@ -4128,7 +4349,7 @@
ac_unique_file="src"
# Factoring default headers for most tests.
-@@ -1016,6 +974,7 @@
+@@ -1016,6 +974,7 @@ bindir
program_transform_name
prefix
exec_prefix
@@ -4136,7 +4357,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1184,8 +1143,7 @@
+@@ -1184,8 +1143,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 &&
@@ -4146,7 +4367,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1211,8 +1169,7 @@
+@@ -1211,8 +1169,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 &&
@@ -4156,7 +4377,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1416,8 +1373,7 @@
+@@ -1416,8 +1373,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 &&
@@ -4166,7 +4387,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1433,8 +1389,7 @@
+@@ -1433,8 +1389,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 &&
@@ -4176,7 +4397,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1464,17 +1419,17 @@
+@@ -1464,17 +1419,17 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -4200,7 +4421,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1491,15 +1446,13 @@
+@@ -1491,15 +1446,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -4218,7 +4439,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1522,8 +1475,7 @@
+@@ -1522,8 +1475,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -4228,7 +4449,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1553,11 +1505,9 @@
+@@ -1553,11 +1505,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 .` ||
@@ -4242,7 +4463,7 @@
# Find the source files, if location was not specified.
-@@ -1596,13 +1546,11 @@
+@@ -1596,13 +1546,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -4258,7 +4479,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1720,9 +1668,9 @@
+@@ -1720,9 +1668,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
@@ -4271,7 +4492,7 @@
--enable-profiler Enable profiler
--disable-xmp build without xmp support
--disable-tracker build without tracker support
-@@ -1733,8 +1681,8 @@
+@@ -1733,8 +1681,8 @@ Optional Features:
--disable-schemas-install
Disable the schemas installation
--disable-update-mimedb disable the update-mime-database after install
@@ -4282,7 +4503,7 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-@@ -1755,7 +1703,7 @@
+@@ -1755,7 +1703,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>
@@ -4291,7 +4512,7 @@
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
-@@ -1846,21 +1794,378 @@
+@@ -1846,21 +1794,378 @@ test -n "$ac_init_help" && exit $ac_stat
if $ac_init_version; then
cat <<\_ACEOF
nautilus configure 2.28.4
@@ -4674,7 +4895,7 @@
$ $0 $@
-@@ -1896,8 +2201,8 @@
+@@ -1896,8 +2201,8 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4685,7 +4906,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1934,9 +2239,9 @@
+@@ -1934,9 +2239,9 @@ do
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -4697,7 +4918,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1952,13 +2257,13 @@
+@@ -1952,13 +2257,13 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -4714,7 +4935,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -1983,13 +2288,13 @@
+@@ -1983,13 +2288,13 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -4730,7 +4951,7 @@
esac ;;
esac
done
-@@ -2061,39 +2366,41 @@
+@@ -2061,39 +2366,41 @@ _ASBOX
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -4777,7 +4998,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2111,8 +2418,8 @@
+@@ -2111,8 +2418,8 @@ fi
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -4788,7 +5009,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2120,10 +2427,10 @@
+@@ -2120,10 +2427,10 @@ $as_echo "$as_me: loading site script $a
done
if test -r "$cache_file"; then
@@ -4803,7 +5024,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2131,7 +2438,7 @@
+@@ -2131,7 +2438,7 @@ $as_echo "$as_me: loading cache $cache_f
esac
fi
else
@@ -4812,7 +5033,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2146,11 +2453,11 @@
+@@ -2146,11 +2453,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,)
@@ -4826,7 +5047,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2160,17 +2467,17 @@
+@@ -2160,17 +2467,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
@@ -4848,7 +5069,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2182,43 +2489,20 @@
+@@ -2182,43 +2489,20 @@ $as_echo "$as_me: current value: \`$ac
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -4899,7 +5120,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2238,24 +2522,16 @@
+@@ -2238,24 +2522,16 @@ am__api_version='1.11'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -4932,7 +5153,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2281,10 +2557,10 @@
+@@ -2281,10 +2557,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.
@@ -4945,7 +5166,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2292,11 +2568,11 @@
+@@ -2292,11 +2568,11 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4961,7 +5182,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2333,7 +2609,7 @@
+@@ -2333,7 +2609,7 @@ case $as_dir/ in
;;
esac
@@ -4970,7 +5191,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2349,7 +2625,7 @@
+@@ -2349,7 +2625,7 @@ fi
INSTALL=$ac_install_sh
fi
fi
@@ -4979,7 +5200,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2360,7 +2636,7 @@
+@@ -2360,7 +2636,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -4988,7 +5209,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2371,15 +2647,11 @@
+@@ -2371,15 +2647,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -5006,7 +5227,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2401,11 +2673,8 @@
+@@ -2401,11 +2673,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".
@@ -5020,7 +5241,7 @@
fi
test "$2" = conftest.file
-@@ -2414,13 +2683,10 @@
+@@ -2414,13 +2683,10 @@ then
# Ok.
:
else
@@ -5037,7 +5258,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2448,7 +2714,7 @@
+@@ -2448,7 +2714,7 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -5046,7 +5267,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2469,9 +2735,9 @@
+@@ -2469,9 +2735,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
@@ -5058,7 +5279,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2482,24 +2748,24 @@
+@@ -2482,24 +2748,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5088,7 +5309,7 @@
$as_echo "no" >&6; }
fi
-@@ -2509,9 +2775,9 @@
+@@ -2509,9 +2775,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
@@ -5100,7 +5321,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2522,24 +2788,24 @@
+@@ -2522,24 +2788,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5130,7 +5351,7 @@
$as_echo "no" >&6; }
fi
-@@ -2548,7 +2814,7 @@
+@@ -2548,7 +2814,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5139,7 +5360,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2561,10 +2827,10 @@
+@@ -2561,10 +2827,10 @@ fi
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -5152,7 +5373,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2572,7 +2838,7 @@
+@@ -2572,7 +2838,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5161,7 +5382,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2584,11 +2850,12 @@
+@@ -2584,11 +2850,12 @@ do
esac
done
done
@@ -5175,7 +5396,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2596,11 +2863,10 @@
+@@ -2596,11 +2863,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.
@@ -5188,7 +5409,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2613,9 +2879,9 @@
+@@ -2613,9 +2879,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
@@ -5200,7 +5421,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2626,24 +2892,24 @@
+@@ -2626,24 +2892,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5230,7 +5451,7 @@
$as_echo "no" >&6; }
fi
-@@ -2651,11 +2917,11 @@
+@@ -2651,11 +2917,11 @@ fi
test -n "$AWK" && break
done
@@ -5244,7 +5465,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2673,11 +2939,11 @@
+@@ -2673,11 +2939,11 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -5258,7 +5479,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2697,9 +2963,7 @@
+@@ -2697,9 +2963,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
@@ -5269,7 +5490,7 @@
fi
fi
-@@ -2750,7 +3014,7 @@
+@@ -2750,7 +3014,7 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma
AMTAR=${AMTAR-"${am_missing_run}tar"}
@@ -5278,7 +5499,7 @@
$as_echo_n "checking how to create a ustar tar archive... " >&6; }
# Loop over all known methods to create a tar archive until one works.
_am_tools='gnutar plaintar pax cpio none'
-@@ -2823,13 +3087,13 @@
+@@ -2823,13 +3087,13 @@ do
done
rm -rf conftest.dir
@@ -5294,7 +5515,7 @@
$as_echo "$am_cv_prog_tar_ustar" >&6; }
-@@ -2837,16 +3101,16 @@
+@@ -2837,16 +3101,16 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
@@ -5314,7 +5535,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2889,7 +3153,7 @@
+@@ -2889,7 +3153,7 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -5323,7 +5544,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -2917,12 +3181,12 @@
+@@ -2917,12 +3181,12 @@ if test "$am__include" = "#"; then
fi
@@ -5338,7 +5559,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -2947,9 +3211,9 @@
+@@ -2947,9 +3211,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
@@ -5350,7 +5571,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2960,24 +3224,24 @@
+@@ -2960,24 +3224,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5380,7 +5601,7 @@
$as_echo "no" >&6; }
fi
-@@ -2987,9 +3251,9 @@
+@@ -2987,9 +3251,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
@@ -5392,7 +5613,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3000,24 +3264,24 @@
+@@ -3000,24 +3264,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5422,7 +5643,7 @@
$as_echo "no" >&6; }
fi
-@@ -3026,7 +3290,7 @@
+@@ -3026,7 +3290,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5431,7 +5652,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3040,9 +3304,9 @@
+@@ -3040,9 +3304,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
@@ -5443,7 +5664,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3053,24 +3317,24 @@
+@@ -3053,24 +3317,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5473,7 +5694,7 @@
$as_echo "no" >&6; }
fi
-@@ -3080,9 +3344,9 @@
+@@ -3080,9 +3344,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
@@ -5485,7 +5706,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3094,18 +3358,18 @@
+@@ -3094,18 +3358,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5507,7 +5728,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3124,10 +3388,10 @@
+@@ -3124,10 +3388,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -5520,7 +5741,7 @@
$as_echo "no" >&6; }
fi
-@@ -3139,9 +3403,9 @@
+@@ -3139,9 +3403,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
@@ -5532,7 +5753,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3152,24 +3416,24 @@
+@@ -3152,24 +3416,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5562,7 +5783,7 @@
$as_echo "no" >&6; }
fi
-@@ -3183,9 +3447,9 @@
+@@ -3183,9 +3447,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
@@ -5574,7 +5795,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3196,24 +3460,24 @@
+@@ -3196,24 +3460,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5604,7 +5825,7 @@
$as_echo "no" >&6; }
fi
-@@ -3226,7 +3490,7 @@
+@@ -3226,7 +3490,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5613,7 +5834,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3237,57 +3501,37 @@
+@@ -3237,57 +3501,37 @@ fi
fi
@@ -5691,7 +5912,7 @@
/* end confdefs.h. */
int
-@@ -3303,8 +3547,8 @@
+@@ -3303,8 +3547,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.
@@ -5702,7 +5923,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3320,17 +3564,17 @@
+@@ -3320,17 +3564,17 @@ do
done
rm -f $ac_rmfiles
@@ -5725,7 +5946,7 @@
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3347,7 +3591,7 @@
+@@ -3347,7 +3591,7 @@ do
# certainly right.
break;;
*.* )
@@ -5734,7 +5955,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3366,84 +3610,42 @@
+@@ -3366,84 +3610,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
else
ac_file=''
fi
@@ -5840,7 +6061,7 @@
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3458,32 +3660,83 @@
+@@ -3458,32 +3660,83 @@ for ac_file in conftest.exe conftest con
esac
done
else
@@ -5940,7 +6161,7 @@
/* end confdefs.h. */
int
-@@ -3495,17 +3748,17 @@
+@@ -3495,17 +3748,17 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -5963,7 +6184,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3518,31 +3771,23 @@
+@@ -3518,31 +3771,23 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -6002,7 +6223,7 @@
/* end confdefs.h. */
int
-@@ -3556,37 +3801,16 @@
+@@ -3556,37 +3801,16 @@ main ()
return 0;
}
_ACEOF
@@ -6043,7 +6264,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3595,20 +3819,16 @@
+@@ -3595,20 +3819,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -6067,7 +6288,7 @@
/* end confdefs.h. */
int
-@@ -3619,35 +3839,11 @@
+@@ -3619,35 +3839,11 @@ main ()
return 0;
}
_ACEOF
@@ -6106,7 +6327,7 @@
/* end confdefs.h. */
int
-@@ -3658,36 +3854,12 @@
+@@ -3658,36 +3854,12 @@ main ()
return 0;
}
_ACEOF
@@ -6147,7 +6368,7 @@
/* end confdefs.h. */
int
-@@ -3698,42 +3870,17 @@
+@@ -3698,42 +3870,17 @@ main ()
return 0;
}
_ACEOF
@@ -6192,7 +6413,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3750,18 +3897,14 @@
+@@ -3750,18 +3897,14 @@ else
CFLAGS=
fi
fi
@@ -6214,7 +6435,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3818,32 +3961,9 @@
+@@ -3818,32 +3961,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -6248,7 +6469,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3854,17 +3974,19 @@
+@@ -3854,17 +3974,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -6271,7 +6492,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3874,9 +3996,9 @@
+@@ -3874,9 +3996,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -6283,7 +6504,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3984,7 +4106,7 @@
+@@ -3984,7 +4106,7 @@ else
fi
fi
@@ -6292,7 +6513,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4005,14 +4127,14 @@
+@@ -4005,14 +4127,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
@@ -6309,7 +6530,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -4027,11 +4149,7 @@
+@@ -4027,11 +4149,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.
@@ -6322,7 +6543,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4040,78 +4158,34 @@
+@@ -4040,78 +4158,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -6406,7 +6627,7 @@
break
fi
-@@ -4123,7 +4197,7 @@
+@@ -4123,7 +4197,7 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
@@ -6415,7 +6636,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -4134,11 +4208,7 @@
+@@ -4134,11 +4208,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.
@@ -6428,7 +6649,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4147,87 +4217,40 @@
+@@ -4147,87 +4217,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -6525,7 +6746,7 @@
fi
ac_ext=c
-@@ -4237,9 +4260,9 @@
+@@ -4237,9 +4260,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -6537,7 +6758,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4250,7 +4273,7 @@
+@@ -4250,7 +4273,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6546,7 +6767,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -4270,7 +4293,7 @@
+@@ -4270,7 +4293,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
@@ -6555,7 +6776,7 @@
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -4285,26 +4308,24 @@
+@@ -4285,26 +4308,24 @@ esac
$ac_path_GREP_found && break 3
done
done
@@ -6587,7 +6808,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4318,7 +4339,7 @@
+@@ -4318,7 +4339,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6596,7 +6817,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -4338,7 +4359,7 @@
+@@ -4338,7 +4359,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
@@ -6605,7 +6826,7 @@
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4353,12 +4374,10 @@
+@@ -4353,12 +4374,10 @@ esac
$ac_path_EGREP_found && break 3
done
done
@@ -6620,7 +6841,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4366,21 +4385,17 @@
+@@ -4366,21 +4385,17 @@ fi
fi
fi
@@ -6646,7 +6867,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -4395,48 +4410,23 @@
+@@ -4395,48 +4410,23 @@ main ()
return 0;
}
_ACEOF
@@ -6700,7 +6921,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4446,18 +4436,14 @@
+@@ -4446,18 +4436,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -6722,7 +6943,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4467,14 +4453,10 @@
+@@ -4467,14 +4453,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.
@@ -6739,7 +6960,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -4501,118 +4483,34 @@
+@@ -4501,118 +4483,34 @@ main ()
return 0;
}
_ACEOF
@@ -6871,7 +7092,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -4622,19 +4520,14 @@
+@@ -4622,19 +4520,14 @@ fi
done
@@ -6894,7 +7115,7 @@
/* end confdefs.h. */
#ifndef __APPLE_CC__
not a universal capable compiler
-@@ -4642,46 +4535,34 @@
+@@ -4642,46 +4535,34 @@ cat >>conftest.$ac_ext <<_ACEOF
typedef int dummy;
_ACEOF
@@ -6963,7 +7184,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-@@ -4699,30 +4580,9 @@
+@@ -4699,30 +4580,9 @@ main ()
return 0;
}
_ACEOF
@@ -6996,7 +7217,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-@@ -4738,49 +4598,18 @@
+@@ -4738,49 +4598,18 @@ main ()
return 0;
}
_ACEOF
@@ -7049,7 +7270,7 @@
/* end confdefs.h. */
#include <limits.h>
-@@ -4795,30 +4624,9 @@
+@@ -4795,30 +4624,9 @@ main ()
return 0;
}
_ACEOF
@@ -7082,7 +7303,7 @@
/* end confdefs.h. */
#include <limits.h>
-@@ -4833,51 +4641,20 @@
+@@ -4833,51 +4641,20 @@ main ()
return 0;
}
_ACEOF
@@ -7138,7 +7359,7 @@
/* end confdefs.h. */
short int ascii_mm[] =
{ 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-@@ -4903,24 +4680,7 @@
+@@ -4903,24 +4680,7 @@ return use_ascii (foo) == use_ebcdic (fo
return 0;
}
_ACEOF
@@ -7164,7 +7385,7 @@
if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
ac_cv_c_bigendian=yes
fi
-@@ -4932,20 +4692,10 @@
+@@ -4932,20 +4692,10 @@ $as_echo "$ac_try_echo") >&5
ac_cv_c_bigendian=unknown
fi
fi
@@ -7186,7 +7407,7 @@
/* end confdefs.h. */
$ac_includes_default
int
-@@ -4965,79 +4715,41 @@
+@@ -4965,79 +4715,41 @@ main ()
return 0;
}
_ACEOF
@@ -7278,7 +7499,7 @@
/* end confdefs.h. */
int
-@@ -5097,41 +4809,18 @@
+@@ -5097,41 +4809,18 @@ main ()
return 0;
}
_ACEOF
@@ -7324,7 +7545,7 @@
fi
-@@ -5143,9 +4832,9 @@
+@@ -5143,9 +4832,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
@@ -7336,7 +7557,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5156,24 +4845,24 @@
+@@ -5156,24 +4845,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7366,7 +7587,7 @@
$as_echo "no" >&6; }
fi
-@@ -5183,9 +4872,9 @@
+@@ -5183,9 +4872,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
@@ -7378,7 +7599,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -5196,24 +4885,24 @@
+@@ -5196,24 +4885,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7408,7 +7629,7 @@
$as_echo "no" >&6; }
fi
-@@ -5222,7 +4911,7 @@
+@@ -5222,7 +4911,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7417,7 +7638,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5236,9 +4925,9 @@
+@@ -5236,9 +4925,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
@@ -7429,7 +7650,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5249,24 +4938,24 @@
+@@ -5249,24 +4938,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7459,7 +7680,7 @@
$as_echo "no" >&6; }
fi
-@@ -5276,9 +4965,9 @@
+@@ -5276,9 +4965,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
@@ -7471,7 +7692,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5290,18 +4979,18 @@
+@@ -5290,18 +4979,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7493,7 +7714,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -5320,10 +5009,10 @@
+@@ -5320,10 +5009,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7506,7 +7727,7 @@
$as_echo "no" >&6; }
fi
-@@ -5335,9 +5024,9 @@
+@@ -5335,9 +5024,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
@@ -7518,7 +7739,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5348,24 +5037,24 @@
+@@ -5348,24 +5037,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7548,7 +7769,7 @@
$as_echo "no" >&6; }
fi
-@@ -5379,9 +5068,9 @@
+@@ -5379,9 +5068,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
@@ -7560,7 +7781,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -5392,24 +5081,24 @@
+@@ -5392,24 +5081,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7590,7 +7811,7 @@
$as_echo "no" >&6; }
fi
-@@ -5422,7 +5111,7 @@
+@@ -5422,7 +5111,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7599,7 +7820,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5433,62 +5122,42 @@
+@@ -5433,62 +5122,42 @@ fi
fi
@@ -7684,7 +7905,7 @@
/* end confdefs.h. */
int
-@@ -5502,37 +5171,16 @@
+@@ -5502,37 +5171,16 @@ main ()
return 0;
}
_ACEOF
@@ -7725,7 +7946,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -5541,20 +5189,16 @@
+@@ -5541,20 +5189,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -7749,7 +7970,7 @@
/* end confdefs.h. */
int
-@@ -5565,35 +5209,11 @@
+@@ -5565,35 +5209,11 @@ main ()
return 0;
}
_ACEOF
@@ -7788,7 +8009,7 @@
/* end confdefs.h. */
int
-@@ -5604,36 +5224,12 @@
+@@ -5604,36 +5224,12 @@ main ()
return 0;
}
_ACEOF
@@ -7829,7 +8050,7 @@
/* end confdefs.h. */
int
-@@ -5644,42 +5240,17 @@
+@@ -5644,42 +5240,17 @@ main ()
return 0;
}
_ACEOF
@@ -7874,7 +8095,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -5696,18 +5267,14 @@
+@@ -5696,18 +5267,14 @@ else
CFLAGS=
fi
fi
@@ -7896,7 +8117,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -5764,32 +5331,9 @@
+@@ -5764,32 +5331,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -7930,7 +8151,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -5800,17 +5344,19 @@
+@@ -5800,17 +5344,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -7953,7 +8174,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5820,9 +5366,9 @@
+@@ -5820,9 +5366,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -7965,7 +8186,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5930,7 +5476,7 @@
+@@ -5930,7 +5476,7 @@ else
fi
fi
@@ -7974,7 +8195,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -5950,14 +5496,14 @@
+@@ -5950,14 +5496,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
@@ -7991,7 +8212,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -5972,11 +5518,7 @@
+@@ -5972,11 +5518,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.
@@ -8004,7 +8225,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5985,78 +5527,34 @@
+@@ -5985,78 +5527,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -8088,7 +8309,7 @@
break
fi
-@@ -6068,7 +5566,7 @@
+@@ -6068,7 +5566,7 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
@@ -8097,7 +8318,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -6079,11 +5577,7 @@
+@@ -6079,11 +5577,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.
@@ -8110,7 +8331,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -6092,87 +5586,40 @@
+@@ -6092,87 +5586,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -8207,7 +8428,7 @@
fi
ac_ext=c
-@@ -6181,115 +5628,23 @@
+@@ -6181,115 +5628,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
@@ -8328,7 +8549,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -6307,17 +5662,17 @@
+@@ -6307,17 +5662,17 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -8349,7 +8570,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -6349,35 +5704,27 @@
+@@ -6349,35 +5704,27 @@ fi
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -8392,7 +8613,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -6393,28 +5740,24 @@
+@@ -6393,28 +5740,24 @@ IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -8426,7 +8647,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -6437,9 +5780,9 @@
+@@ -6437,9 +5780,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
@@ -8438,7 +8659,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AS"; then
-@@ -6450,24 +5793,24 @@
+@@ -6450,24 +5793,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8468,7 +8689,7 @@
$as_echo "no" >&6; }
fi
-@@ -6477,9 +5820,9 @@
+@@ -6477,9 +5820,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
@@ -8480,7 +8701,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AS"; then
-@@ -6490,24 +5833,24 @@
+@@ -6490,24 +5833,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8510,7 +8731,7 @@
$as_echo "no" >&6; }
fi
-@@ -6516,7 +5859,7 @@
+@@ -6516,7 +5859,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8519,7 +8740,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6529,9 +5872,9 @@
+@@ -6529,9 +5872,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
@@ -8531,7 +8752,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DLLTOOL"; then
-@@ -6542,24 +5885,24 @@
+@@ -6542,24 +5885,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8561,7 +8782,7 @@
$as_echo "no" >&6; }
fi
-@@ -6569,9 +5912,9 @@
+@@ -6569,9 +5912,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
@@ -8573,7 +8794,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DLLTOOL"; then
-@@ -6582,24 +5925,24 @@
+@@ -6582,24 +5925,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8603,7 +8824,7 @@
$as_echo "no" >&6; }
fi
-@@ -6608,7 +5951,7 @@
+@@ -6608,7 +5951,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8612,7 +8833,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6621,9 +5964,9 @@
+@@ -6621,9 +5964,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
@@ -8624,7 +8845,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -6634,24 +5977,24 @@
+@@ -6634,24 +5977,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8654,7 +8875,7 @@
$as_echo "no" >&6; }
fi
-@@ -6661,9 +6004,9 @@
+@@ -6661,9 +6004,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
@@ -8666,7 +8887,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -6674,24 +6017,24 @@
+@@ -6674,24 +6017,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8696,7 +8917,7 @@
$as_echo "no" >&6; }
fi
-@@ -6700,7 +6043,7 @@
+@@ -6700,7 +6043,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8705,7 +8926,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6735,14 +6078,14 @@
+@@ -6735,14 +6078,14 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
case `pwd` in
*\ * | *\ *)
@@ -8723,7 +8944,7 @@
-@@ -6758,9 +6101,9 @@
+@@ -6758,9 +6101,9 @@ macro_revision='1.3012'
ltmain="$ac_aux_dir/ltmain.sh"
@@ -8735,7 +8956,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -6768,7 +6111,7 @@
+@@ -6768,7 +6111,7 @@ else
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -8744,7 +8965,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -6777,7 +6120,7 @@
+@@ -6777,7 +6120,7 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8753,7 +8974,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -6797,7 +6140,7 @@
+@@ -6797,7 +6140,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
@@ -8762,7 +8983,7 @@
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
-@@ -6812,19 +6155,17 @@
+@@ -6812,19 +6155,17 @@ esac
$ac_path_SED_found && break 3
done
done
@@ -8785,7 +9006,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -6842,9 +6183,9 @@
+@@ -6842,9 +6183,9 @@ Xsed="$SED -e 1s/^X//"
@@ -8797,7 +9018,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -6858,7 +6199,7 @@
+@@ -6858,7 +6199,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8806,7 +9027,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -6878,7 +6219,7 @@
+@@ -6878,7 +6219,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
@@ -8815,7 +9036,7 @@
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -6893,12 +6234,10 @@
+@@ -6893,12 +6234,10 @@ esac
$ac_path_FGREP_found && break 3
done
done
@@ -8830,7 +9051,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -6906,7 +6245,7 @@
+@@ -6906,7 +6245,7 @@ fi
fi
fi
@@ -8839,7 +9060,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -6932,7 +6271,7 @@
+@@ -6932,7 +6271,7 @@ test -z "$GREP" && GREP=grep
# Check whether --with-gnu-ld was given.
@@ -8848,7 +9069,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -6941,7 +6280,7 @@
+@@ -6941,7 +6280,7 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -8857,7 +9078,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -6971,13 +6310,13 @@
+@@ -6971,13 +6310,13 @@ $as_echo_n "checking for ld used by $CC.
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -8874,7 +9095,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -7008,18 +6347,16 @@
+@@ -7008,18 +6347,16 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -8898,7 +9119,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -7032,7 +6369,7 @@
+@@ -7032,7 +6369,7 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
@@ -8907,7 +9128,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -7044,9 +6381,9 @@
+@@ -7044,9 +6381,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -8919,7 +9140,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -7093,7 +6430,7 @@
+@@ -7093,7 +6430,7 @@ else
: ${lt_cv_path_NM=no}
fi
fi
@@ -8928,7 +9149,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -7104,9 +6441,9 @@
+@@ -7104,9 +6441,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
@@ -8940,7 +9161,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -7117,24 +6454,24 @@
+@@ -7117,24 +6454,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8970,7 +9191,7 @@
$as_echo "no" >&6; }
fi
-@@ -7148,9 +6485,9 @@
+@@ -7148,9 +6485,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
@@ -8982,7 +9203,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -7161,24 +6498,24 @@
+@@ -7161,24 +6498,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9012,7 +9233,7 @@
$as_echo "no" >&6; }
fi
-@@ -7191,7 +6528,7 @@
+@@ -7191,7 +6528,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9021,7 +9242,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7211,33 +6548,33 @@
+@@ -7211,33 +6548,33 @@ test -z "$NM" && NM=nm
@@ -9063,7 +9284,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -7355,10 +6692,10 @@
+@@ -7355,10 +6692,10 @@ else
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -9076,7 +9297,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -7372,7 +6709,7 @@
+@@ -7372,7 +6709,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -9085,7 +9306,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -7382,17 +6719,17 @@
+@@ -7382,17 +6719,17 @@ xsi_shell=no
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -9106,7 +9327,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -7427,14 +6764,14 @@
+@@ -7427,14 +6764,14 @@ esac
@@ -9124,7 +9345,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -7463,9 +6800,9 @@
+@@ -7463,9 +6800,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
@@ -9136,7 +9357,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -7476,24 +6813,24 @@
+@@ -7476,24 +6813,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9166,7 +9387,7 @@
$as_echo "no" >&6; }
fi
-@@ -7503,9 +6840,9 @@
+@@ -7503,9 +6840,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
@@ -9178,7 +9399,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -7516,24 +6853,24 @@
+@@ -7516,24 +6853,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9208,7 +9429,7 @@
$as_echo "no" >&6; }
fi
-@@ -7542,7 +6879,7 @@
+@@ -7542,7 +6879,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9217,7 +9438,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7559,9 +6896,9 @@
+@@ -7559,9 +6896,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
@@ -9229,7 +9450,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -7676,11 +7013,11 @@
+@@ -7676,11 +7013,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
@@ -9243,7 +9464,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -7755,7 +7092,7 @@
+@@ -7755,7 +7092,7 @@ tpf*)
esac
fi
@@ -9252,7 +9473,7 @@
$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -7775,9 +7112,9 @@
+@@ -7775,9 +7112,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
@@ -9264,7 +9485,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -7788,24 +7125,24 @@
+@@ -7788,24 +7125,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9294,7 +9515,7 @@
$as_echo "no" >&6; }
fi
-@@ -7815,9 +7152,9 @@
+@@ -7815,9 +7152,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
@@ -9306,7 +9527,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -7828,24 +7165,24 @@
+@@ -7828,24 +7165,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9336,7 +9557,7 @@
$as_echo "no" >&6; }
fi
-@@ -7854,7 +7191,7 @@
+@@ -7854,7 +7191,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9345,7 +9566,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7880,9 +7217,9 @@
+@@ -7880,9 +7217,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
@@ -9357,7 +9578,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -7893,24 +7230,24 @@
+@@ -7893,24 +7230,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9387,7 +9608,7 @@
$as_echo "no" >&6; }
fi
-@@ -7920,9 +7257,9 @@
+@@ -7920,9 +7257,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
@@ -9399,7 +9620,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -7933,24 +7270,24 @@
+@@ -7933,24 +7270,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9429,7 +9650,7 @@
$as_echo "no" >&6; }
fi
-@@ -7959,7 +7296,7 @@
+@@ -7959,7 +7296,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9438,7 +9659,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7979,9 +7316,9 @@
+@@ -7979,9 +7316,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
@@ -9450,7 +9671,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -7992,24 +7329,24 @@
+@@ -7992,24 +7329,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9480,7 +9701,7 @@
$as_echo "no" >&6; }
fi
-@@ -8019,9 +7356,9 @@
+@@ -8019,9 +7356,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
@@ -9492,7 +9713,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -8032,24 +7369,24 @@
+@@ -8032,24 +7369,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9522,7 +9743,7 @@
$as_echo "no" >&6; }
fi
-@@ -8058,7 +7395,7 @@
+@@ -8058,7 +7395,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9531,7 +9752,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8136,9 +7473,9 @@
+@@ -8136,9 +7473,9 @@ compiler=$CC
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -9543,7 +9764,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -8254,18 +7591,18 @@
+@@ -8254,18 +7591,18 @@ void nm_test_func(void){}
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -9568,7 +9789,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -8318,11 +7655,11 @@
+@@ -8318,11 +7655,11 @@ _LT_EOF
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -9583,7 +9804,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -8356,10 +7693,10 @@
+@@ -8356,10 +7693,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
@@ -9596,7 +9817,7 @@
$as_echo "ok" >&6; }
fi
-@@ -8385,7 +7722,7 @@
+@@ -8385,7 +7722,7 @@ fi
# Check whether --enable-libtool-lock was given.
@@ -9605,7 +9826,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -8397,11 +7734,11 @@
+@@ -8397,11 +7734,11 @@ case $host in
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9620,7 +9841,7 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -8415,12 +7752,12 @@
+@@ -8415,12 +7752,12 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -9637,7 +9858,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -8454,11 +7791,11 @@
+@@ -8454,11 +7791,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
@@ -9652,7 +9873,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -8507,9 +7844,9 @@
+@@ -8507,9 +7844,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"
@@ -9664,7 +9885,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -8518,11 +7855,7 @@
+@@ -8518,11 +7855,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
@@ -9677,7 +9898,7 @@
/* end confdefs.h. */
int
-@@ -8533,38 +7866,13 @@
+@@ -8533,38 +7866,13 @@ main ()
return 0;
}
_ACEOF
@@ -9720,7 +9941,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -8572,7 +7880,7 @@
+@@ -8572,7 +7880,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -9729,7 +9950,7 @@
$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -8582,11 +7890,11 @@
+@@ -8582,11 +7890,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9744,7 +9965,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -8612,9 +7920,9 @@
+@@ -8612,9 +7920,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
@@ -9756,7 +9977,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -8625,24 +7933,24 @@
+@@ -8625,24 +7933,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9786,7 +10007,7 @@
$as_echo "no" >&6; }
fi
-@@ -8652,9 +7960,9 @@
+@@ -8652,9 +7960,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
@@ -9798,7 +10019,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -8665,24 +7973,24 @@
+@@ -8665,24 +7973,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9828,7 +10049,7 @@
$as_echo "no" >&6; }
fi
-@@ -8691,7 +7999,7 @@
+@@ -8691,7 +7999,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9837,7 +10058,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8704,9 +8012,9 @@
+@@ -8704,9 +8012,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
@@ -9849,7 +10070,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -8717,24 +8025,24 @@
+@@ -8717,24 +8025,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9879,7 +10100,7 @@
$as_echo "no" >&6; }
fi
-@@ -8744,9 +8052,9 @@
+@@ -8744,9 +8052,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
@@ -9891,7 +10112,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -8757,24 +8065,24 @@
+@@ -8757,24 +8065,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9921,7 +10142,7 @@
$as_echo "no" >&6; }
fi
-@@ -8783,7 +8091,7 @@
+@@ -8783,7 +8091,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9930,7 +10151,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8796,9 +8104,9 @@
+@@ -8796,9 +8104,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
@@ -9942,7 +10163,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -8809,24 +8117,24 @@
+@@ -8809,24 +8117,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9972,7 +10193,7 @@
$as_echo "no" >&6; }
fi
-@@ -8836,9 +8144,9 @@
+@@ -8836,9 +8144,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
@@ -9984,7 +10205,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -8849,24 +8157,24 @@
+@@ -8849,24 +8157,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10014,7 +10235,7 @@
$as_echo "no" >&6; }
fi
-@@ -8875,7 +8183,7 @@
+@@ -8875,7 +8183,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10023,7 +10244,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8888,9 +8196,9 @@
+@@ -8888,9 +8196,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
@@ -10035,7 +10256,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -8901,24 +8209,24 @@
+@@ -8901,24 +8209,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10065,7 +10286,7 @@
$as_echo "no" >&6; }
fi
-@@ -8928,9 +8236,9 @@
+@@ -8928,9 +8236,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
@@ -10077,7 +10298,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -8941,24 +8249,24 @@
+@@ -8941,24 +8249,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10107,7 +10328,7 @@
$as_echo "no" >&6; }
fi
-@@ -8967,7 +8275,7 @@
+@@ -8967,7 +8275,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10116,7 +10337,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8980,9 +8288,9 @@
+@@ -8980,9 +8288,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
@@ -10128,7 +10349,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -8993,24 +8301,24 @@
+@@ -8993,24 +8301,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10158,7 +10379,7 @@
$as_echo "no" >&6; }
fi
-@@ -9020,9 +8328,9 @@
+@@ -9020,9 +8328,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
@@ -10170,7 +10391,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -9033,24 +8341,24 @@
+@@ -9033,24 +8341,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10200,7 +10421,7 @@
$as_echo "no" >&6; }
fi
-@@ -9059,7 +8367,7 @@
+@@ -9059,7 +8367,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10209,7 +10430,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9095,9 +8403,9 @@
+@@ -9095,9 +8403,9 @@ fi
@@ -10221,7 +10442,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -9122,22 +8430,18 @@
+@@ -9122,22 +8430,18 @@ else
rm -f conftest.*
fi
fi
@@ -10248,7 +10469,7 @@
/* end confdefs.h. */
int
-@@ -9148,42 +8452,17 @@
+@@ -9148,42 +8452,17 @@ main ()
return 0;
}
_ACEOF
@@ -10296,7 +10517,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -9220,62 +8499,13 @@
+@@ -9220,62 +8499,13 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
;;
esac
@@ -10364,7 +10585,7 @@
_ACEOF
fi
-@@ -9293,7 +8523,7 @@
+@@ -9293,7 +8523,7 @@ done
# Check whether --enable-shared was given.
@@ -10373,7 +10594,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -9326,7 +8556,7 @@
+@@ -9326,7 +8556,7 @@ fi
# Check whether --with-pic was given.
@@ -10382,7 +10603,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -9342,7 +8572,7 @@
+@@ -9342,7 +8572,7 @@ test -z "$pic_mode" && pic_mode=default
# Check whether --enable-fast-install was given.
@@ -10391,7 +10612,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -9423,9 +8653,9 @@
+@@ -9423,9 +8653,9 @@ if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
fi
@@ -10403,7 +10624,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -9438,7 +8668,7 @@
+@@ -9438,7 +8668,7 @@ else
fi
rmdir .libs 2>/dev/null
fi
@@ -10412,7 +10633,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -9531,9 +8761,9 @@
+@@ -9531,9 +8761,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -10424,7 +10645,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9584,10 +8814,10 @@
+@@ -9584,10 +8814,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -10437,7 +10658,7 @@
$as_echo "no" >&6; }
fi
-@@ -9597,9 +8827,9 @@
+@@ -9597,9 +8827,9 @@ fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -10449,7 +10670,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9650,10 +8880,10 @@
+@@ -9650,10 +8880,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -10462,7 +10683,7 @@
$as_echo "no" >&6; }
fi
-@@ -9734,9 +8964,9 @@
+@@ -9734,9 +8964,9 @@ lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -10474,7 +10695,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9752,11 +8982,11 @@
+@@ -9752,11 +8982,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -10488,7 +10709,7 @@
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9769,7 +8999,7 @@
+@@ -9769,7 +8999,7 @@ else
$RM conftest*
fi
@@ -10497,7 +10718,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -9789,7 +9019,7 @@
+@@ -9789,7 +9019,7 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -10506,7 +10727,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -9921,7 +9151,7 @@
+@@ -9921,7 +9151,7 @@ $as_echo_n "checking for $compiler optio
lt_prog_compiler_static='-non_shared'
;;
@@ -10515,7 +10736,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -10061,7 +9291,7 @@
+@@ -10061,7 +9291,7 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -10524,7 +10745,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -10073,9 +9303,9 @@
+@@ -10073,9 +9303,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
@@ -10536,7 +10757,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -10091,11 +9321,11 @@
+@@ -10091,11 +9321,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -10550,7 +10771,7 @@
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -10108,7 +9338,7 @@
+@@ -10108,7 +9338,7 @@ else
$RM conftest*
fi
@@ -10559,7 +10780,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -10132,9 +9362,9 @@
+@@ -10132,9 +9362,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\"
@@ -10571,7 +10792,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -10160,7 +9390,7 @@
+@@ -10160,7 +9390,7 @@ else
LDFLAGS="$save_LDFLAGS"
fi
@@ -10580,7 +10801,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -10175,9 +9405,9 @@
+@@ -10175,9 +9405,9 @@ fi
@@ -10592,7 +10813,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10196,11 +9426,11 @@
+@@ -10196,11 +9426,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -10606,7 +10827,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -10222,7 +9452,7 @@
+@@ -10222,7 +9452,7 @@ else
$RM conftest*
fi
@@ -10615,7 +10836,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10230,9 +9460,9 @@
+@@ -10230,9 +9460,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
@@ -10627,7 +10848,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10251,11 +9481,11 @@
+@@ -10251,11 +9481,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -10641,7 +10862,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -10277,7 +9507,7 @@
+@@ -10277,7 +9507,7 @@ else
$RM conftest*
fi
@@ -10650,7 +10871,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10286,7 +9516,7 @@
+@@ -10286,7 +9516,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
@@ -10659,7 +10880,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -10294,10 +9524,10 @@
+@@ -10294,10 +9524,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
@@ -10672,7 +10893,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -10310,7 +9540,7 @@
+@@ -10310,7 +9540,7 @@ fi
@@ -10681,7 +10902,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -10370,6 +9600,9 @@
+@@ -10370,6 +9600,9 @@ $as_echo_n "checking whether the $compil
openbsd*)
with_gnu_ld=no
;;
@@ -10691,7 +10912,7 @@
esac
ld_shlibs=yes
-@@ -10391,6 +9624,7 @@
+@@ -10391,6 +9624,7 @@ $as_echo_n "checking whether the $compil
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -10699,7 +10920,7 @@
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -10482,7 +9716,7 @@
+@@ -10482,7 +9716,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'
;;
@@ -10708,7 +10929,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -10552,7 +9786,7 @@
+@@ -10552,7 +9786,7 @@ _LT_EOF
fi
;;
@@ -10717,7 +10938,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10727,6 +9961,7 @@
+@@ -10727,6 +9961,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -10725,7 +10946,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10752,11 +9987,7 @@
+@@ -10752,11 +9987,7 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -10738,7 +10959,7 @@
/* end confdefs.h. */
int
-@@ -10767,27 +9998,7 @@
+@@ -10767,27 +9998,7 @@ main ()
return 0;
}
_ACEOF
@@ -10767,7 +10988,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10801,16 +10012,9 @@
+@@ -10801,16 +10012,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
@@ -10786,7 +11007,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10823,11 +10027,7 @@
+@@ -10823,11 +10027,7 @@ if test -z "$aix_libpath"; then aix_libp
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -10799,7 +11020,7 @@
/* end confdefs.h. */
int
-@@ -10838,27 +10038,7 @@
+@@ -10838,27 +10038,7 @@ main ()
return 0;
}
_ACEOF
@@ -10828,7 +11049,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10872,16 +10052,9 @@
+@@ -10872,16 +10052,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
@@ -10847,7 +11068,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -11093,42 +10266,16 @@
+@@ -11093,42 +10266,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"
@@ -10895,7 +11116,7 @@
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11141,7 +10288,7 @@
+@@ -11141,7 +10288,7 @@ rm -f core conftest.err conftest.$ac_obj
link_all_deplibs=yes
;;
@@ -10904,7 +11125,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11384,7 +10531,7 @@
+@@ -11384,7 +10531,7 @@ rm -f core conftest.err conftest.$ac_obj
fi
fi
@@ -10913,7 +11134,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -11421,16 +10568,16 @@
+@@ -11421,16 +10568,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.
@@ -10934,7 +11155,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -11444,11 +10591,11 @@
+@@ -11444,11 +10591,11 @@ $as_echo_n "checking whether -lc should
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -10949,7 +11170,7 @@
then
archive_cmds_need_lc=no
else
-@@ -11459,7 +10606,7 @@
+@@ -11459,7 +10606,7 @@ $as_echo_n "checking whether -lc should
cat conftest.err 1>&5
fi
$RM conftest*
@@ -10958,7 +11179,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -11623,7 +10770,7 @@
+@@ -11623,7 +10770,7 @@ esac
@@ -10967,7 +11188,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -12031,7 +11178,7 @@
+@@ -12031,7 +11178,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -10976,7 +11197,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -12045,11 +11192,7 @@
+@@ -12045,11 +11192,7 @@ linux* | k*bsd*-gnu)
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -10989,7 +11210,7 @@
/* end confdefs.h. */
int
-@@ -12060,41 +11203,13 @@
+@@ -12060,41 +11203,13 @@ main ()
return 0;
}
_ACEOF
@@ -11035,7 +11256,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -12103,13 +11218,10 @@
+@@ -12103,13 +11218,10 @@ rm -f core conftest.err conftest.$ac_obj
# before this can be enabled.
hardcode_into_libs=yes
@@ -11050,7 +11271,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -12121,6 +11233,18 @@
+@@ -12121,6 +11233,18 @@ rm -f core conftest.err conftest.$ac_obj
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11069,7 +11290,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -12309,7 +11433,7 @@
+@@ -12309,7 +11433,7 @@ uts4*)
dynamic_linker=no
;;
esac
@@ -11078,7 +11299,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -12411,7 +11535,7 @@
+@@ -12411,7 +11535,7 @@ fi
@@ -11087,7 +11308,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -12436,7 +11560,7 @@
+@@ -12436,7 +11560,7 @@ else
# directories.
hardcode_action=unsupported
fi
@@ -11096,7 +11317,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -12481,18 +11605,14 @@
+@@ -12481,18 +11605,14 @@ else
darwin*)
# if libdl is installed we need to link against it
@@ -11118,7 +11339,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12510,43 +11630,18 @@
+@@ -12510,43 +11630,18 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -11168,7 +11389,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -12559,33 +11654,19 @@
+@@ -12559,33 +11654,19 @@ fi
;;
*)
@@ -11212,7 +11433,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -12594,13 +11675,6 @@
+@@ -12594,13 +11675,6 @@ cat >>conftest.$ac_ext <<_ACEOF
extern "C"
#endif
char shl_load ();
@@ -11226,7 +11447,7 @@
int
main ()
{
-@@ -12609,56 +11683,32 @@
+@@ -12609,56 +11683,32 @@ return shl_load ();
return 0;
}
_ACEOF
@@ -11302,7 +11523,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12667,81 +11717,38 @@
+@@ -12667,81 +11717,38 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -11401,7 +11622,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -12750,13 +11757,6 @@
+@@ -12750,13 +11757,6 @@ cat >>conftest.$ac_ext <<_ACEOF
extern "C"
#endif
char dlopen ();
@@ -11415,7 +11636,7 @@
int
main ()
{
-@@ -12765,192 +11765,28 @@
+@@ -12765,192 +11765,28 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -11617,7 +11838,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12968,43 +11804,18 @@
+@@ -12968,43 +11804,18 @@ return dld_link ();
return 0;
}
_ACEOF
@@ -11667,7 +11888,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -13043,9 +11854,9 @@
+@@ -13043,9 +11854,9 @@ fi
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -11679,7 +11900,7 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -13054,7 +11865,7 @@
+@@ -13054,7 +11865,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -11688,7 +11909,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13113,11 +11924,11 @@
+@@ -13113,11 +11924,11 @@ int main ()
return status;
}
_LT_EOF
@@ -11703,7 +11924,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13134,14 +11945,14 @@
+@@ -13134,14 +11945,14 @@ rm -fr conftest*
fi
@@ -11721,7 +11942,7 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -13150,7 +11961,7 @@
+@@ -13150,7 +11961,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -11730,7 +11951,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13209,11 +12020,11 @@
+@@ -13209,11 +12020,11 @@ int main ()
return status;
}
_LT_EOF
@@ -11745,7 +11966,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13230,7 +12041,7 @@
+@@ -13230,7 +12041,7 @@ rm -fr conftest*
fi
@@ -11754,7 +11975,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -13269,12 +12080,12 @@
+@@ -13269,12 +12080,12 @@ fi
striplib=
old_striplib=
@@ -11769,7 +11990,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -13283,15 +12094,15 @@
+@@ -13283,15 +12094,15 @@ else
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -11788,7 +12009,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -13309,12 +12120,12 @@
+@@ -13309,12 +12120,12 @@ fi
# Report which library types will actually be built
@@ -11804,7 +12025,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -13335,14 +12146,14 @@
+@@ -13335,14 +12146,14 @@ $as_echo_n "checking whether to build sh
fi
;;
esac
@@ -11822,7 +12043,7 @@
$as_echo "$enable_static" >&6; }
-@@ -13379,9 +12190,9 @@
+@@ -13379,9 +12190,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
@@ -11834,7 +12055,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -13394,14 +12205,14 @@
+@@ -13394,14 +12205,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11852,7 +12073,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -13410,10 +12221,10 @@
+@@ -13410,10 +12221,10 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -11865,7 +12086,7 @@
$as_echo "no" >&6; }
fi
-@@ -13425,9 +12236,9 @@
+@@ -13425,9 +12236,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
@@ -11877,7 +12098,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -13440,14 +12251,14 @@
+@@ -13440,14 +12251,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11895,7 +12116,7 @@
IFS=$as_save_IFS
;;
-@@ -13455,10 +12266,10 @@
+@@ -13455,10 +12266,10 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -11908,7 +12129,7 @@
$as_echo "no" >&6; }
fi
-@@ -13468,9 +12279,9 @@
+@@ -13468,9 +12279,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
@@ -11920,7 +12141,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -13483,14 +12294,14 @@
+@@ -13483,14 +12294,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11938,7 +12159,7 @@
IFS=$as_save_IFS
;;
-@@ -13498,10 +12309,10 @@
+@@ -13498,10 +12309,10 @@ esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -11951,7 +12172,7 @@
$as_echo "no" >&6; }
fi
-@@ -13510,7 +12321,7 @@
+@@ -13510,7 +12321,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -11960,7 +12181,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -13523,13 +12334,13 @@
+@@ -13523,13 +12334,13 @@ fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -11977,7 +12198,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -13537,14 +12348,15 @@
+@@ -13537,14 +12348,15 @@ $as_echo "no" >&6; }
fi
pkg_failed=no
@@ -11999,7 +12220,7 @@
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
gthread-2.0
-@@ -13556,7 +12368,7 @@
+@@ -13556,7 +12368,7 @@ if test -n "$ALL_CFLAGS"; then
gail >= 0.16
unique-1.0
dbus-glib-1
@@ -12008,7 +12229,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
-@@ -13571,8 +12383,8 @@
+@@ -13571,8 +12383,8 @@ if test -n "$ALL_CFLAGS"; then
dbus-glib-1
") 2>&5
ac_status=$?
@@ -12019,7 +12240,7 @@
pkg_cv_ALL_CFLAGS=`$PKG_CONFIG --cflags "
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
-@@ -13589,14 +12401,16 @@
+@@ -13589,14 +12401,16 @@ if test -n "$ALL_CFLAGS"; then
else
pkg_failed=yes
fi
@@ -12043,7 +12264,7 @@
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
gthread-2.0
-@@ -13608,7 +12422,7 @@
+@@ -13608,7 +12422,7 @@ if test -n "$ALL_LIBS"; then
gail >= 0.16
unique-1.0
dbus-glib-1
@@ -12052,7 +12273,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
-@@ -13623,8 +12437,8 @@
+@@ -13623,8 +12437,8 @@ if test -n "$ALL_LIBS"; then
dbus-glib-1
") 2>&5
ac_status=$?
@@ -12063,7 +12284,7 @@
pkg_cv_ALL_LIBS=`$PKG_CONFIG --libs "
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
-@@ -13641,8 +12455,9 @@
+@@ -13641,8 +12455,9 @@ if test -n "$ALL_LIBS"; then
else
pkg_failed=yes
fi
@@ -12075,7 +12296,7 @@
fi
-@@ -13655,7 +12470,7 @@
+@@ -13655,7 +12470,7 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12084,7 +12305,7 @@
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
gthread-2.0
-@@ -13667,9 +12482,9 @@
+@@ -13667,9 +12482,9 @@ fi
gail >= 0.16
unique-1.0
dbus-glib-1
@@ -12096,7 +12317,7 @@
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
gthread-2.0
-@@ -13681,35 +12496,12 @@
+@@ -13681,35 +12496,12 @@ fi
gail >= 0.16
unique-1.0
dbus-glib-1
@@ -12134,7 +12355,7 @@
glib-2.0 >= 2.21.3
gnome-desktop-2.0 >= 2.25.5
gthread-2.0
-@@ -13731,22 +12523,11 @@
+@@ -13731,22 +12523,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.
@@ -12160,7 +12381,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -13755,12 +12536,11 @@
+@@ -13755,12 +12536,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/>.
@@ -12175,7 +12396,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -13774,151 +12554,12 @@
+@@ -13774,151 +12554,12 @@ _ACEOF
@@ -12332,7 +12553,7 @@
_ACEOF
fi
-@@ -13926,16 +12567,12 @@
+@@ -13926,16 +12567,12 @@ fi
done
if test $ac_cv_header_locale_h = yes; then
@@ -12352,7 +12573,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -13946,46 +12583,19 @@
+@@ -13946,46 +12583,19 @@ return LC_MESSAGES
return 0;
}
_ACEOF
@@ -12405,7 +12626,7 @@
fi
fi
-@@ -13998,155 +12608,20 @@
+@@ -13998,155 +12608,20 @@ _ACEOF
XGETTEXT=:
INTLLIBS=
@@ -12566,7 +12787,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -14159,54 +12634,25 @@
+@@ -14159,54 +12634,25 @@ return !ngettext ("","", 1)
return 0;
}
_ACEOF
@@ -12629,7 +12850,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -14219,141 +12665,26 @@
+@@ -14219,141 +12665,26 @@ return !dgettext ("","")
return 0;
}
_ACEOF
@@ -12781,7 +13002,7 @@
_ACEOF
fi
-@@ -14368,18 +12699,14 @@
+@@ -14368,18 +12699,14 @@ done
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -12803,7 +13024,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14397,55 +12724,26 @@
+@@ -14397,55 +12724,26 @@ return bindtextdomain ();
return 0;
}
_ACEOF
@@ -12868,7 +13089,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14463,55 +12761,26 @@
+@@ -14463,55 +12761,26 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -12933,7 +13154,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14529,43 +12798,18 @@
+@@ -14529,43 +12798,18 @@ return dgettext ();
return 0;
}
_ACEOF
@@ -12983,7 +13204,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -14575,22 +12819,18 @@
+@@ -14575,22 +12819,18 @@ fi
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -13011,7 +13232,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14608,55 +12848,26 @@
+@@ -14608,55 +12848,26 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -13076,7 +13297,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14674,43 +12885,18 @@
+@@ -14674,43 +12885,18 @@ return dcgettext ();
return 0;
}
_ACEOF
@@ -13126,7 +13347,7 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -14732,108 +12918,18 @@
+@@ -14732,108 +12918,18 @@ fi
glib_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
@@ -13244,7 +13465,7 @@
if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
gt_cv_func_dgettext_libc=no
-@@ -14857,15 +12953,13 @@
+@@ -14857,15 +12953,13 @@ done
if test "$gt_cv_have_gettext" = "yes"; then
@@ -13263,7 +13484,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -14890,118 +12984,28 @@
+@@ -14890,118 +12984,28 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -13390,7 +13611,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -15016,14 +13020,14 @@
+@@ -15016,14 +13020,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -13410,7 +13631,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -15031,9 +13035,9 @@
+@@ -15031,9 +13035,9 @@ fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -13422,7 +13643,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -15046,14 +13050,14 @@
+@@ -15046,14 +13050,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13440,7 +13661,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -15062,19 +13066,19 @@
+@@ -15062,19 +13066,19 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -13464,7 +13685,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -15099,18 +13103,14 @@
+@@ -15099,18 +13103,14 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -13486,7 +13707,7 @@
/* end confdefs.h. */
int
-@@ -15122,121 +13122,14 @@
+@@ -15122,121 +13122,14 @@ extern int _nl_msg_cat_cntr;
return 0;
}
_ACEOF
@@ -13612,7 +13833,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -15251,10 +13144,8 @@
+@@ -15251,10 +13144,8 @@ fi
;;
esac
fi
@@ -13625,7 +13846,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -15268,9 +13159,7 @@
+@@ -15268,9 +13159,7 @@ fi
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -13636,7 +13857,7 @@
fi
-@@ -15278,7 +13167,7 @@
+@@ -15278,7 +13167,7 @@ _ACEOF
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -13645,7 +13866,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -15311,7 +13200,7 @@
+@@ -15311,7 +13200,7 @@ $as_echo "found xgettext program is not
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -13654,7 +13875,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -15336,7 +13225,7 @@
+@@ -15336,7 +13225,7 @@ $as_echo_n "checking for catalogs to be
fi
done
LINGUAS=$NEW_LINGUAS
@@ -13663,7 +13884,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -15390,16 +13279,16 @@
+@@ -15390,16 +13279,16 @@ _ACEOF
@@ -13683,7 +13904,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -15407,35 +13296,31 @@
+@@ -15407,35 +13296,31 @@ $as_echo "$USE_NLS" >&6; }
case "$am__api_version" in
1.01234)
@@ -13725,7 +13946,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -15448,14 +13333,14 @@
+@@ -15448,14 +13333,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13743,7 +13964,7 @@
IFS=$as_save_IFS
;;
-@@ -15463,19 +13348,19 @@
+@@ -15463,19 +13348,19 @@ esac
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -13767,7 +13988,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -15488,14 +13373,14 @@
+@@ -15488,14 +13373,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13785,7 +14006,7 @@
IFS=$as_save_IFS
;;
-@@ -15503,19 +13388,19 @@
+@@ -15503,19 +13388,19 @@ esac
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -13809,7 +14030,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -15528,14 +13413,14 @@
+@@ -15528,14 +13413,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13827,7 +14048,7 @@
IFS=$as_save_IFS
;;
-@@ -15543,18 +13428,16 @@
+@@ -15543,18 +13428,16 @@ esac
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -13849,7 +14070,7 @@
fi
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -15676,9 +13559,9 @@
+@@ -15676,9 +13559,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
@@ -13861,7 +14082,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -15691,14 +13574,14 @@
+@@ -15691,14 +13574,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13879,7 +14100,7 @@
IFS=$as_save_IFS
;;
-@@ -15706,19 +13589,19 @@
+@@ -15706,19 +13589,19 @@ esac
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -13903,7 +14124,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -15731,14 +13614,14 @@
+@@ -15731,14 +13614,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13921,7 +14142,7 @@
IFS=$as_save_IFS
;;
-@@ -15746,19 +13629,19 @@
+@@ -15746,19 +13629,19 @@ esac
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -13945,7 +14166,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -15771,14 +13654,14 @@
+@@ -15771,14 +13654,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13963,7 +14184,7 @@
IFS=$as_save_IFS
;;
-@@ -15786,19 +13669,19 @@
+@@ -15786,19 +13669,19 @@ esac
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -13987,7 +14208,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -15811,14 +13694,14 @@
+@@ -15811,14 +13694,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14005,7 +14226,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -15827,33 +13710,29 @@
+@@ -15827,33 +13710,29 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -14045,7 +14266,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -15866,14 +13745,14 @@
+@@ -15866,14 +13745,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14063,7 +14284,7 @@
IFS=$as_save_IFS
;;
-@@ -15881,41 +13760,35 @@
+@@ -15881,41 +13760,35 @@ esac
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -14114,7 +14335,7 @@
fi
fi
-@@ -15925,11 +13798,7 @@
+@@ -15925,11 +13798,7 @@ fi
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -14127,7 +14348,7 @@
/* end confdefs.h. */
int
-@@ -15941,136 +13810,27 @@
+@@ -15941,136 +13810,27 @@ extern int _nl_msg_cat_cntr;
return 0;
}
_ACEOF
@@ -14280,7 +14501,7 @@
-@@ -16082,9 +13842,9 @@
+@@ -16082,9 +13842,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
@@ -14292,7 +14513,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_CHECK in
-@@ -16097,14 +13857,14 @@
+@@ -16097,14 +13857,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14310,7 +14531,7 @@
IFS=$as_save_IFS
;;
-@@ -16112,10 +13872,10 @@
+@@ -16112,10 +13872,10 @@ esac
fi
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
if test -n "$GTKDOC_CHECK"; then
@@ -14323,7 +14544,7 @@
$as_echo "no" >&6; }
fi
-@@ -16124,9 +13884,9 @@
+@@ -16124,9 +13884,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
@@ -14335,7 +14556,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_REBASE in
-@@ -16139,14 +13899,14 @@
+@@ -16139,14 +13899,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14353,7 +14574,7 @@
IFS=$as_save_IFS
;;
-@@ -16154,10 +13914,10 @@
+@@ -16154,10 +13914,10 @@ esac
fi
GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
if test -n "$GTKDOC_REBASE"; then
@@ -14366,7 +14587,7 @@
$as_echo "no" >&6; }
fi
-@@ -16168,9 +13928,9 @@
+@@ -16168,9 +13928,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
@@ -14378,7 +14599,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_MKPDF in
-@@ -16183,14 +13943,14 @@
+@@ -16183,14 +13943,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14396,7 +14617,7 @@
IFS=$as_save_IFS
;;
-@@ -16198,10 +13958,10 @@
+@@ -16198,10 +13958,10 @@ esac
fi
GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
if test -n "$GTKDOC_MKPDF"; then
@@ -14409,7 +14630,7 @@
$as_echo "no" >&6; }
fi
-@@ -16209,7 +13969,7 @@
+@@ -16209,7 +13969,7 @@ fi
# Check whether --with-html-dir was given.
@@ -14418,7 +14639,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -16219,7 +13979,7 @@
+@@ -16219,7 +13979,7 @@ fi
# Check whether --enable-gtk-doc was given.
@@ -14427,7 +14648,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -16228,33 +13988,31 @@
+@@ -16228,33 +13988,31 @@ fi
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -14469,7 +14690,7 @@
enableval=$enable_gtk_doc_pdf;
else
enable_gtk_doc_pdf=no
-@@ -16311,12 +14069,10 @@
+@@ -16311,12 +14069,10 @@ fi
ENABLE_PROFILER=
# Check whether --enable-profiler was given.
@@ -14484,7 +14705,7 @@
fi
-@@ -16344,9 +14100,9 @@
+@@ -16344,9 +14100,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
@@ -14496,7 +14717,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$PERL"; then
-@@ -16357,24 +14113,24 @@
+@@ -16357,24 +14113,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14526,7 +14747,7 @@
$as_echo "no" >&6; }
fi
-@@ -16384,9 +14140,9 @@
+@@ -16384,9 +14140,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
@@ -14538,7 +14759,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -16399,14 +14155,14 @@
+@@ -16399,14 +14155,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14556,7 +14777,7 @@
IFS=$as_save_IFS
;;
-@@ -16414,162 +14170,22 @@
+@@ -16414,162 +14170,22 @@ esac
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -14726,7 +14947,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -16578,102 +14194,12 @@
+@@ -16578,102 +14194,12 @@ fi
done
@@ -14833,7 +15054,7 @@
_ACEOF
fi
-@@ -16691,12 +14217,12 @@
+@@ -16691,12 +14217,12 @@ x_cflags="`$PKG_CONFIG --cflags pangox`"
x_extra_libs=
if test $pango_omitted_x_deps = yes ; then
@@ -14848,7 +15069,7 @@
withval=$with_x;
fi
-@@ -16706,10 +14232,8 @@
+@@ -16706,10 +14232,8 @@ if test "x$with_x" = xno; then
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -14861,7 +15082,7 @@
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
-@@ -16757,21 +14281,25 @@
+@@ -16757,21 +14281,25 @@ fi
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
@@ -14887,7 +15108,7 @@
/usr/local/include/X11R6
/usr/local/include/X11R5
/usr/local/include/X11R4
-@@ -16793,37 +14321,14 @@
+@@ -16793,37 +14321,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.
@@ -14927,7 +15148,7 @@
for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
-@@ -16831,7 +14336,6 @@
+@@ -16831,7 +14336,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
done
fi
@@ -14935,7 +15156,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
-@@ -16841,11 +14345,7 @@
+@@ -16841,11 +14345,7 @@ if test "$ac_x_libraries" = no; then
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
@@ -14948,7 +15169,7 @@
/* end confdefs.h. */
#include <X11/Xlib.h>
int
-@@ -16856,35 +14356,12 @@
+@@ -16856,35 +14356,12 @@ XrmInitialize ()
return 0;
}
_ACEOF
@@ -14986,7 +15207,7 @@
for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do
# Don't even attempt the hair of trying to link an X program!
-@@ -16896,10 +14373,8 @@
+@@ -16896,10 +14373,8 @@ do
done
done
fi
@@ -14999,7 +15220,7 @@
fi # $ac_x_libraries = no
case $ac_x_includes,$ac_x_libraries in #(
-@@ -16920,7 +14395,7 @@
+@@ -16920,7 +14395,7 @@ fi
fi # $with_x != no
if test "$have_x" != yes; then
@@ -15008,7 +15229,7 @@
$as_echo "$have_x" >&6; }
no_x=yes
else
-@@ -16931,16 +14406,14 @@
+@@ -16931,16 +14406,14 @@ else
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -15027,7 +15248,7 @@
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
else
-@@ -16953,16 +14426,12 @@
+@@ -16953,16 +14426,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 . . . .
@@ -15046,7 +15267,7 @@
/* end confdefs.h. */
int
-@@ -16973,40 +14442,13 @@
+@@ -16973,40 +14442,13 @@ main ()
return 0;
}
_ACEOF
@@ -15091,7 +15312,7 @@
/* end confdefs.h. */
int
-@@ -17017,46 +14459,19 @@
+@@ -17017,46 +14459,19 @@ main ()
return 0;
}
_ACEOF
@@ -15145,7 +15366,7 @@
ac_c_werror_flag=$ac_xsave_c_werror_flag
LIBS=$ac_xsave_LIBS
fi
-@@ -17072,11 +14487,7 @@
+@@ -17072,11 +14487,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"
@@ -15158,7 +15379,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17094,44 +14505,17 @@
+@@ -17094,44 +14505,17 @@ return XOpenDisplay ();
return 0;
}
_ACEOF
@@ -15208,7 +15429,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17149,59 +14533,30 @@
+@@ -17149,59 +14533,30 @@ return dnet_ntoa ();
return 0;
}
_ACEOF
@@ -15277,7 +15498,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17219,52 +14574,25 @@
+@@ -17219,52 +14574,25 @@ return dnet_ntoa ();
return 0;
}
_ACEOF
@@ -15338,7 +15559,7 @@
LIBS="$ac_xsave_LIBS"
# msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -17275,105 +14603,20 @@
+@@ -17275,105 +14603,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.
@@ -15449,7 +15670,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17391,59 +14634,30 @@
+@@ -17391,59 +14634,30 @@ return gethostbyname ();
return 0;
}
_ACEOF
@@ -15518,7 +15739,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17461,43 +14675,18 @@
+@@ -17461,43 +14675,18 @@ return gethostbyname ();
return 0;
}
_ACEOF
@@ -15568,7 +15789,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
-@@ -17511,105 +14700,20 @@
+@@ -17511,105 +14700,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.
@@ -15679,7 +15900,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17627,148 +14731,38 @@
+@@ -17627,148 +14731,38 @@ return connect ();
return 0;
}
_ACEOF
@@ -15839,7 +16060,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17784,150 +14778,40 @@
+@@ -17784,150 +14778,40 @@ main ()
return remove ();
;
return 0;
@@ -16013,7 +16234,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17945,43 +14829,18 @@
+@@ -17945,43 +14829,18 @@ return shmat ();
return 0;
}
_ACEOF
@@ -16063,7 +16284,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -17997,18 +14856,14 @@
+@@ -17997,18 +14856,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
@@ -16085,7 +16306,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18026,43 +14881,18 @@
+@@ -18026,43 +14881,18 @@ return IceConnectionNumber ();
return 0;
}
_ACEOF
@@ -16135,7 +16356,7 @@
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -18072,9 +14902,7 @@
+@@ -18072,9 +14902,7 @@ fi
if test x$no_x = xyes ; then
@@ -16146,7 +16367,7 @@
fi
x_libs="$X_LIBS -lX11 $X_EXTRA_LIBS"
-@@ -18090,18 +14918,14 @@
+@@ -18090,18 +14918,14 @@ x_libs_for_checks=$x_libs
# esac
#done
@@ -16168,7 +16389,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18119,48 +14943,21 @@
+@@ -18119,48 +14943,21 @@ return XOpenDisplay ();
return 0;
}
_ACEOF
@@ -16224,7 +16445,7 @@
fi
-@@ -18177,40 +14974,44 @@
+@@ -18177,40 +14974,44 @@ fi
pkg_failed=no
@@ -16288,7 +16509,7 @@
fi
-@@ -18223,52 +15024,56 @@
+@@ -18223,52 +15024,56 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16367,7 +16588,7 @@
fi
-@@ -18281,14 +15086,14 @@
+@@ -18281,14 +15086,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16385,7 +16606,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_EXIF_TRUE=
-@@ -18310,7 +15115,7 @@
+@@ -18310,7 +15115,7 @@ fi
else
EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
EXIF_LIBS=$pkg_cv_EXIF_LIBS
@@ -16394,7 +16615,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18322,9 +15127,7 @@
+@@ -18322,9 +15127,7 @@ else
fi
@@ -16405,7 +16626,7 @@
fi
-@@ -18333,40 +15136,44 @@
+@@ -18333,40 +15136,44 @@ elif test $pkg_failed = untried; then
pkg_failed=no
@@ -16469,7 +16690,7 @@
fi
-@@ -18379,14 +15186,14 @@
+@@ -18379,14 +15186,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16487,7 +16708,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_EXIF_TRUE=
-@@ -18408,7 +15215,7 @@
+@@ -18408,7 +15215,7 @@ fi
else
EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
EXIF_LIBS=$pkg_cv_EXIF_LIBS
@@ -16496,7 +16717,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18420,9 +15227,7 @@
+@@ -18420,9 +15227,7 @@ else
fi
@@ -16507,7 +16728,7 @@
fi
-@@ -18430,7 +15235,7 @@
+@@ -18430,7 +15235,7 @@ fi
else
EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
EXIF_LIBS=$pkg_cv_EXIF_LIBS
@@ -16516,7 +16737,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18442,9 +15247,7 @@
+@@ -18442,9 +15247,7 @@ else
fi
@@ -16527,7 +16748,7 @@
fi
-@@ -18464,7 +15267,7 @@
+@@ -18464,7 +15267,7 @@ fi
# Check whether --enable-xmp was given.
@@ -16536,7 +16757,7 @@
enableval=$enable_xmp;
fi
-@@ -18472,40 +15275,44 @@
+@@ -18472,40 +15275,44 @@ msg_xmp=no
if test "x$enable_xmp" != "xno"; then
pkg_failed=no
@@ -16600,7 +16821,7 @@
fi
-@@ -18518,14 +15325,14 @@
+@@ -18518,14 +15325,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16618,7 +16839,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_EXEMPI_TRUE=
-@@ -18547,7 +15354,7 @@
+@@ -18547,7 +15354,7 @@ fi
else
EXEMPI_CFLAGS=$pkg_cv_EXEMPI_CFLAGS
EXEMPI_LIBS=$pkg_cv_EXEMPI_LIBS
@@ -16627,7 +16848,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18559,9 +15366,7 @@
+@@ -18559,9 +15366,7 @@ else
fi
@@ -16638,7 +16859,7 @@
msg_xmp=yes
-@@ -18569,40 +15374,44 @@
+@@ -18569,40 +15374,44 @@ fi
pkg_failed=no
@@ -16702,7 +16923,7 @@
fi
-@@ -18615,14 +15424,14 @@
+@@ -18615,14 +15424,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16720,7 +16941,7 @@
$as_echo "no" >&6; }
true
elif test $pkg_failed = untried; then
-@@ -18630,12 +15439,10 @@
+@@ -18630,12 +15439,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
@@ -16735,7 +16956,7 @@
fi
-@@ -18655,7 +15462,7 @@
+@@ -18655,7 +15462,7 @@ fi
# Check whether --enable-tracker was given.
@@ -16744,7 +16965,7 @@
enableval=$enable_tracker;
fi
-@@ -18663,40 +15470,44 @@
+@@ -18663,40 +15470,44 @@ msg_tracker=no
if test "x$enable_tracker" != "xno"; then
pkg_failed=no
@@ -16808,7 +17029,7 @@
fi
-@@ -18709,52 +15520,56 @@
+@@ -18709,52 +15520,56 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16887,7 +17108,7 @@
fi
-@@ -18767,14 +15582,14 @@
+@@ -18767,14 +15582,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16905,7 +17126,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_TRACKER_TRUE=
-@@ -18796,7 +15611,7 @@
+@@ -18796,7 +15611,7 @@ fi
else
TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
@@ -16914,7 +17135,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18808,9 +15623,7 @@
+@@ -18808,9 +15623,7 @@ else
fi
@@ -16925,7 +17146,7 @@
msg_tracker=yes
-@@ -18820,40 +15633,44 @@
+@@ -18820,40 +15633,44 @@ elif test $pkg_failed = untried; then
pkg_failed=no
@@ -16989,7 +17210,7 @@
fi
-@@ -18866,14 +15683,14 @@
+@@ -18866,14 +15683,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -17007,7 +17228,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_TRACKER_TRUE=
-@@ -18895,7 +15712,7 @@
+@@ -18895,7 +15712,7 @@ fi
else
TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
@@ -17016,7 +17237,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18907,9 +15724,7 @@
+@@ -18907,9 +15724,7 @@ else
fi
@@ -17027,7 +17248,7 @@
msg_tracker=yes
-@@ -18918,7 +15733,7 @@
+@@ -18918,7 +15733,7 @@ fi
else
TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
@@ -17036,7 +17257,7 @@
$as_echo "yes" >&6; }
if true; then
-@@ -18930,14 +15745,10 @@
+@@ -18930,14 +15745,10 @@ else
fi
@@ -17053,7 +17274,7 @@
msg_tracker=yes
-@@ -18959,7 +15770,7 @@
+@@ -18959,7 +15770,7 @@ fi
# Check whether --enable-beagle was given.
@@ -17062,7 +17283,7 @@
enableval=$enable_beagle;
fi
-@@ -18974,40 +15785,44 @@
+@@ -18974,40 +15785,44 @@ if test "x$enable_beagle" != "xno"; then
pkg_failed=no
@@ -17126,7 +17347,7 @@
fi
-@@ -19020,14 +15835,14 @@
+@@ -19020,14 +15835,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -17144,7 +17365,7 @@
$as_echo "no" >&6; }
if false; then
HAVE_BEAGLE_TRUE=
-@@ -19043,262 +15858,88 @@
+@@ -19043,262 +15858,88 @@ elif test $pkg_failed = untried; then
HAVE_BEAGLE_FALSE='#'
else
HAVE_BEAGLE_TRUE='#'
@@ -17470,7 +17691,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19323,59 +15964,30 @@
+@@ -19323,59 +15964,30 @@ for ac_lib in '' selinux; do
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -17539,7 +17760,7 @@
SELINUX_LIBS="-lselinux"
msg_selinux=yes
-@@ -19393,12 +16005,10 @@
+@@ -19393,12 +16005,10 @@ fi
# Check whether --enable-empty_view was given.
@@ -17554,7 +17775,7 @@
fi
-@@ -19415,7 +16025,7 @@
+@@ -19415,7 +16025,7 @@ fi
# Check whether --enable-packagekit was given.
@@ -17563,7 +17784,7 @@
enableval=$enable_packagekit;
fi
-@@ -19423,16 +16033,14 @@
+@@ -19423,16 +16033,14 @@ msg_packagekit=no
if test "x$enable_packagekit" != "xno"; then
msg_packagekit=yes
@@ -17582,7 +17803,7 @@
enableval=$enable_more_warnings; set_more_warnings="$enableval"
else
-@@ -19445,10 +16053,10 @@
+@@ -19445,10 +16053,10 @@ fi
fi
@@ -17595,7 +17816,7 @@
$as_echo "yes" >&6; }
WARNING_CFLAGS="\
-Wall \
-@@ -19460,13 +16068,9 @@
+@@ -19460,13 +16068,9 @@ $as_echo "yes" >&6; }
for option in -Wstrict-aliasing=0 -Wno-pointer-sign; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -17611,7 +17832,7 @@
/* end confdefs.h. */
int
-@@ -19477,37 +16081,16 @@
+@@ -19477,37 +16081,16 @@ main ()
return 0;
}
_ACEOF
@@ -17652,7 +17873,7 @@
$as_echo "$has_option" >&6; }
CFLAGS="$SAVE_CFLAGS"
unset has_option
-@@ -19515,26 +16098,19 @@
+@@ -19515,26 +16098,19 @@ $as_echo "$has_option" >&6; }
done
unset option
else
@@ -17685,7 +17906,7 @@
/* end confdefs.h. */
#include <time.h>
int main ()
-@@ -19549,65 +16125,32 @@
+@@ -19549,65 +16125,32 @@ cat >>conftest.$ac_ext <<_ACEOF
}
_ACEOF
@@ -17758,7 +17979,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19625,228 +16168,62 @@
+@@ -19625,228 +16168,62 @@ return XRenderFindFormat ();
return 0;
}
_ACEOF
@@ -17801,8 +18022,7 @@
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderFindFormat" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderFindFormat" >&5
- $as_echo "$ac_cv_lib_Xrender_XRenderFindFormat" >&6; }
+-$as_echo "$ac_cv_lib_Xrender_XRenderFindFormat" >&6; }
-if test "x$ac_cv_lib_Xrender_XRenderFindFormat" = x""yes; then
- have_render=true
-else
@@ -17975,6 +18195,8 @@
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderFindFormat" >&5
++$as_echo "$ac_cv_lib_Xrender_XRenderFindFormat" >&6; }
+if test "x$ac_cv_lib_Xrender_XRenderFindFormat" = x""yes; then :
+ have_render=true
else
@@ -18019,7 +18241,7 @@
+CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
+
+
-+DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
++DISABLE_DEPRECATED_CFLAGS=""
+
+
+for ac_header in X11/XF86keysym.h
@@ -18032,7 +18254,7 @@
_ACEOF
fi
-@@ -19857,9 +16234,9 @@
+@@ -19857,9 +16234,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
@@ -18044,7 +18266,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -19872,14 +16249,14 @@
+@@ -19872,14 +16249,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18062,7 +18284,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-@@ -19888,19 +16265,17 @@
+@@ -19888,19 +16265,17 @@ esac
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -18085,7 +18307,7 @@
fi
-@@ -19912,13 +16287,13 @@
+@@ -19912,13 +16287,13 @@ fi
# Check whether --with-gconf-source was given.
@@ -18101,7 +18323,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -19927,22 +16302,20 @@
+@@ -19927,22 +16302,20 @@ $as_echo "Using config source $GCONF_SCH
# Check whether --with-gconf-schema-file-dir was given.
@@ -18128,7 +18350,7 @@
esac
fi
-@@ -19959,9 +16332,9 @@
+@@ -19959,9 +16332,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
@@ -18140,7 +18362,7 @@
$as_echo_n "(cached) " >&6
else
case $UPDATE_MIME_DATABASE in
-@@ -19974,14 +16347,14 @@
+@@ -19974,14 +16347,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18158,7 +18380,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_UPDATE_MIME_DATABASE" && ac_cv_path_UPDATE_MIME_DATABASE="no"
-@@ -19990,17 +16363,17 @@
+@@ -19990,17 +16363,17 @@ esac
fi
UPDATE_MIME_DATABASE=$ac_cv_path_UPDATE_MIME_DATABASE
if test -n "$UPDATE_MIME_DATABASE"; then
@@ -18179,7 +18401,7 @@
enableval=$enable_update_mimedb;
else
enable_update_mimedb=yes
-@@ -20018,7 +16391,7 @@
+@@ -20018,7 +16391,7 @@ fi
# Check whether --enable-shave was given.
@@ -18188,7 +18410,7 @@
enableval=$enable_shave;
else
enable_shave=yes
-@@ -20038,9 +16411,9 @@
+@@ -20038,9 +16411,9 @@ fi
# Extract the first word of "sed", so it can be a program name with args.
set dummy sed; ac_word=$2
@@ -18200,7 +18422,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$SED"; then
-@@ -20051,14 +16424,14 @@
+@@ -20051,14 +16424,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18218,7 +18440,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_prog_SED" && ac_cv_prog_SED="false"
-@@ -20066,10 +16439,10 @@
+@@ -20066,10 +16439,10 @@ fi
fi
SED=$ac_cv_prog_SED
if test -n "$SED"; then
@@ -18231,7 +18453,7 @@
$as_echo "no" >&6; }
fi
-@@ -20134,13 +16507,13 @@
+@@ -20134,13 +16507,13 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -18247,7 +18469,7 @@
esac ;;
esac
done
-@@ -20148,8 +16521,8 @@
+@@ -20148,8 +16521,8 @@ $as_echo "$as_me: WARNING: cache variabl
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -18258,7 +18480,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -20172,11 +16545,11 @@
+@@ -20172,11 +16545,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" &&
@@ -18272,7 +18494,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -20196,8 +16569,8 @@
+@@ -20196,8 +16569,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.
@@ -18283,7 +18505,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -20213,277 +16586,167 @@
+@@ -20213,277 +16586,167 @@ else
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -18638,7 +18860,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -20493,17 +16756,18 @@
+@@ -20493,17 +16756,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -18664,7 +18886,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -20511,23 +16775,15 @@
+@@ -20511,23 +16775,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -18693,7 +18915,7 @@
as_nl='
'
export as_nl
-@@ -20535,7 +16791,13 @@
+@@ -20535,7 +16791,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
@@ -18708,7 +18930,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -20546,7 +16808,7 @@
+@@ -20546,7 +16808,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -18717,7 +18939,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -20569,13 +16831,6 @@
+@@ -20569,13 +16831,6 @@ if test "${PATH_SEPARATOR+set}" != set;
}
fi
@@ -18731,7 +18953,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -20585,15 +16840,15 @@
+@@ -20585,15 +16840,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -18750,7 +18972,7 @@
IFS=$as_save_IFS
;;
-@@ -20605,12 +16860,16 @@
+@@ -20605,12 +16860,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
@@ -18771,7 +18993,7 @@
done
PS1='$ '
PS2='> '
-@@ -20622,7 +16881,89 @@
+@@ -20622,7 +16881,89 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
@@ -18862,7 +19084,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -20636,8 +16977,12 @@
+@@ -20636,8 +16977,12 @@ else
as_basename=false
fi
@@ -18876,7 +19098,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -20657,76 +17002,25 @@
+@@ -20657,76 +17002,25 @@ $as_echo X/"$0" |
}
s/.*/./; q'`
@@ -18964,7 +19186,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -20755,8 +17049,56 @@
+@@ -20755,8 +17049,56 @@ fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -19022,7 +19244,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -20775,10 +17117,10 @@
+@@ -20775,10 +17117,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
@@ -19035,7 +19257,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -20793,13 +17135,19 @@
+@@ -20793,13 +17135,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
exec 6>&1
@@ -19057,7 +19279,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -20831,13 +17179,15 @@
+@@ -20831,13 +17179,15 @@ _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -19076,7 +19298,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -20856,16 +17206,17 @@
+@@ -20856,16 +17206,17 @@ $config_headers
Configuration commands:
$config_commands
@@ -19098,7 +19320,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -20901,6 +17252,8 @@
+@@ -20901,6 +17252,8 @@ do
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -19107,7 +19329,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -20908,20 +17261,19 @@
+@@ -20908,20 +17261,19 @@ do
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -19132,7 +19354,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -20929,11 +17281,10 @@
+@@ -20929,11 +17281,10 @@ Try \`$0 --help' for more information."
ac_cs_silent=: ;;
# This is an error.
@@ -19147,7 +19369,7 @@
ac_need_defaults=false ;;
esac
-@@ -21277,9 +17628,7 @@
+@@ -21277,9 +17628,7 @@ do
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -19158,7 +19380,7 @@
esac
done
-@@ -21306,7 +17655,7 @@
+@@ -21306,7 +17655,7 @@ $debug ||
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -19167,7 +19389,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -21317,11 +17666,7 @@
+@@ -21317,11 +17666,7 @@ $debug ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -19180,7 +19402,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -21329,10 +17674,16 @@
+@@ -21329,10 +17674,16 @@ $debug ||
if test -n "$CONFIG_FILES"; then
@@ -19199,7 +19421,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -21346,24 +17697,18 @@
+@@ -21346,24 +17697,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -19227,7 +19449,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -21385,7 +17730,7 @@
+@@ -21385,7 +17730,7 @@ s/'"$ac_delim"'$//
t delim
:nl
h
@@ -19236,7 +19458,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -21399,7 +17744,7 @@
+@@ -21399,7 +17744,7 @@ s/.\{148\}//
t nl
:delim
h
@@ -19245,7 +19467,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -21452,9 +17797,7 @@
+@@ -21452,9 +17797,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -19256,7 +19478,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -21495,9 +17838,7 @@
+@@ -21495,9 +17838,7 @@ for ac_last_try in false false :; do
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -19267,7 +19489,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -21582,9 +17923,7 @@
+@@ -21582,9 +17923,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -19278,7 +19500,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -21597,9 +17936,7 @@
+@@ -21597,9 +17936,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -19289,7 +19511,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -21627,12 +17964,10 @@
+@@ -21627,12 +17964,10 @@ $as_echo "$as_me: error: invalid tag $ac
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -19304,7 +19526,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -21643,7 +17978,7 @@
+@@ -21643,7 +17978,7 @@ $as_echo "$as_me: error: cannot find inp
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -19313,7 +19535,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -21656,9 +17991,7 @@
+@@ -21656,9 +17991,7 @@ $as_echo "$as_me: creating $ac_file" >&6
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -19324,7 +19546,7 @@
esac
;;
esac
-@@ -21686,47 +18019,7 @@
+@@ -21686,47 +18019,7 @@ $as_echo X"$ac_file" |
q
}
s/.*/./; q'`
@@ -19373,7 +19595,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -21783,7 +18076,6 @@
+@@ -21783,7 +18076,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=
@@ -19381,7 +19603,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -21793,12 +18085,11 @@
+@@ -21793,12 +18085,11 @@ ac_sed_dataroot='
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -19396,7 +19618,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -21808,7 +18099,7 @@
+@@ -21808,7 +18099,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -19405,7 +19627,7 @@
esac
_ACEOF
-@@ -21837,14 +18128,12 @@
+@@ -21837,14 +18128,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 \
@@ -19422,7 +19644,7 @@
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
-@@ -21854,9 +18143,7 @@
+@@ -21854,9 +18143,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 \
@@ -19433,7 +19655,7 @@
;;
:H)
#
-@@ -21867,25 +18154,19 @@
+@@ -21867,25 +18154,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" \
@@ -19463,7 +19685,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -21923,7 +18204,7 @@
+@@ -21923,7 +18204,7 @@ $as_echo X"$_am_arg" |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -19472,7 +19694,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -22018,47 +18299,7 @@
+@@ -22018,47 +18299,7 @@ $as_echo X"$file" |
q
}
s/.*/./; q'`
@@ -19521,7 +19743,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -22711,9 +18952,7 @@
+@@ -22711,9 +18952,7 @@ _LT_EOF
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -19532,7 +19754,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -22736,15 +18975,12 @@
+@@ -22736,15 +18975,12 @@ $as_echo "$as_me: error: po/Makefile.in.
done # for ac_tag
@@ -19550,7 +19772,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -22765,10 +19001,10 @@
+@@ -22765,10 +19001,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.
@@ -19563,11 +19785,17 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-Index: quilt-bEU2iR/cut-n-paste-code/libegg/Makefile.in
+Index: nautilus-2.28.4/cut-n-paste-code/libegg/Makefile.in
===================================================================
---- quilt-bEU2iR.orig/cut-n-paste-code/libegg/Makefile.in 2009-12-15 10:12:57.000000000 +0100
-+++ quilt-bEU2iR/cut-n-paste-code/libegg/Makefile.in 2009-12-15 14:38:32.000000000 +0100
-@@ -188,6 +188,7 @@
+--- nautilus-2.28.4.orig/cut-n-paste-code/libegg/Makefile.in 2010-04-09 01:58:09.022714783 +0200
++++ nautilus-2.28.4/cut-n-paste-code/libegg/Makefile.in 2010-04-09 01:59:17.318213242 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -188,6 +188,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19575,11 +19803,17 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: quilt-bEU2iR/cut-n-paste-code/Makefile.in
+Index: nautilus-2.28.4/cut-n-paste-code/Makefile.in
===================================================================
---- quilt-bEU2iR.orig/cut-n-paste-code/Makefile.in 2009-12-15 10:12:57.000000000 +0100
-+++ quilt-bEU2iR/cut-n-paste-code/Makefile.in 2009-12-15 14:38:32.000000000 +0100
-@@ -199,6 +199,7 @@
+--- nautilus-2.28.4.orig/cut-n-paste-code/Makefile.in 2010-04-09 01:58:09.006715405 +0200
++++ nautilus-2.28.4/cut-n-paste-code/Makefile.in 2010-04-09 01:59:17.186215663 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -199,6 +199,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19587,11 +19821,35 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: quilt-bEU2iR/data/icons/Makefile.in
+@@ -330,7 +331,7 @@ clean-libtool:
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -355,7 +356,7 @@ $(RECURSIVE_TARGETS):
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Index: nautilus-2.28.4/data/icons/Makefile.in
===================================================================
---- quilt-bEU2iR.orig/data/icons/Makefile.in 2009-12-15 10:12:57.000000000 +0100
-+++ quilt-bEU2iR/data/icons/Makefile.in 2009-12-15 14:38:33.000000000 +0100
-@@ -161,6 +161,7 @@
+--- nautilus-2.28.4.orig/data/icons/Makefile.in 2010-04-09 01:58:08.990717493 +0200
++++ nautilus-2.28.4/data/icons/Makefile.in 2010-04-09 01:59:17.494213749 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -161,6 +161,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19599,11 +19857,17 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: quilt-bEU2iR/data/Makefile.in
+Index: nautilus-2.28.4/data/Makefile.in
===================================================================
---- quilt-bEU2iR.orig/data/Makefile.in 2009-12-15 10:12:57.000000000 +0100
-+++ quilt-bEU2iR/data/Makefile.in 2009-12-15 14:38:32.000000000 +0100
-@@ -235,6 +235,7 @@
+--- nautilus-2.28.4.orig/data/Makefile.in 2010-04-09 01:58:08.974715671 +0200
++++ nautilus-2.28.4/data/Makefile.in 2010-04-09 01:59:17.414213434 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -235,6 +235,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19611,11 +19875,35 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: quilt-bEU2iR/data/patterns/Makefile.in
+@@ -478,7 +479,7 @@ uninstall-nautilusdataDATA:
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -503,7 +504,7 @@ $(RECURSIVE_TARGETS):
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Index: nautilus-2.28.4/data/patterns/Makefile.in
===================================================================
---- quilt-bEU2iR.orig/data/patterns/Makefile.in 2009-12-15 10:12:57.000000000 +0100
-+++ quilt-bEU2iR/data/patterns/Makefile.in 2009-12-15 14:38:33.000000000 +0100
-@@ -183,6 +183,7 @@
+--- nautilus-2.28.4.orig/data/patterns/Makefile.in 2010-04-09 01:58:08.962717359 +0200
++++ nautilus-2.28.4/data/patterns/Makefile.in 2010-04-09 01:59:17.574213574 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -183,6 +183,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19623,11 +19911,17 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: quilt-bEU2iR/docs/Makefile.in
+Index: nautilus-2.28.4/docs/Makefile.in
===================================================================
---- quilt-bEU2iR.orig/docs/Makefile.in 2009-12-15 10:12:57.000000000 +0100
-+++ quilt-bEU2iR/docs/Makefile.in 2009-12-15 14:38:33.000000000 +0100
-@@ -224,6 +224,7 @@
+--- nautilus-2.28.4.orig/docs/Makefile.in 2010-04-09 01:58:08.946715536 +0200
++++ nautilus-2.28.4/docs/Makefile.in 2010-04-09 01:59:17.670213767 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -224,6 +224,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19635,11 +19929,35 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: quilt-bEU2iR/docs/reference/libnautilus-extension/Makefile.in
+@@ -416,7 +417,7 @@ uninstall-man1:
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -441,7 +442,7 @@ $(RECURSIVE_TARGETS):
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Index: nautilus-2.28.4/docs/reference/libnautilus-extension/Makefile.in
===================================================================
---- quilt-bEU2iR.orig/docs/reference/libnautilus-extension/Makefile.in 2009-12-15 10:12:57.000000000 +0100
-+++ quilt-bEU2iR/docs/reference/libnautilus-extension/Makefile.in 2009-12-15 14:38:33.000000000 +0100
-@@ -166,6 +166,7 @@
+--- nautilus-2.28.4.orig/docs/reference/libnautilus-extension/Makefile.in 2010-04-09 01:58:08.934718201 +0200
++++ nautilus-2.28.4/docs/reference/libnautilus-extension/Makefile.in 2010-04-09 01:59:17.846215266 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -166,6 +166,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19647,208 +19965,17 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -329,10 +330,10 @@
- $(NULL)
-
- @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-- at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+ at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-- at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-- at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN =
-+ at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+ at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c
- @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_RUN = $(LIBTOOL) --mode=execute
-
- # We set GPATH here; this gives us semantics for GNU make
-@@ -351,9 +352,7 @@
- $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \
- version.xml.in
- DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-- pdf-build.stamp \
-- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
-- $(srcdir)/pdf.stamp
-+ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
- SCANOBJ_FILES = \
- $(DOC_MODULE).args \
-@@ -368,10 +367,6 @@
- $(DOC_MODULE)-unused.txt
-
- CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
-- at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE at HTML_BUILD_STAMP =
-- at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE at HTML_BUILD_STAMP = html-build.stamp
-- at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE at PDF_BUILD_STAMP =
-- at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE at PDF_BUILD_STAMP = pdf-build.stamp
- all: all-am
-
- .SUFFIXES:
-@@ -567,10 +562,10 @@
- uninstall-local
-
-
-- at ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-+ at ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
- @ENABLE_GTK_DOC_FALSE at all-local:
-
--docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-+docs: html-build.stamp
-
- $(REPORT_FILES): sgml-build.stamp
-
-@@ -579,9 +574,9 @@
- scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- @echo 'gtk-doc: Scanning header files'
- @-chmod -R u+w $(srcdir)
-- @cd $(srcdir) && \
-+ cd $(srcdir) && \
- gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-+ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
- else \
- cd $(srcdir) ; \
-@@ -589,7 +584,7 @@
- test -f $$i || touch $$i ; \
- done \
- fi
-- @touch scan-build.stamp
-+ touch scan-build.stamp
-
- $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
- @true
-@@ -599,23 +594,23 @@
- tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
- @echo 'gtk-doc: Rebuilding template files'
- @-chmod -R u+w $(srcdir)
-- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-- @touch tmpl-build.stamp
-+ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-+ touch tmpl-build.stamp
-
- tmpl.stamp: tmpl-build.stamp
- @true
-
--$(srcdir)/tmpl/*.sgml:
-+tmpl/*.sgml:
- @true
-
- #### xml ####
-
--sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
- @echo 'gtk-doc: Building XML'
- @-chmod -R u+w $(srcdir)
-- @cd $(srcdir) && \
-+ cd $(srcdir) && \
- gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
-- @touch sgml-build.stamp
-+ touch sgml-build.stamp
-
- sgml.stamp: sgml-build.stamp
- @true
-@@ -625,37 +620,18 @@
- html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo 'gtk-doc: Building HTML'
- @-chmod -R u+w $(srcdir)
-- @rm -rf $(srcdir)/html
-- @mkdir $(srcdir)/html
-- @mkhtml_options=""; \
-+ rm -rf $(srcdir)/html
-+ mkdir $(srcdir)/html
-+ mkhtml_options=""; \
- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
- if test "$(?)" = "0"; then \
- mkhtml_options=--path="$(srcdir)"; \
-- fi; \
-- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-+ fi
-+ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-+ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- @echo 'gtk-doc: Fixing cross-references'
-- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-- @touch html-build.stamp
--
--#### pdf ####
--
--pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-- @echo 'gtk-doc: Building PDF'
-- @-chmod -R u+w $(srcdir)
-- @rm -rf $(srcdir)/$(DOC_MODULE).pdf
-- @mkpdf_imgdirs=""; \
-- if test "x$(HTML_IMAGES)" != "x"; then \
-- for img in $(HTML_IMAGES); do \
-- part=`dirname $$img`; \
-- echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
-- if test $$? != 0; then \
-- mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
-- fi; \
-- done; \
-- fi; \
-- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-- @touch pdf-build.stamp
-+ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-+ touch html-build.stamp
-
- ##############
-
-@@ -665,14 +641,14 @@
-
- distclean-local:
- cd $(srcdir) && \
-- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
-+ rm -rf xml $(REPORT_FILES) \
- $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
- maintainer-clean-local: clean
- cd $(srcdir) && rm -rf xml html
-
- install-data-local:
-- @installfiles=`echo $(srcdir)/html/*`; \
-+ installfiles=`echo $(srcdir)/html/*`; \
- if test "$$installfiles" = '$(srcdir)/html/*'; \
- then echo '-- Nothing to install' ; \
- else \
-@@ -692,11 +668,12 @@
- mv -f $${installdir}/$(DOC_MODULE).devhelp \
- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
- fi; \
-- $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
-+ ! which gtkdoc-rebase >/dev/null 2>&1 || \
-+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
- fi
-
- uninstall-local:
-- @if test -n "$(DOC_MODULE_VERSION)"; then \
-+ if test -n "$(DOC_MODULE_VERSION)"; then \
- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
- else \
- installdir="$(DESTDIR)$(TARGET_DIR)"; \
-@@ -713,14 +690,16 @@
-
- dist-hook: dist-check-gtkdoc dist-hook-local
- mkdir $(distdir)/tmpl
-+ mkdir $(distdir)/xml
- mkdir $(distdir)/html
- -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-+ -cp $(srcdir)/xml/*.xml $(distdir)/xml
- cp $(srcdir)/html/* $(distdir)/html
-- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- cd $(distdir) && rm -f $(DISTCLEANFILES)
-- $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
-+ ! which gtkdoc-rebase >/dev/null 2>&1 || \
-+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-
- .PHONY : dist-hook-local docs
-
-Index: quilt-bEU2iR/docs/reference/Makefile.in
+Index: nautilus-2.28.4/docs/reference/Makefile.in
===================================================================
---- quilt-bEU2iR.orig/docs/reference/Makefile.in 2009-12-15 10:12:57.000000000 +0100
-+++ quilt-bEU2iR/docs/reference/Makefile.in 2009-12-15 14:38:33.000000000 +0100
-@@ -199,6 +199,7 @@
+--- nautilus-2.28.4.orig/docs/reference/Makefile.in 2010-04-09 01:58:08.918716867 +0200
++++ nautilus-2.28.4/docs/reference/Makefile.in 2010-04-09 01:59:17.750213601 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -199,6 +199,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19856,11 +19983,35 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: quilt-bEU2iR/eel/Makefile.in
+@@ -330,7 +331,7 @@ clean-libtool:
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -355,7 +356,7 @@ $(RECURSIVE_TARGETS):
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Index: nautilus-2.28.4/eel/Makefile.in
===================================================================
---- quilt-bEU2iR.orig/eel/Makefile.in 2009-12-15 10:12:58.000000000 +0100
-+++ quilt-bEU2iR/eel/Makefile.in 2009-12-15 14:38:33.000000000 +0100
-@@ -52,7 +52,9 @@
+--- nautilus-2.28.4.orig/eel/Makefile.in 2010-04-09 01:58:08.902714065 +0200
++++ nautilus-2.28.4/eel/Makefile.in 2010-04-09 01:59:17.978216745 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -52,7 +52,9 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
@@ -19871,7 +20022,7 @@
am__objects_1 =
am_libeel_2_la_OBJECTS = eel-accessibility.lo eel-alert-dialog.lo \
eel-art-extensions.lo eel-art-gtk-extensions.lo \
-@@ -208,6 +210,7 @@
+@@ -208,6 +210,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19879,7 +20030,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -308,6 +311,9 @@
+@@ -308,6 +311,9 @@ INCLUDES = \
libeel_2_la_LDFLAGS = \
-no-undefined \
@@ -19889,11 +20040,17 @@
$(CORE_LIBS) \
$(RENDER_LIBS) \
$(X_LIBS) \
-Index: quilt-bEU2iR/icons/Makefile.in
+Index: nautilus-2.28.4/icons/Makefile.in
===================================================================
---- quilt-bEU2iR.orig/icons/Makefile.in 2009-12-15 10:12:58.000000000 +0100
-+++ quilt-bEU2iR/icons/Makefile.in 2009-12-15 14:38:33.000000000 +0100
-@@ -183,6 +183,7 @@
+--- nautilus-2.28.4.orig/icons/Makefile.in 2010-04-09 01:58:08.890715264 +0200
++++ nautilus-2.28.4/icons/Makefile.in 2010-04-09 01:59:18.058214615 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -183,6 +183,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19901,11 +20058,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: quilt-bEU2iR/INSTALL
+Index: nautilus-2.28.4/INSTALL
===================================================================
---- quilt-bEU2iR.orig/INSTALL 2009-05-23 20:14:13.000000000 +0200
-+++ quilt-bEU2iR/INSTALL 2009-12-15 14:38:34.000000000 +0100
-@@ -2,15 +2,15 @@
+--- nautilus-2.28.4.orig/INSTALL 2010-04-09 01:58:08.878715485 +0200
++++ nautilus-2.28.4/INSTALL 2010-04-09 01:59:18.846716726 +0200
+@@ -2,18 +2,24 @@ Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
@@ -19913,8 +20070,11 @@
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-This file is free documentation; the Free Software Foundation gives
-+ This file is free documentation; the Free Software Foundation gives
- unlimited permission to copy, distribute and modify it.
+-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
==================
@@ -19923,8 +20083,66 @@
+ 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.
-@@ -73,9 +73,9 @@
+-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
=====================
@@ -19937,7 +20155,7 @@
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
-@@ -88,7 +88,7 @@
+@@ -88,25 +111,41 @@ is an example:
Compiling For Multiple Architectures
====================================
@@ -19946,7 +20164,13 @@
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
-@@ -100,10 +100,24 @@
+ 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.
@@ -19971,20 +20195,76 @@
+ 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'.
-@@ -126,7 +140,7 @@
- Optional Features
- =================
-
+-`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 +152,46 @@
+@@ -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
+==================
+
@@ -20033,7 +20313,7 @@
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
-@@ -153,7 +199,8 @@
+@@ -153,7 +262,8 @@ type, such as `sun4', or a canonical nam
where SYSTEM can have one of these forms:
@@ -20043,7 +20323,7 @@
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
-@@ -171,9 +218,9 @@
+@@ -171,9 +281,9 @@ eventually be run) with `--host=TYPE'.
Sharing Defaults
================
@@ -20056,7 +20336,7 @@
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
-@@ -182,7 +229,7 @@
+@@ -182,7 +292,7 @@ A warning: not all `configure' scripts l
Defining Variables
==================
@@ -20065,7 +20345,7 @@
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
-@@ -201,11 +248,19 @@
+@@ -201,11 +311,19 @@ an Autoconf bug. Until the bug is fixed
`configure' Invocation
======================
@@ -20087,12 +20367,12 @@
`--version'
`-V'
-@@ -232,6 +287,16 @@
+@@ -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::
++ Use DIR as the installation prefix. *note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
@@ -20104,11 +20384,17 @@
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
-Index: quilt-bEU2iR/libnautilus-extension/Makefile.in
+Index: nautilus-2.28.4/libnautilus-extension/Makefile.in
===================================================================
---- quilt-bEU2iR.orig/libnautilus-extension/Makefile.in 2009-12-15 10:12:58.000000000 +0100
-+++ quilt-bEU2iR/libnautilus-extension/Makefile.in 2009-12-15 14:38:33.000000000 +0100
-@@ -222,6 +222,7 @@
+--- nautilus-2.28.4.orig/libnautilus-extension/Makefile.in 2010-04-09 01:58:08.866716683 +0200
++++ nautilus-2.28.4/libnautilus-extension/Makefile.in 2010-04-09 01:59:18.182714101 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -222,6 +222,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20116,11 +20402,17 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: quilt-bEU2iR/libnautilus-private/Makefile.in
+Index: nautilus-2.28.4/libnautilus-private/Makefile.in
===================================================================
---- quilt-bEU2iR.orig/libnautilus-private/Makefile.in 2009-12-15 10:12:58.000000000 +0100
-+++ quilt-bEU2iR/libnautilus-private/Makefile.in 2009-12-15 14:38:34.000000000 +0100
-@@ -341,6 +341,7 @@
+--- nautilus-2.28.4.orig/libnautilus-private/Makefile.in 2010-04-09 01:58:08.858718460 +0200
++++ nautilus-2.28.4/libnautilus-private/Makefile.in 2010-04-09 01:59:18.338715640 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -341,6 +341,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20128,10 +20420,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: quilt-bEU2iR/ltmain.sh
+Index: nautilus-2.28.4/ltmain.sh
===================================================================
---- quilt-bEU2iR.orig/ltmain.sh 2009-12-15 10:12:49.000000000 +0100
-+++ quilt-bEU2iR/ltmain.sh 2009-12-15 14:38:18.000000000 +0100
+--- nautilus-2.28.4.orig/ltmain.sh 2010-04-09 01:58:08.834714011 +0200
++++ nautilus-2.28.4/ltmain.sh 2010-04-09 01:59:08.390217560 +0200
@@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
@@ -20161,7 +20453,7 @@
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -5033,7 +5033,10 @@
+@@ -5033,7 +5033,10 @@ func_mode_link ()
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -20173,7 +20465,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"
@@ -20203,7 +20495,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
@@ -20211,7 +20503,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
;;
@@ -20221,11 +20513,17 @@
esac
;;
no)
-Index: quilt-bEU2iR/Makefile.in
+Index: nautilus-2.28.4/Makefile.in
===================================================================
---- quilt-bEU2iR.orig/Makefile.in 2009-12-15 10:12:59.000000000 +0100
-+++ quilt-bEU2iR/Makefile.in 2009-12-15 14:38:34.000000000 +0100
-@@ -216,6 +216,7 @@
+--- nautilus-2.28.4.orig/Makefile.in 2010-04-09 01:58:08.822715698 +0200
++++ nautilus-2.28.4/Makefile.in 2010-04-09 01:59:18.910714245 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -216,6 +216,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20233,11 +20531,67 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: quilt-bEU2iR/src/file-manager/Makefile.in
+@@ -414,7 +415,7 @@ distclean-libtool:
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -439,7 +440,7 @@ $(RECURSIVE_TARGETS):
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -603,7 +604,8 @@ distdir: $(DISTFILES)
+ fi; \
+ done
+ -test -n "$(am__skip_mode_fix)" \
+- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++ || find "$(distdir)" -type d ! -perm -755 \
++ -exec chmod u+rwx,go+rx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+@@ -647,17 +649,17 @@ dist dist-all: distdir
+ distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+Index: nautilus-2.28.4/src/file-manager/Makefile.in
===================================================================
---- quilt-bEU2iR.orig/src/file-manager/Makefile.in 2009-12-15 10:12:59.000000000 +0100
-+++ quilt-bEU2iR/src/file-manager/Makefile.in 2009-12-15 14:38:34.000000000 +0100
-@@ -223,6 +223,7 @@
+--- nautilus-2.28.4.orig/src/file-manager/Makefile.in 2010-04-09 01:58:08.810723251 +0200
++++ nautilus-2.28.4/src/file-manager/Makefile.in 2010-04-09 01:59:18.682714518 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -223,6 +223,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20245,11 +20599,17 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: quilt-bEU2iR/src/Makefile.in
+Index: nautilus-2.28.4/src/Makefile.in
===================================================================
---- quilt-bEU2iR.orig/src/Makefile.in 2009-12-15 10:12:58.000000000 +0100
-+++ quilt-bEU2iR/src/Makefile.in 2009-12-15 14:38:34.000000000 +0100
-@@ -342,6 +342,7 @@
+--- nautilus-2.28.4.orig/src/Makefile.in 2010-04-09 01:58:08.770719909 +0200
++++ nautilus-2.28.4/src/Makefile.in 2010-04-09 01:59:18.570715434 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -342,6 +342,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20257,11 +20617,35 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: quilt-bEU2iR/test/Makefile.in
+@@ -858,7 +859,7 @@ uninstall-uiDATA:
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -883,7 +884,7 @@ $(RECURSIVE_TARGETS):
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Index: nautilus-2.28.4/test/Makefile.in
===================================================================
---- quilt-bEU2iR.orig/test/Makefile.in 2009-12-15 10:12:59.000000000 +0100
-+++ quilt-bEU2iR/test/Makefile.in 2009-12-15 14:38:34.000000000 +0100
-@@ -271,6 +271,7 @@
+--- nautilus-2.28.4.orig/test/Makefile.in 2010-04-09 01:58:08.746721814 +0200
++++ nautilus-2.28.4/test/Makefile.in 2010-04-09 01:59:18.814714542 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -271,6 +271,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20269,230 +20653,59 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: quilt-bEU2iR/gtk-doc.make
+Index: nautilus-2.28.4/config.sub
===================================================================
---- quilt-bEU2iR.orig/gtk-doc.make 2009-12-15 10:12:49.000000000 +0100
-+++ quilt-bEU2iR/gtk-doc.make 2009-12-15 14:38:16.000000000 +0100
-@@ -5,13 +5,13 @@
- ####################################
-
- if GTK_DOC_USE_LIBTOOL
--GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
- GTKDOC_RUN = $(LIBTOOL) --mode=execute
- else
- GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
--GTKDOC_RUN =
-+GTKDOC_RUN = sh -c
- endif
-
- # We set GPATH here; this gives us semantics for GNU make
-@@ -31,9 +31,7 @@
- $(DOC_MODULE)-overrides.txt
-
- DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-- pdf-build.stamp \
-- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
-- $(srcdir)/pdf.stamp
-+ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
- SCANOBJ_FILES = \
- $(DOC_MODULE).args \
-@@ -50,23 +48,12 @@
- CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
-
- if ENABLE_GTK_DOC
--if GTK_DOC_BUILD_HTML
--HTML_BUILD_STAMP=html-build.stamp
--else
--HTML_BUILD_STAMP=
--endif
--if GTK_DOC_BUILD_PDF
--PDF_BUILD_STAMP=pdf-build.stamp
--else
--PDF_BUILD_STAMP=
--endif
--
--all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-+all-local: html-build.stamp
- else
- all-local:
- endif
-
--docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-+docs: html-build.stamp
-
- $(REPORT_FILES): sgml-build.stamp
-
-@@ -75,9 +62,9 @@
- scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- @echo 'gtk-doc: Scanning header files'
- @-chmod -R u+w $(srcdir)
-- @cd $(srcdir) && \
-+ cd $(srcdir) && \
- gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-+ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
- else \
- cd $(srcdir) ; \
-@@ -85,7 +72,7 @@
- test -f $$i || touch $$i ; \
- done \
- fi
-- @touch scan-build.stamp
-+ touch scan-build.stamp
-
- $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
- @true
-@@ -95,23 +82,24 @@
- tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
- @echo 'gtk-doc: Rebuilding template files'
- @-chmod -R u+w $(srcdir)
-- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-- @touch tmpl-build.stamp
-+ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-+ touch tmpl-build.stamp
-
- tmpl.stamp: tmpl-build.stamp
- @true
-
--$(srcdir)/tmpl/*.sgml:
-+tmpl/*.sgml:
- @true
-
-+
- #### xml ####
-
--sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
- @echo 'gtk-doc: Building XML'
- @-chmod -R u+w $(srcdir)
-- @cd $(srcdir) && \
-+ cd $(srcdir) && \
- gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
-- @touch sgml-build.stamp
-+ touch sgml-build.stamp
-
- sgml.stamp: sgml-build.stamp
- @true
-@@ -121,37 +109,18 @@
- html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo 'gtk-doc: Building HTML'
- @-chmod -R u+w $(srcdir)
-- @rm -rf $(srcdir)/html
-- @mkdir $(srcdir)/html
-- @mkhtml_options=""; \
-+ rm -rf $(srcdir)/html
-+ mkdir $(srcdir)/html
-+ mkhtml_options=""; \
- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
- if test "$(?)" = "0"; then \
- mkhtml_options=--path="$(srcdir)"; \
-- fi; \
-- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-+ fi
-+ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-+ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- @echo 'gtk-doc: Fixing cross-references'
-- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-- @touch html-build.stamp
--
--#### pdf ####
--
--pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-- @echo 'gtk-doc: Building PDF'
-- @-chmod -R u+w $(srcdir)
-- @rm -rf $(srcdir)/$(DOC_MODULE).pdf
-- @mkpdf_imgdirs=""; \
-- if test "x$(HTML_IMAGES)" != "x"; then \
-- for img in $(HTML_IMAGES); do \
-- part=`dirname $$img`; \
-- echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
-- if test $$? != 0; then \
-- mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
-- fi; \
-- done; \
-- fi; \
-- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-- @touch pdf-build.stamp
-+ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-+ touch html-build.stamp
-
- ##############
-
-@@ -161,14 +130,14 @@
-
- distclean-local:
- cd $(srcdir) && \
-- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
-+ rm -rf xml $(REPORT_FILES) \
- $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
- maintainer-clean-local: clean
- cd $(srcdir) && rm -rf xml html
-
- install-data-local:
-- @installfiles=`echo $(srcdir)/html/*`; \
-+ installfiles=`echo $(srcdir)/html/*`; \
- if test "$$installfiles" = '$(srcdir)/html/*'; \
- then echo '-- Nothing to install' ; \
- else \
-@@ -188,11 +157,12 @@
- mv -f $${installdir}/$(DOC_MODULE).devhelp \
- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
- fi; \
-- $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
-+ ! which gtkdoc-rebase >/dev/null 2>&1 || \
-+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
- fi
-
- uninstall-local:
-- @if test -n "$(DOC_MODULE_VERSION)"; then \
-+ if test -n "$(DOC_MODULE_VERSION)"; then \
- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
- else \
- installdir="$(DESTDIR)$(TARGET_DIR)"; \
-@@ -212,13 +182,15 @@
-
- dist-hook: dist-check-gtkdoc dist-hook-local
- mkdir $(distdir)/tmpl
-+ mkdir $(distdir)/xml
- mkdir $(distdir)/html
- -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-+ -cp $(srcdir)/xml/*.xml $(distdir)/xml
- cp $(srcdir)/html/* $(distdir)/html
-- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- cd $(distdir) && rm -f $(DISTCLEANFILES)
-- $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
-+ ! which gtkdoc-rebase >/dev/null 2>&1 || \
-+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-
- .PHONY : dist-hook-local docs
-Index: quilt-bEU2iR/config.sub
-===================================================================
---- quilt-bEU2iR.orig/config.sub 2009-12-15 10:12:56.000000000 +0100
-+++ quilt-bEU2iR/config.sub 2009-12-15 14:38:32.000000000 +0100
+--- nautilus-2.28.4.orig/config.sub 2010-04-09 01:58:08.694721628 +0200
++++ nautilus-2.28.4/config.sub 2010-04-09 01:59:17.062714488 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
-timestamp='2009-04-17'
-+timestamp='2009-06-11'
++timestamp='2010-01-22'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
-@@ -153,6 +153,9 @@
+@@ -32,13 +32,16 @@ timestamp='2009-04-17'
+
+
+ # Please send patches to <config-patches at gnu.org>. Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -72,8 +75,9 @@ Report bugs and patches to <config-patch
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -149,10 +153,13 @@ case $os in
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+- -apple | -axis | -knuth | -cray)
++ -apple | -axis | -knuth | -cray | -microblaze)
os=
basic_machine=$1
;;
@@ -20502,7 +20715,60 @@
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
-@@ -467,6 +470,10 @@
+@@ -281,6 +288,7 @@ case $basic_machine in
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
++ | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+@@ -288,13 +296,14 @@ case $basic_machine in
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
++ | ubicom32 \
+ | v850 | v850e \
+ | we32k \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | z8k | z80)
+ basic_machine=$basic_machine-unknown
+ ;;
+- m6811 | m68hc11 | m6812 | m68hc12)
++ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+ os=-none
+@@ -337,7 +346,7 @@ case $basic_machine in
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+@@ -365,15 +374,17 @@ case $basic_machine in
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+- | romp-* | rs6000-* \
++ | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++ | tile-* | tilegx-* \
+ | tron-* \
++ | ubicom32-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+@@ -467,6 +478,10 @@ case $basic_machine in
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
@@ -20513,16 +20779,70 @@
c90)
basic_machine=c90-cray
os=-unicos
-@@ -1260,7 +1267,7 @@
+@@ -719,6 +734,9 @@ case $basic_machine in
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
++ microblaze)
++ basic_machine=microblaze-xilinx
++ ;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+@@ -1069,6 +1087,11 @@ case $basic_machine in
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
++ # This must be matched before tile*.
++ tilegx*)
++ basic_machine=tilegx-unknown
++ os=-linux-gnu
++ ;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+@@ -1240,6 +1263,9 @@ case $os in
+ # First match some system type aliases
+ # that might get confused with valid system types.
+ # -solaris* is a basic system type, with this one exception.
++ -auroraux)
++ os=-auroraux
++ ;;
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+@@ -1260,9 +1286,9 @@ case $os in
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+- | -kopensolaris* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -kopensolaris* \
++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++ | -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-@@ -1613,7 +1620,7 @@
+ | -aos* | -aros* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+@@ -1283,7 +1309,7 @@ case $os in
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+@@ -1416,6 +1442,8 @@ case $os in
+ -dicos*)
+ os=-dicos
+ ;;
++ -nacl*)
++ ;;
+ -none)
+ ;;
+ *)
+@@ -1613,7 +1641,7 @@ case $basic_machine in
-sunos*)
vendor=sun
;;
@@ -20531,11 +20851,17 @@
vendor=ibm
;;
-beos*)
-Index: quilt-bEU2iR/m4/Makefile.in
+Index: nautilus-2.28.4/m4/Makefile.in
===================================================================
---- quilt-bEU2iR.orig/m4/Makefile.in 2009-12-15 10:12:58.000000000 +0100
-+++ quilt-bEU2iR/m4/Makefile.in 2009-12-15 14:38:34.000000000 +0100
-@@ -160,6 +160,7 @@
+--- nautilus-2.28.4.orig/m4/Makefile.in 2010-04-09 01:58:08.658716422 +0200
++++ nautilus-2.28.4/m4/Makefile.in 2010-04-09 01:59:18.414713917 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -160,6 +160,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20543,11 +20869,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: quilt-bEU2iR/m4/libtool.m4
+Index: nautilus-2.28.4/m4/libtool.m4
===================================================================
---- quilt-bEU2iR.orig/m4/libtool.m4 2009-12-15 10:12:49.000000000 +0100
-+++ quilt-bEU2iR/m4/libtool.m4 2009-12-15 14:38:18.000000000 +0100
-@@ -2445,7 +2445,7 @@
+--- nautilus-2.28.4.orig/m4/libtool.m4 2010-04-09 01:58:08.634724196 +0200
++++ nautilus-2.28.4/m4/libtool.m4 2010-04-09 01:59:08.514218862 +0200
+@@ -2445,7 +2445,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -20556,7 +20882,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
@@ -20571,7 +20897,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'
;;
@@ -20590,7 +20916,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.
@@ -20604,7 +20930,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
;;
@@ -20613,7 +20939,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -3760,7 +3769,7 @@
+@@ -3760,7 +3769,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
@@ -20622,7 +20948,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'
;;
@@ -20631,7 +20957,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'
;;
@@ -20641,7 +20967,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
;;
@@ -20651,7 +20977,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
@@ -20659,7 +20985,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'
;;
@@ -20668,7 +20994,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
;;
@@ -20677,7 +21003,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
@@ -20685,7 +21011,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
;;
@@ -20694,7 +21020,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
;;
@@ -20703,10 +21029,10 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-Index: quilt-bEU2iR/m4/ltversion.m4
+Index: nautilus-2.28.4/m4/ltversion.m4
===================================================================
---- quilt-bEU2iR.orig/m4/ltversion.m4 2009-12-15 10:12:49.000000000 +0100
-+++ quilt-bEU2iR/m4/ltversion.m4 2009-12-15 14:38:18.000000000 +0100
+--- nautilus-2.28.4.orig/m4/ltversion.m4 2010-04-09 01:58:08.610718769 +0200
++++ nautilus-2.28.4/m4/ltversion.m4 2010-04-09 01:59:08.890220437 +0200
@@ -9,15 +9,15 @@
# Generated from ltversion.in.
Modified: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=23619&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/series [utf-8] Fri Apr 9 00:02:12 2010
@@ -1,6 +1,7 @@
#10_location_titlebar.patch
01_manpage.patch
02_eel_libadd.patch
+03_deprecated.patch
10_load_session.patch
12_list-view_expand.patch
20_open-with_install.patch
More information about the pkg-gnome-commits
mailing list