r23799 - in /desktop/experimental/nautilus/debian: changelog patches/90_relibtoolize.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Tue Apr 13 23:44:20 UTC 2010
Author: biebl
Date: Tue Apr 13 23:44:19 2010
New Revision: 23799
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23799
Log:
Update build system for new upstream release.
Modified:
desktop/experimental/nautilus/debian/changelog
desktop/experimental/nautilus/debian/patches/90_relibtoolize.patch
Modified: desktop/experimental/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/changelog?rev=23799&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog [utf-8] (original)
+++ desktop/experimental/nautilus/debian/changelog [utf-8] Tue Apr 13 23:44:19 2010
@@ -14,7 +14,7 @@
- Add support for tracker 0.8 and fix filtering by location.
Patch pulled from upstream Git.
* debian/patches/90_relibtoolize.patch
- - Update build system accordingly.
+ - Update build system for new upstream release.
* Refresh patches to apply cleanly.
-- Michael Biebl <biebl at debian.org> Fri, 09 Apr 2010 10:09:10 +0200
Modified: desktop/experimental/nautilus/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/90_relibtoolize.patch?rev=23799&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/experimental/nautilus/debian/patches/90_relibtoolize.patch [utf-8] Tue Apr 13 23:44:19 2010
@@ -6,17 +6,11 @@
autoconf
rm -rf autom4te.cache config.h.in~
-Index: nautilus-2.28.4/aclocal.m4
+Index: nautilus-2.30.0/aclocal.m4
===================================================================
---- nautilus-2.28.4.orig/aclocal.m4 2009-12-15 10:12:53.000000000 +0100
-+++ nautilus-2.28.4/aclocal.m4 2010-04-09 02:23:18.709102091 +0200
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.11 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-@@ -13,1664 +13,1666 @@
+--- nautilus-2.30.0.orig/aclocal.m4 2010-04-13 23:22:31.291709659 +0200
++++ nautilus-2.30.0/aclocal.m4 2010-04-13 23:21:43.175714435 +0200
+@@ -13,1691 +13,1693 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
@@ -520,7 +514,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
-])
+ AC_OUTPUT_COMMANDS(
@@ -547,7 +541,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]))])
@@ -1642,27 +1636,22 @@
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
--
++# serial 10
+
-# Helper functions for option handling. -*- Autoconf -*-
-+# serial 10
++# 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.
-+# 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...
-# 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.
@@ -1679,11 +1668,10 @@
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
--# _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_MANGLE_OPTION(NAME)
+-# -----------------------
+-AC_DEFUN([_AM_MANGLE_OPTION],
+-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
@@ -1691,6 +1679,12 @@
+ [$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.
@@ -1708,6 +1702,28 @@
-# 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.
+-
+-# AM_RUN_LOG(COMMAND)
+-# -------------------
+-# Run COMMAND, save the exit status in ac_status, and log it.
+-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+-AC_DEFUN([AM_RUN_LOG],
+-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+- ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+- (exit $ac_status); }])
+-
+-# Check to make sure that the build environment is sane. -*- Autoconf -*-
+-
+-# Copyright (C) 1996, 1997, 2000, 2001, 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 5
+AC_CACHE_CHECK([dependency style of $depcc],
+ [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -1729,16 +1745,25 @@
+ # directory.
+ mkdir sub
--# AM_RUN_LOG(COMMAND)
--# -------------------
--# Run COMMAND, save the exit status in ac_status, and log it.
--# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
--AC_DEFUN([AM_RUN_LOG],
--[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-- ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-- (exit $ac_status); }])
+-# AM_SANITY_CHECK
+-# ---------------
+-AC_DEFUN([AM_SANITY_CHECK],
+-[AC_MSG_CHECKING([whether build environment is sane])
+-# Just in case
+-sleep 1
+-echo timestamp > conftest.file
+-# Reject unsafe characters in $srcdir or the absolute working directory
+-# name. Accept space and tab only in the latter.
+-am_lf='
+-'
+-case `pwd` in
+- *[[\\\"\#\$\&\'\`$am_lf]]*)
+- AC_MSG_ERROR([unsafe absolute working directory name]);;
+-esac
+-case $srcdir in
+- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
+- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+-esac
+ am_cv_$1_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
@@ -1753,7 +1778,20 @@
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac])
--# Check to make sure that the build environment is sane. -*- Autoconf -*-
+-# Do `set' in a subshell so we don't clobber the current shell's
+-# arguments. Must try -L first in case configure is actually a
+-# symlink; some systems play weird games with the mod time of symlinks
+-# (eg FreeBSD returns the mod time of the symlink's containing
+-# directory).
+-if (
+- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+- if test "$[*]" = "X"; then
+- # -L didn't work.
+- set X `ls -t "$srcdir/configure" conftest.file`
+- fi
+- rm -f conftest.file
+- if test "$[*]" != "X $srcdir/configure conftest.file" \
+- && test "$[*]" != "X conftest.file $srcdir/configure"; then
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
@@ -1771,12 +1809,13 @@
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
--# Copyright (C) 1996, 1997, 2000, 2001, 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.
+- # If neither matched, then we have a broken ls. This can happen
+- # 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".
+- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+-alias in your environment])
+- fi
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
@@ -1830,12 +1869,19 @@
+ fi
+ done
--# serial 5
+- test "$[2]" = conftest.file
+- )
+-then
+- # Ok.
+- :
+ cd ..
+ rm -rf conftest.dir
-+else
+ else
+- AC_MSG_ERROR([newly created file is older than distributed files!
+-Check your system clock])
+ am_cv_$1_dependencies_compiler_type=none
-+fi
+ fi
+-AC_MSG_RESULT(yes)])
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
@@ -1843,40 +1889,13 @@
+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
--# AM_SANITY_CHECK
--# ---------------
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftest.file
--# Reject unsafe characters in $srcdir or the absolute working directory
--# name. Accept space and tab only in the latter.
--am_lf='
--'
--case `pwd` in
-- *[[\\\"\#\$\&\'\`$am_lf]]*)
-- AC_MSG_ERROR([unsafe absolute working directory name]);;
--esac
--case $srcdir in
-- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
-- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
--esac
-
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments. Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
-- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-- if test "$[*]" = "X"; then
-- # -L didn't work.
-- set X `ls -t "$srcdir/configure" conftest.file`
-- fi
-- rm -f conftest.file
-- if test "$[*]" != "X $srcdir/configure conftest.file" \
-- && test "$[*]" != "X conftest.file $srcdir/configure"; then
+-# Copyright (C) 2009 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 1
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
@@ -1886,22 +1905,24 @@
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
-- # If neither matched, then we have a broken ls. This can happen
-- # 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".
-- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
--alias in your environment])
-- fi
-
-- test "$[2]" = conftest.file
-- )
--then
-- # Ok.
-- :
--else
-- AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
+-# AM_SILENT_RULES([DEFAULT])
+-# --------------------------
+-# Enable less verbose build rules; with the default set to DEFAULT
+-# (`yes' being less verbose, `no' or empty being verbose).
+-AC_DEFUN([AM_SILENT_RULES],
+-[AC_ARG_ENABLE([silent-rules],
+-[ --enable-silent-rules less verbose build output (undo: `make V=1')
+- --disable-silent-rules verbose build output (undo: `make V=0')])
+-case $enable_silent_rules in
+-yes) AM_DEFAULT_VERBOSITY=0;;
+-no) AM_DEFAULT_VERBOSITY=1;;
+-*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+-esac
+-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+-AM_BACKSLASH='\'
+-AC_SUBST([AM_BACKSLASH])dnl
+-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
++
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
@@ -1911,18 +1932,21 @@
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
- fi
--AC_MSG_RESULT(yes)])
--
--# Copyright (C) 2001, 2003, 2005 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.
++fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-+])
+ ])
+
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++# Generate code to set up dependency tracking. -*- Autoconf -*-
++
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 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.
-# AM_PROG_INSTALL_STRIP
-# ---------------------
@@ -1945,29 +1969,15 @@
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-+# Generate code to set up dependency tracking. -*- Autoconf -*-
-
+-
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 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.
+-#
+-# 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 5
-# serial 2
--
--# _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],
@@ -2023,9 +2033,16 @@
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
--# Check how to create a tarball. -*- Autoconf -*-
-
--# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+-# _AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
+-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+-# This macro is traced by Automake.
+-AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+-# AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
+-# Public sister of _AM_SUBST_NOTMAKE.
+-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
@@ -2038,9 +2055,11 @@
+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
-+
+
+-# Check how to create a tarball. -*- Autoconf -*-
+# Do all the work for Automake. -*- Autoconf -*-
-+
+
+-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
#
@@ -2182,30 +2201,15 @@
+ CYGPATH_W='cygpath -w'
else
- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-- fi
--
++ CYGPATH_W=echo
+ fi
++fi
++AC_SUBST([CYGPATH_W])
+
- AC_ARG_WITH([gconf-source],
- AC_HELP_STRING([--with-gconf-source=sourceaddress],
- [Config database for installing schema files.]),
- [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
--
-- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
--
-- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-+ CYGPATH_W=echo
- fi
-+fi
-+AC_SUBST([CYGPATH_W])
-
-- AC_ARG_WITH([gconf-schema-file-dir],
-- AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-- [Directory for installing schema files.]),
-- [GCONF_SCHEMA_FILE_DIR="$withval"],)
--
-- AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
@@ -2219,51 +2223,15 @@
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-- AC_ARG_ENABLE(schemas-install,
-- AC_HELP_STRING([--disable-schemas-install],
-- [Disable the schemas installation]),
-- [case ${enableval} in
-- yes|no) ;;
-- *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
-- esac])
-- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
--])
+- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
+- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
--# Copyright (C) 1995-2002 Free Software Foundation, Inc.
--# Copyright (C) 2001-2003,2004 Red Hat, Inc.
--#
--# This file is free software, distributed under the terms of the GNU
--# General Public License. As a special exception to the GNU General
--# Public License, this file may be distributed as part of a program
--# that contains a configuration script generated by Autoconf, under
--# the same distribution terms as the rest of that program.
--#
--# This file can be copied and used freely without restrictions. It can
--# be used in projects which are not available under the GNU Public License
--# but which still want to provide support for the GNU gettext functionality.
--#
--# Macro to add for using GNU gettext.
--# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
--#
--# Modified to never use included libintl.
--# Owen Taylor <otaylor at redhat.com>, 12/15/1998
--#
--# Major rework to remove unused code
--# Owen Taylor <otaylor at redhat.com>, 12/11/2002
--#
--# Added better handling of ALL_LINGUAS from GNU gettext version
--# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
--#
--# Modified to require ngettext
--# Matthias Clasen <mclasen at redhat.com> 08/06/2004
--#
--# We need this here as well, since someone might use autoconf-2.5x
--# to configure GLib then an older version to configure a package
--# using AM_GLIB_GNU_GETTEXT
--AC_PREREQ(2.53)
+- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+- fi
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
@@ -2306,54 +2274,59 @@
+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
--dnl
--dnl We go to great lengths to make sure that aclocal won't
--dnl try to pull in the installed version of these macros
--dnl when running aclocal in the glib directory.
--dnl
--m4_copy([AC_DEFUN],[glib_DEFUN])
--m4_copy([AC_REQUIRE],[glib_REQUIRE])
--dnl
--dnl At the end, if we're not within glib, we'll define the public
--dnl definitions in terms of our private definitions.
--dnl
+- AC_ARG_WITH([gconf-schema-file-dir],
+- AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
+- [Directory for installing schema files.]),
+- [GCONF_SCHEMA_FILE_DIR="$withval"],)
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
--# GLIB_LC_MESSAGES
--#--------------------
--glib_DEFUN([GLIB_LC_MESSAGES],
-- [AC_CHECK_HEADERS([locale.h])
-- if test $ac_cv_header_locale_h = yes; then
-- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-- if test $am_cv_val_LC_MESSAGES = yes; then
-- AC_DEFINE(HAVE_LC_MESSAGES, 1,
-- [Define if your <locale.h> file defines LC_MESSAGES.])
-- fi
-- fi])
-
--# GLIB_PATH_PROG_WITH_TEST
--#----------------------------
--dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
--dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
--glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
--[# Extract the first word of "$2", so it can be a program name with args.
--set dummy $2; ac_word=[$]2
--AC_MSG_CHECKING([for $ac_word])
--AC_CACHE_VAL(ac_cv_path_$1,
--[case "[$]$1" in
-- /*)
-- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-- ;;
+- AC_SUBST(GCONF_SCHEMA_FILE_DIR)
+- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
+
+- AC_ARG_ENABLE(schemas-install,
+- AC_HELP_STRING([--disable-schemas-install],
+- [Disable the schemas installation]),
+- [case ${enableval} in
+- yes|no) ;;
+- *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
+- esac])
+- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
+-])
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated. The stamp files are numbered to have different names.
-+
+
+-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+-#
+-# This file is free software, distributed under the terms of the GNU
+-# General Public License. As a special exception to the GNU General
+-# Public License, this file may be distributed as part of a program
+-# that contains a configuration script generated by Autoconf, under
+-# the same distribution terms as the rest of that program.
+-#
+-# This file can be copied and used freely without restrictions. It can
+-# be used in projects which are not available under the GNU Public License
+-# but which still want to provide support for the GNU gettext functionality.
+-#
+-# Macro to add for using GNU gettext.
+-# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
+-#
+-# Modified to never use included libintl.
+-# Owen Taylor <otaylor at redhat.com>, 12/15/1998
+-#
+-# Major rework to remove unused code
+-# Owen Taylor <otaylor at redhat.com>, 12/11/2002
+-#
+-# Added better handling of ALL_LINGUAS from GNU gettext version
+-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
+-#
+-# Modified to require ngettext
+-# Matthias Clasen <mclasen at redhat.com> 08/06/2004
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
@@ -2372,11 +2345,26 @@
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
-+#
+ #
+-# We need this here as well, since someone might use autoconf-2.5x
+-# to configure GLib then an older version to configure a package
+-# using AM_GLIB_GNU_GETTEXT
+-AC_PREREQ(2.53)
+# 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.
-+
+
+-dnl
+-dnl We go to great lengths to make sure that aclocal won't
+-dnl try to pull in the installed version of these macros
+-dnl when running aclocal in the glib directory.
+-dnl
+-m4_copy([AC_DEFUN],[glib_DEFUN])
+-m4_copy([AC_REQUIRE],[glib_REQUIRE])
+-dnl
+-dnl At the end, if we're not within glib, we'll define the public
+-dnl definitions in terms of our private definitions.
+-dnl
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
@@ -2386,7 +2374,45 @@
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
- *)
++ *)
++ install_sh="\${SHELL} $am_aux_dir/install-sh"
++ esac
++fi
++AC_SUBST(install_sh)])
+
+-# GLIB_LC_MESSAGES
+-#--------------------
+-glib_DEFUN([GLIB_LC_MESSAGES],
+- [AC_CHECK_HEADERS([locale.h])
+- if test $ac_cv_header_locale_h = yes; then
+- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+- if test $am_cv_val_LC_MESSAGES = yes; then
+- AC_DEFINE(HAVE_LC_MESSAGES, 1,
+- [Define if your <locale.h> file defines LC_MESSAGES.])
+- fi
+- fi])
++# Copyright (C) 2003, 2005 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.
+
+-# GLIB_PATH_PROG_WITH_TEST
+-#----------------------------
+-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
+-[# Extract the first word of "$2", so it can be a program name with args.
+-set dummy $2; ac_word=[$]2
+-AC_MSG_CHECKING([for $ac_word])
+-AC_CACHE_VAL(ac_cv_path_$1,
+-[case "[$]$1" in
+- /*)
+- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+- ;;
+- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in ifelse([$5], , $PATH, [$5]); do
- test -z "$ac_dir" && ac_dir=.
@@ -2407,33 +2433,8 @@
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
- AC_MSG_RESULT([$]$1)
--else
-- AC_MSG_RESULT(no)
-+ install_sh="\${SHELL} $am_aux_dir/install-sh"
-+ esac
- fi
--AC_SUBST($1)dnl
--])
-+AC_SUBST(install_sh)])
-
--# GLIB_WITH_NLS
--#-----------------
--glib_DEFUN([GLIB_WITH_NLS],
-- dnl NLS is obligatory
-- [USE_NLS=yes
-- AC_SUBST(USE_NLS)
-+# Copyright (C) 2003, 2005 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.
-
-- gt_cv_have_gettext=no
+# serial 2
-
-- CATOBJEXT=NONE
-- XGETTEXT=:
-- INTLLIBS=
++
+# Check whether the underlying file-system supports filenames
+# with a leading dot. For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
@@ -2441,17 +2442,65 @@
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
-+else
+ else
+- AC_MSG_RESULT(no)
+ am__leading_dot=_
-+fi
+ fi
+-AC_SUBST($1)dnl
+-])
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+-# GLIB_WITH_NLS
+-#-----------------
+-glib_DEFUN([GLIB_WITH_NLS],
+- dnl NLS is obligatory
+- [USE_NLS=yes
+- AC_SUBST(USE_NLS)
++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
++# From Jim Meyering
+
+- gt_cv_have_gettext=no
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 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.
+
+- CATOBJEXT=NONE
+- XGETTEXT=:
+- INTLLIBS=
++# serial 5
- AC_CHECK_HEADER(libintl.h,
- [gt_cv_func_dgettext_libintl="no"
- libintl_extra_libs=""
-+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
-+# From Jim Meyering
++# AM_MAINTAINER_MODE([DEFAULT-MODE])
++# ----------------------------------
++# Control maintainer-specific portions of Makefiles.
++# Default is to disable them, unless `enable' is passed literally.
++# For symmetry, `disable' may be passed as well. Anyway, the user
++# can override the default with the --enable/--disable switch.
++AC_DEFUN([AM_MAINTAINER_MODE],
++[m4_case(m4_default([$1], [disable]),
++ [enable], [m4_define([am_maintainer_other], [disable])],
++ [disable], [m4_define([am_maintainer_other], [enable])],
++ [m4_define([am_maintainer_other], [enable])
++ m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
++AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
++ dnl maintainer-mode's default is 'disable' unless 'enable' is passed
++ AC_ARG_ENABLE([maintainer-mode],
++[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer],
++ [USE_MAINTAINER_MODE=$enableval],
++ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
++ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
++ MAINT=$MAINTAINER_MODE_TRUE
++ AC_SUBST([MAINT])dnl
++]
++)
- #
- # First check in libc
@@ -2479,12 +2528,7 @@
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- fi
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 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.
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
- #
- # If we don't have everything we want, check in libintl
@@ -2497,7 +2541,7 @@
- [AC_CHECK_LIB(intl, ngettext,
- [AC_CHECK_LIB(intl, dgettext,
- gt_cv_func_dgettext_libintl=yes)])])
-+# serial 5
++# Check to see how 'make' treats includes. -*- Autoconf -*-
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
- AC_MSG_CHECKING([if -liconv is needed to use gettext])
@@ -2509,31 +2553,11 @@
- :,-liconv)],
- :,-liconv)
- fi
-+# AM_MAINTAINER_MODE([DEFAULT-MODE])
-+# ----------------------------------
-+# Control maintainer-specific portions of Makefiles.
-+# Default is to disable them, unless `enable' is passed literally.
-+# For symmetry, `disable' may be passed as well. Anyway, the user
-+# can override the default with the --enable/--disable switch.
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[m4_case(m4_default([$1], [disable]),
-+ [enable], [m4_define([am_maintainer_other], [disable])],
-+ [disable], [m4_define([am_maintainer_other], [enable])],
-+ [m4_define([am_maintainer_other], [enable])
-+ m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
-+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
-+ dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-+ AC_ARG_ENABLE([maintainer-mode],
-+[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
-+ (and sometimes confusing) to the casual installer],
-+ [USE_MAINTAINER_MODE=$enableval],
-+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-+ MAINT=$MAINTAINER_MODE_TRUE
-+ AC_SUBST([MAINT])dnl
-+]
-+)
++# Copyright (C) 2001, 2002, 2003, 2005, 2009 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.
- #
- # If we found libintl, then check in it for bind_textdomain_codeset();
@@ -2546,7 +2570,7 @@
- unset ac_cv_func_bind_textdomain_codeset
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- LIBS="$glib_save_LIBS"
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++# serial 4
- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
- gt_cv_func_dgettext_libc=no
@@ -2558,7 +2582,47 @@
- fi
- fi
- fi
-+# Check to see how 'make' treats includes. -*- Autoconf -*-
++# AM_MAKE_INCLUDE()
++# -----------------
++# Check to see how make treats includes.
++AC_DEFUN([AM_MAKE_INCLUDE],
++[am_make=${MAKE-make}
++cat > confinc << 'END'
++am__doit:
++ @echo this is the am__doit target
++.PHONY: am__doit
++END
++# If we don't find an include directive, just comment out the code.
++AC_MSG_CHECKING([for style of include used by $am_make])
++am__include="#"
++am__quote=
++_am_result=none
++# First try GNU make style include.
++echo "include confinc" > confmf
++# Ignore all kinds of additional output from `make'.
++case `$am_make -s -f confmf 2> /dev/null` in #(
++*the\ am__doit\ target*)
++ am__include=include
++ am__quote=
++ _am_result=GNU
++ ;;
++esac
++# Now try BSD make style include.
++if test "$am__include" = "#"; then
++ echo '.include "confinc"' > confmf
++ case `$am_make -s -f confmf 2> /dev/null` in #(
++ *the\ am__doit\ target*)
++ am__include=.include
++ am__quote="\""
++ _am_result=BSD
++ ;;
++ esac
++fi
++AC_SUBST([am__include])
++AC_SUBST([am__quote])
++AC_MSG_RESULT([$_am_result])
++rm -f confinc confmf
++])
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
@@ -2624,17 +2688,18 @@
- fi
- fi
- ])
-+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
+- if test "$gt_cv_have_gettext" = "yes" ; then
+- AC_DEFINE(ENABLE_NLS, 1,
+- [always defined to indicate that i18n is enabled])
+- fi
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 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.
-
-- if test "$gt_cv_have_gettext" = "yes" ; then
-- AC_DEFINE(ENABLE_NLS, 1,
-- [always defined to indicate that i18n is enabled])
-- fi
-+# serial 4
- dnl Test whether we really found GNU xgettext.
- if test "$XGETTEXT" != ":"; then
@@ -2648,73 +2713,29 @@
- XGETTEXT=":"
- fi
- fi
-+# AM_MAKE_INCLUDE()
-+# -----------------
-+# Check to see how make treats includes.
-+AC_DEFUN([AM_MAKE_INCLUDE],
-+[am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+ @echo this is the am__doit target
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+AC_MSG_CHECKING([for style of include used by $am_make])
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# Ignore all kinds of additional output from `make'.
-+case `$am_make -s -f confmf 2> /dev/null` in #(
-+*the\ am__doit\ target*)
-+ am__include=include
-+ am__quote=
-+ _am_result=GNU
-+ ;;
-+esac
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+ echo '.include "confinc"' > confmf
-+ case `$am_make -s -f confmf 2> /dev/null` in #(
-+ *the\ am__doit\ target*)
-+ am__include=.include
-+ am__quote="\""
-+ _am_result=BSD
-+ ;;
-+ esac
-+fi
-+AC_SUBST([am__include])
-+AC_SUBST([am__quote])
-+AC_MSG_RESULT([$_am_result])
-+rm -f confinc confmf
-+])
++# serial 6
- # We need to process the po/ directory.
- POSUB=po
-+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
-- AC_OUTPUT_COMMANDS(
-- [case "$CONFIG_FILES" in *po/Makefile.in*)
-- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-- esac])
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 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 6
-+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
-+
-+
+
+- AC_OUTPUT_COMMANDS(
+- [case "$CONFIG_FILES" in *po/Makefile.in*)
+- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+- esac])
+
+- dnl These rules are solely for the distribution goal. While doing this
+- dnl we only have to keep exactly one list of the available catalogs
+- dnl in configure.in.
+- for lang in $ALL_LINGUAS; do
+- GMOFILES="$GMOFILES $lang.gmo"
+- POFILES="$POFILES $lang.po"
+- done
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
@@ -2880,6 +2901,33 @@
+fi
+AC_MSG_RESULT(yes)])
+
++# Copyright (C) 2009 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 1
++
++# AM_SILENT_RULES([DEFAULT])
++# --------------------------
++# Enable less verbose build rules; with the default set to DEFAULT
++# (`yes' being less verbose, `no' or empty being verbose).
++AC_DEFUN([AM_SILENT_RULES],
++[AC_ARG_ENABLE([silent-rules],
++[ --enable-silent-rules less verbose build output (undo: `make V=1')
++ --disable-silent-rules verbose build output (undo: `make V=0')])
++case $enable_silent_rules in
++yes) AM_DEFAULT_VERBOSITY=0;;
++no) AM_DEFAULT_VERBOSITY=1;;
++*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
++esac
++AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
++AM_BACKSLASH='\'
++AC_SUBST([AM_BACKSLASH])dnl
++_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
++])
++
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
@@ -2907,14 +2955,7 @@
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-- dnl These rules are solely for the distribution goal. While doing this
-- dnl we only have to keep exactly one list of the available catalogs
-- dnl in configure.in.
-- for lang in $ALL_LINGUAS; do
-- GMOFILES="$GMOFILES $lang.gmo"
-- POFILES="$POFILES $lang.po"
-- done
++
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
@@ -3167,45 +3208,23 @@
m4_include([m4/gtk-doc.m4])
m4_include([m4/intltool.m4])
-Index: nautilus-2.28.4/config.guess
+Index: nautilus-2.30.0/config.guess
===================================================================
---- nautilus-2.28.4.orig/config.guess 2009-12-15 10:12:56.000000000 +0100
-+++ nautilus-2.28.4/config.guess 2010-04-09 02:23:22.033092789 +0200
+--- nautilus-2.30.0.orig/config.guess 2010-04-13 23:22:34.147717291 +0200
++++ nautilus-2.30.0/config.guess 2010-04-13 23:22:09.255721834 +0200
@@ -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-11-20'
+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
-@@ -27,16 +27,16 @@
- # 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 @@
GNU config.guess ($timestamp)
@@ -3218,316 +3237,11 @@
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 @@
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-- | grep __ELF__ >/dev/null
-+ | grep -q __ELF__
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
-@@ -333,6 +334,9 @@
- 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 @@
- # => hppa64-hp-hpux11.23
-
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-- grep __LP64__ >/dev/null
-+ grep -q __LP64__
- then
- HP_ARCH="hppa2.0w"
- else
-@@ -807,12 +811,12 @@
- 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 @@
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
-+ 8664:Windows_NT:*)
-+ echo x86_64-pc-mks
-+ exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -851,6 +858,20 @@
- 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 @@
- 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 @@
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-- mips:Linux:*:*)
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #undef CPU
-- #undef mips
-- #undef mipsel
-- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mipsel
-- #else
-- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips
-- #else
-- CPU=
-- #endif
-- #endif
--EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-- /^CPU/{
-- s: ::g
-- p
-- }'`"
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-- ;;
-- mips64:Linux:*:*)
-+ mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
-- #undef mips64
-- #undef mips64el
-+ #undef ${UNAME_MACHINE}
-+ #undef ${UNAME_MACHINE}el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mips64el
-+ CPU=${UNAME_MACHINE}el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips64
-+ CPU=${UNAME_MACHINE}
- #else
- CPU=
- #endif
- #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
-- 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 ;;
-+ 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 @@
- *) 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 @@
- 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 ;;
-- "")
-- # Either a pre-BFD a.out linker (linux-gnuoldld) or
-- # 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
-- 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 @@
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit ;;
-- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- i*86:*DOS:*:*)
-@@ -1182,7 +1113,7 @@
- rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit ;;
-- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- SM[BE]S:UNIX_SV:*:*)
-@@ -1275,6 +1206,16 @@
- *: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
+Index: nautilus-2.30.0/config.h.in
===================================================================
---- nautilus-2.28.4.orig/config.h.in 2009-12-15 10:12:56.000000000 +0100
-+++ nautilus-2.28.4/config.h.in 2010-04-09 02:23:26.000000000 +0200
-@@ -133,7 +133,7 @@
- #undef HAVE_TRACKER
-
- /* Define to enable tracker support */
--#undef HAVE_TRACKER_0_7
-+#undef HAVE_TRACKER_0_8
-
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
-@@ -160,6 +160,9 @@
+--- nautilus-2.30.0.orig/config.h.in 2010-04-13 23:22:31.351717859 +0200
++++ nautilus-2.30.0/config.h.in 2010-04-13 23:22:14.487715058 +0200
+@@ -154,6 +154,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -3537,15 +3251,75 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-Index: nautilus-2.28.4/configure
+Index: nautilus-2.30.0/config.sub
===================================================================
---- nautilus-2.28.4.orig/configure 2009-12-15 10:12:55.000000000 +0100
-+++ nautilus-2.28.4/configure 2010-04-09 02:23:30.645095611 +0200
+--- nautilus-2.30.0.orig/config.sub 2010-04-13 23:22:34.335714983 +0200
++++ nautilus-2.30.0/config.sub 2010-04-13 23:22:09.263718105 +0200
+@@ -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, 2009
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ # Free Software Foundation, Inc.
+
+-timestamp='2009-11-20'
++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
+@@ -75,8 +75,9 @@
+ 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."
+@@ -380,7 +381,8 @@
+ | 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-* \
+@@ -1085,6 +1087,11 @@
+ 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
+@@ -1435,6 +1442,8 @@
+ -dicos*)
+ os=-dicos
+ ;;
++ -nacl*)
++ ;;
+ -none)
+ ;;
+ *)
+Index: nautilus-2.30.0/configure
+===================================================================
+--- nautilus-2.30.0.orig/configure 2010-04-13 23:22:40.491715570 +0200
++++ nautilus-2.30.0/configure 2010-04-13 23:22:20.315711319 +0200
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for nautilus 2.28.4.
-+# Generated by GNU Autoconf 2.65 for nautilus 2.28.4.
+-# Generated by GNU Autoconf 2.63 for nautilus 2.30.0.
++# Generated by GNU Autoconf 2.65 for nautilus 2.30.0.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus>.
#
@@ -4351,14 +4125,14 @@
# Identity of this package.
PACKAGE_NAME='nautilus'
@@ -748,6 +705,7 @@
- PACKAGE_VERSION='2.28.4'
- PACKAGE_STRING='nautilus 2.28.4'
+ PACKAGE_VERSION='2.30.0'
+ PACKAGE_STRING='nautilus 2.30.0'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus'
+PACKAGE_URL=''
ac_unique_file="src"
# Factoring default headers for most tests.
-@@ -1016,6 +974,7 @@
+@@ -1001,6 +959,7 @@
program_transform_name
prefix
exec_prefix
@@ -4366,7 +4140,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1184,8 +1143,7 @@
+@@ -1163,8 +1122,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4376,7 +4150,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1211,8 +1169,7 @@
+@@ -1190,8 +1148,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4386,7 +4160,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1416,8 +1373,7 @@
+@@ -1395,8 +1352,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4396,7 +4170,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1433,8 +1389,7 @@
+@@ -1412,8 +1368,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4406,7 +4180,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1464,17 +1419,17 @@
+@@ -1443,17 +1398,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -4430,7 +4204,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1491,15 +1446,13 @@
+@@ -1470,15 +1425,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -4448,7 +4222,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1522,8 +1475,7 @@
+@@ -1501,8 +1454,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -4458,7 +4232,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1553,11 +1505,9 @@
+@@ -1532,11 +1484,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -4472,7 +4246,7 @@
# Find the source files, if location was not specified.
-@@ -1596,13 +1546,11 @@
+@@ -1575,13 +1525,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -4488,7 +4262,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1720,9 +1668,9 @@
+@@ -1701,9 +1649,9 @@
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--disable-nls do not use Native Language Support
@@ -4500,19 +4274,17 @@
+ --enable-gtk-doc-pdf build documentation in pdf format [[default=no]]
--enable-profiler Enable profiler
--disable-xmp build without xmp support
- --disable-tracker build without tracker support
-@@ -1733,8 +1681,8 @@
+ --enable-empty-view Enable empty view
+@@ -1712,7 +1660,7 @@
--disable-schemas-install
Disable the schemas installation
--disable-update-mimedb disable the update-mime-database after install
- default=no
-- --enable-shave use shave to make the build pretty [default=yes]
+ [default=no]
-+ --enable-shave use shave to make the build pretty [[default=yes]]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-@@ -1755,7 +1703,7 @@
+@@ -1733,7 +1681,7 @@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
@@ -4521,10 +4293,10 @@
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
-@@ -1846,21 +1794,378 @@
+@@ -1817,21 +1765,378 @@
if $ac_init_version; then
cat <<\_ACEOF
- nautilus configure 2.28.4
+ nautilus configure 2.30.0
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.65
@@ -4898,13 +4670,13 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by nautilus $as_me 2.28.4, which was
+ It was created by nautilus $as_me 2.30.0, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
-@@ -1896,8 +2201,8 @@
+@@ -1867,8 +2172,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4915,7 +4687,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1934,9 +2239,9 @@
+@@ -1905,9 +2210,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -4927,7 +4699,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1952,13 +2257,13 @@
+@@ -1923,13 +2228,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -4944,7 +4716,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 @@
+@@ -1954,13 +2259,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -4960,7 +4732,7 @@
esac ;;
esac
done
-@@ -2061,39 +2366,41 @@
+@@ -2032,39 +2337,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -5007,7 +4779,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2111,8 +2418,8 @@
+@@ -2082,8 +2389,8 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -5018,7 +4790,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 @@
+@@ -2091,10 +2398,10 @@
done
if test -r "$cache_file"; then
@@ -5033,7 +4805,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2131,7 +2438,7 @@
+@@ -2102,7 +2409,7 @@
esac
fi
else
@@ -5042,7 +4814,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2146,11 +2453,11 @@
+@@ -2117,11 +2424,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -5056,7 +4828,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2160,17 +2467,17 @@
+@@ -2131,17 +2438,17 @@
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -5078,7 +4850,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2182,43 +2489,20 @@
+@@ -2153,43 +2460,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -5129,7 +4901,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2238,24 +2522,16 @@
+@@ -2209,24 +2493,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -5162,7 +4934,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2281,10 +2557,10 @@
+@@ -2252,10 +2528,10 @@
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
@@ -5175,7 +4947,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2292,11 +2568,11 @@
+@@ -2263,11 +2539,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5191,7 +4963,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2333,7 +2609,7 @@
+@@ -2304,7 +2580,7 @@
;;
esac
@@ -5200,7 +4972,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2349,7 +2625,7 @@
+@@ -2320,7 +2596,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -5209,7 +4981,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2360,7 +2636,7 @@
+@@ -2331,7 +2607,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -5218,7 +4990,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2371,15 +2647,11 @@
+@@ -2342,15 +2618,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -5236,7 +5008,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2401,11 +2673,8 @@
+@@ -2372,11 +2644,8 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -5250,7 +5022,7 @@
fi
test "$2" = conftest.file
-@@ -2414,13 +2683,10 @@
+@@ -2385,13 +2654,10 @@
# Ok.
:
else
@@ -5267,7 +5039,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2448,7 +2714,7 @@
+@@ -2419,7 +2685,7 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -5276,7 +5048,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2469,9 +2735,9 @@
+@@ -2440,9 +2706,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -5288,7 +5060,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2482,24 +2748,24 @@
+@@ -2453,24 +2719,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5318,7 +5090,7 @@
$as_echo "no" >&6; }
fi
-@@ -2509,9 +2775,9 @@
+@@ -2480,9 +2746,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -5330,7 +5102,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2522,24 +2788,24 @@
+@@ -2493,24 +2759,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5360,7 +5132,7 @@
$as_echo "no" >&6; }
fi
-@@ -2548,7 +2814,7 @@
+@@ -2519,7 +2785,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5369,7 +5141,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2561,10 +2827,10 @@
+@@ -2532,10 +2798,10 @@
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -5382,7 +5154,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2572,7 +2838,7 @@
+@@ -2543,7 +2809,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5391,7 +5163,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2584,11 +2850,12 @@
+@@ -2555,11 +2821,12 @@
esac
done
done
@@ -5405,7 +5177,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2596,11 +2863,10 @@
+@@ -2567,11 +2834,10 @@
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
@@ -5418,7 +5190,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2613,9 +2879,9 @@
+@@ -2584,9 +2850,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -5430,7 +5202,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2626,24 +2892,24 @@
+@@ -2597,24 +2863,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5460,7 +5232,7 @@
$as_echo "no" >&6; }
fi
-@@ -2651,11 +2917,11 @@
+@@ -2622,11 +2888,11 @@
test -n "$AWK" && break
done
@@ -5474,7 +5246,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2673,11 +2939,11 @@
+@@ -2644,11 +2910,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -5488,7 +5260,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2697,9 +2963,7 @@
+@@ -2668,9 +2934,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -5499,7 +5271,7 @@
fi
fi
-@@ -2750,7 +3014,7 @@
+@@ -2721,7 +2985,7 @@
AMTAR=${AMTAR-"${am_missing_run}tar"}
@@ -5508,7 +5280,7 @@
$as_echo_n "checking how to create a ustar tar archive... " >&6; }
# Loop over all known methods to create a tar archive until one works.
_am_tools='gnutar plaintar pax cpio none'
-@@ -2823,13 +3087,13 @@
+@@ -2794,13 +3058,13 @@
done
rm -rf conftest.dir
@@ -5524,8 +5296,17 @@
$as_echo "$am_cv_prog_tar_ustar" >&6; }
-@@ -2837,16 +3101,16 @@
-
+@@ -2808,7 +3072,7 @@
+
+
+ # Check whether --enable-silent-rules was given.
+-if test "${enable_silent_rules+set}" = set; then
++if test "${enable_silent_rules+set}" = set; then :
+ enableval=$enable_silent_rules;
+ fi
+
+@@ -2820,16 +3084,16 @@
+ AM_BACKSLASH='\'
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
@@ -5544,7 +5325,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2889,7 +3153,7 @@
+@@ -2872,7 +3136,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -5553,7 +5334,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -2917,12 +3181,12 @@
+@@ -2900,12 +3164,12 @@
fi
@@ -5568,7 +5349,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -2947,9 +3211,9 @@
+@@ -2930,9 +3194,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -5580,7 +5361,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2960,24 +3224,24 @@
+@@ -2943,24 +3207,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5610,7 +5391,7 @@
$as_echo "no" >&6; }
fi
-@@ -2987,9 +3251,9 @@
+@@ -2970,9 +3234,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -5622,7 +5403,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3000,24 +3264,24 @@
+@@ -2983,24 +3247,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5652,7 +5433,7 @@
$as_echo "no" >&6; }
fi
-@@ -3026,7 +3290,7 @@
+@@ -3009,7 +3273,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5661,7 +5442,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3040,9 +3304,9 @@
+@@ -3023,9 +3287,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -5673,7 +5454,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3053,24 +3317,24 @@
+@@ -3036,24 +3300,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5703,7 +5484,7 @@
$as_echo "no" >&6; }
fi
-@@ -3080,9 +3344,9 @@
+@@ -3063,9 +3327,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -5715,7 +5496,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3094,18 +3358,18 @@
+@@ -3077,18 +3341,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5737,7 +5518,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3124,10 +3388,10 @@
+@@ -3107,10 +3371,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -5750,7 +5531,7 @@
$as_echo "no" >&6; }
fi
-@@ -3139,9 +3403,9 @@
+@@ -3122,9 +3386,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -5762,7 +5543,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3152,24 +3416,24 @@
+@@ -3135,24 +3399,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5792,7 +5573,7 @@
$as_echo "no" >&6; }
fi
-@@ -3183,9 +3447,9 @@
+@@ -3166,9 +3430,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -5804,7 +5585,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3196,24 +3460,24 @@
+@@ -3179,24 +3443,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5834,7 +5615,7 @@
$as_echo "no" >&6; }
fi
-@@ -3226,7 +3490,7 @@
+@@ -3209,7 +3473,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5843,7 +5624,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3237,57 +3501,37 @@
+@@ -3220,57 +3484,37 @@
fi
@@ -5921,7 +5702,7 @@
/* end confdefs.h. */
int
-@@ -3303,8 +3547,8 @@
+@@ -3286,8 +3530,8 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -5932,7 +5713,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3320,17 +3564,17 @@
+@@ -3303,17 +3547,17 @@
done
rm -f $ac_rmfiles
@@ -5955,7 +5736,7 @@
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3347,7 +3591,7 @@
+@@ -3330,7 +3574,7 @@
# certainly right.
break;;
*.* )
@@ -5964,7 +5745,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3366,84 +3610,42 @@
+@@ -3349,84 +3593,42 @@
else
ac_file=''
fi
@@ -6070,7 +5851,7 @@
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3458,32 +3660,83 @@
+@@ -3441,32 +3643,83 @@
esac
done
else
@@ -6170,7 +5951,7 @@
/* end confdefs.h. */
int
-@@ -3495,17 +3748,17 @@
+@@ -3478,17 +3731,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -6193,7 +5974,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3518,31 +3771,23 @@
+@@ -3501,31 +3754,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -6232,7 +6013,7 @@
/* end confdefs.h. */
int
-@@ -3556,37 +3801,16 @@
+@@ -3539,37 +3784,16 @@
return 0;
}
_ACEOF
@@ -6273,7 +6054,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3595,20 +3819,16 @@
+@@ -3578,20 +3802,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -6297,7 +6078,7 @@
/* end confdefs.h. */
int
-@@ -3619,35 +3839,11 @@
+@@ -3602,35 +3822,11 @@
return 0;
}
_ACEOF
@@ -6336,7 +6117,7 @@
/* end confdefs.h. */
int
-@@ -3658,36 +3854,12 @@
+@@ -3641,36 +3837,12 @@
return 0;
}
_ACEOF
@@ -6377,7 +6158,7 @@
/* end confdefs.h. */
int
-@@ -3698,42 +3870,17 @@
+@@ -3681,42 +3853,17 @@
return 0;
}
_ACEOF
@@ -6422,7 +6203,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3750,18 +3897,14 @@
+@@ -3733,18 +3880,14 @@
CFLAGS=
fi
fi
@@ -6444,7 +6225,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3818,32 +3961,9 @@
+@@ -3801,32 +3944,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -6478,7 +6259,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3854,17 +3974,19 @@
+@@ -3837,17 +3957,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -6501,7 +6282,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3874,9 +3996,9 @@
+@@ -3857,9 +3979,9 @@
depcc="$CC" am_compiler_list=
@@ -6513,7 +6294,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3984,7 +4106,7 @@
+@@ -3967,7 +4089,7 @@
fi
fi
@@ -6522,7 +6303,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4005,14 +4127,14 @@
+@@ -3988,14 +4110,14 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -6539,7 +6320,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -4027,11 +4149,7 @@
+@@ -4010,11 +4132,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -6552,7 +6333,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4040,78 +4158,34 @@
+@@ -4023,78 +4141,34 @@
#endif
Syntax error
_ACEOF
@@ -6636,7 +6417,7 @@
break
fi
-@@ -4123,7 +4197,7 @@
+@@ -4106,7 +4180,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -6645,7 +6426,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -4134,11 +4208,7 @@
+@@ -4117,11 +4191,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -6658,7 +6439,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4147,87 +4217,40 @@
+@@ -4130,87 +4200,40 @@
#endif
Syntax error
_ACEOF
@@ -6755,7 +6536,7 @@
fi
ac_ext=c
-@@ -4237,9 +4260,9 @@
+@@ -4220,9 +4243,9 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -6767,7 +6548,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4250,7 +4273,7 @@
+@@ -4233,7 +4256,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6776,7 +6557,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -4270,7 +4293,7 @@
+@@ -4253,7 +4276,7 @@
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -6785,7 +6566,7 @@
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -4285,26 +4308,24 @@
+@@ -4268,26 +4291,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -6817,7 +6598,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4318,7 +4339,7 @@
+@@ -4301,7 +4322,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6826,7 +6607,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -4338,7 +4359,7 @@
+@@ -4321,7 +4342,7 @@
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -6835,7 +6616,7 @@
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4353,12 +4374,10 @@
+@@ -4336,12 +4357,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -6850,7 +6631,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4366,21 +4385,17 @@
+@@ -4349,21 +4368,17 @@
fi
fi
@@ -6876,7 +6657,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -4395,48 +4410,23 @@
+@@ -4378,48 +4393,23 @@
return 0;
}
_ACEOF
@@ -6930,7 +6711,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4446,18 +4436,14 @@
+@@ -4429,18 +4419,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -6952,7 +6733,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4467,14 +4453,10 @@
+@@ -4450,14 +4436,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -6969,7 +6750,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -4501,118 +4483,34 @@
+@@ -4484,118 +4466,34 @@
return 0;
}
_ACEOF
@@ -7101,7 +6882,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -4622,19 +4520,14 @@
+@@ -4605,19 +4503,14 @@
done
@@ -7124,7 +6905,7 @@
/* end confdefs.h. */
#ifndef __APPLE_CC__
not a universal capable compiler
-@@ -4642,46 +4535,34 @@
+@@ -4625,46 +4518,34 @@
typedef int dummy;
_ACEOF
@@ -7193,7 +6974,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-@@ -4699,30 +4580,9 @@
+@@ -4682,30 +4563,9 @@
return 0;
}
_ACEOF
@@ -7226,7 +7007,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-@@ -4738,49 +4598,18 @@
+@@ -4721,49 +4581,18 @@
return 0;
}
_ACEOF
@@ -7279,7 +7060,7 @@
/* end confdefs.h. */
#include <limits.h>
-@@ -4795,30 +4624,9 @@
+@@ -4778,30 +4607,9 @@
return 0;
}
_ACEOF
@@ -7312,7 +7093,7 @@
/* end confdefs.h. */
#include <limits.h>
-@@ -4833,51 +4641,20 @@
+@@ -4816,51 +4624,20 @@
return 0;
}
_ACEOF
@@ -7368,7 +7149,7 @@
/* end confdefs.h. */
short int ascii_mm[] =
{ 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-@@ -4903,24 +4680,7 @@
+@@ -4886,24 +4663,7 @@
return 0;
}
_ACEOF
@@ -7394,7 +7175,7 @@
if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
ac_cv_c_bigendian=yes
fi
-@@ -4932,20 +4692,10 @@
+@@ -4915,20 +4675,10 @@
ac_cv_c_bigendian=unknown
fi
fi
@@ -7416,7 +7197,7 @@
/* end confdefs.h. */
$ac_includes_default
int
-@@ -4965,79 +4715,41 @@
+@@ -4948,79 +4698,41 @@
return 0;
}
_ACEOF
@@ -7508,7 +7289,7 @@
/* end confdefs.h. */
int
-@@ -5097,41 +4809,18 @@
+@@ -5080,41 +4792,18 @@
return 0;
}
_ACEOF
@@ -7554,7 +7335,7 @@
fi
-@@ -5143,9 +4832,9 @@
+@@ -5126,9 +4815,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -7566,7 +7347,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5156,24 +4845,24 @@
+@@ -5139,24 +4828,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7596,7 +7377,7 @@
$as_echo "no" >&6; }
fi
-@@ -5183,9 +4872,9 @@
+@@ -5166,9 +4855,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -7608,7 +7389,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -5196,24 +4885,24 @@
+@@ -5179,24 +4868,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7638,7 +7419,7 @@
$as_echo "no" >&6; }
fi
-@@ -5222,7 +4911,7 @@
+@@ -5205,7 +4894,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7647,7 +7428,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5236,9 +4925,9 @@
+@@ -5219,9 +4908,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -7659,7 +7440,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5249,24 +4938,24 @@
+@@ -5232,24 +4921,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7689,7 +7470,7 @@
$as_echo "no" >&6; }
fi
-@@ -5276,9 +4965,9 @@
+@@ -5259,9 +4948,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -7701,7 +7482,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5290,18 +4979,18 @@
+@@ -5273,18 +4962,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7723,7 +7504,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -5320,10 +5009,10 @@
+@@ -5303,10 +4992,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7736,7 +7517,7 @@
$as_echo "no" >&6; }
fi
-@@ -5335,9 +5024,9 @@
+@@ -5318,9 +5007,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -7748,7 +7529,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5348,24 +5037,24 @@
+@@ -5331,24 +5020,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7778,7 +7559,7 @@
$as_echo "no" >&6; }
fi
-@@ -5379,9 +5068,9 @@
+@@ -5362,9 +5051,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -7790,7 +7571,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -5392,24 +5081,24 @@
+@@ -5375,24 +5064,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7820,7 +7601,7 @@
$as_echo "no" >&6; }
fi
-@@ -5422,7 +5111,7 @@
+@@ -5405,7 +5094,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7829,7 +7610,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5433,62 +5122,42 @@
+@@ -5416,62 +5105,42 @@
fi
@@ -7914,7 +7695,7 @@
/* end confdefs.h. */
int
-@@ -5502,37 +5171,16 @@
+@@ -5485,37 +5154,16 @@
return 0;
}
_ACEOF
@@ -7955,7 +7736,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -5541,20 +5189,16 @@
+@@ -5524,20 +5172,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -7979,7 +7760,7 @@
/* end confdefs.h. */
int
-@@ -5565,35 +5209,11 @@
+@@ -5548,35 +5192,11 @@
return 0;
}
_ACEOF
@@ -8018,7 +7799,7 @@
/* end confdefs.h. */
int
-@@ -5604,36 +5224,12 @@
+@@ -5587,36 +5207,12 @@
return 0;
}
_ACEOF
@@ -8059,7 +7840,7 @@
/* end confdefs.h. */
int
-@@ -5644,42 +5240,17 @@
+@@ -5627,42 +5223,17 @@
return 0;
}
_ACEOF
@@ -8104,7 +7885,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -5696,18 +5267,14 @@
+@@ -5679,18 +5250,14 @@
CFLAGS=
fi
fi
@@ -8126,7 +7907,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -5764,32 +5331,9 @@
+@@ -5747,32 +5314,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -8160,7 +7941,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -5800,17 +5344,19 @@
+@@ -5783,17 +5327,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -8183,7 +7964,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5820,9 +5366,9 @@
+@@ -5803,9 +5349,9 @@
depcc="$CC" am_compiler_list=
@@ -8195,7 +7976,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5930,7 +5476,7 @@
+@@ -5913,7 +5459,7 @@
fi
fi
@@ -8204,7 +7985,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -5950,14 +5496,14 @@
+@@ -5933,14 +5479,14 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -8221,7 +8002,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -5972,11 +5518,7 @@
+@@ -5955,11 +5501,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -8234,7 +8015,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5985,78 +5527,34 @@
+@@ -5968,78 +5510,34 @@
#endif
Syntax error
_ACEOF
@@ -8318,7 +8099,7 @@
break
fi
-@@ -6068,7 +5566,7 @@
+@@ -6051,7 +5549,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -8327,7 +8108,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -6079,11 +5577,7 @@
+@@ -6062,11 +5560,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -8340,7 +8121,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -6092,87 +5586,40 @@
+@@ -6075,87 +5569,40 @@
#endif
Syntax error
_ACEOF
@@ -8437,7 +8218,7 @@
fi
ac_ext=c
-@@ -6181,115 +5628,23 @@
+@@ -6164,115 +5611,23 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -8558,7 +8339,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -6307,17 +5662,17 @@
+@@ -6290,17 +5645,17 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -8579,7 +8360,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -6349,35 +5704,27 @@
+@@ -6332,35 +5687,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -8622,7 +8403,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -6393,28 +5740,24 @@
+@@ -6376,28 +5723,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -8656,7 +8437,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -6437,9 +5780,9 @@
+@@ -6420,9 +5763,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
set dummy ${ac_tool_prefix}as; ac_word=$2
@@ -8668,7 +8449,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AS"; then
-@@ -6450,24 +5793,24 @@
+@@ -6433,24 +5776,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8698,7 +8479,7 @@
$as_echo "no" >&6; }
fi
-@@ -6477,9 +5820,9 @@
+@@ -6460,9 +5803,9 @@
ac_ct_AS=$AS
# Extract the first word of "as", so it can be a program name with args.
set dummy as; ac_word=$2
@@ -8710,7 +8491,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AS"; then
-@@ -6490,24 +5833,24 @@
+@@ -6473,24 +5816,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8740,7 +8521,7 @@
$as_echo "no" >&6; }
fi
-@@ -6516,7 +5859,7 @@
+@@ -6499,7 +5842,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8749,7 +8530,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6529,9 +5872,9 @@
+@@ -6512,9 +5855,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
set dummy ${ac_tool_prefix}dlltool; ac_word=$2
@@ -8761,7 +8542,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DLLTOOL"; then
-@@ -6542,24 +5885,24 @@
+@@ -6525,24 +5868,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8791,7 +8572,7 @@
$as_echo "no" >&6; }
fi
-@@ -6569,9 +5912,9 @@
+@@ -6552,9 +5895,9 @@
ac_ct_DLLTOOL=$DLLTOOL
# Extract the first word of "dlltool", so it can be a program name with args.
set dummy dlltool; ac_word=$2
@@ -8803,7 +8584,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DLLTOOL"; then
-@@ -6582,24 +5925,24 @@
+@@ -6565,24 +5908,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8833,7 +8614,7 @@
$as_echo "no" >&6; }
fi
-@@ -6608,7 +5951,7 @@
+@@ -6591,7 +5934,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8842,7 +8623,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6621,9 +5964,9 @@
+@@ -6604,9 +5947,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -8854,7 +8635,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -6634,24 +5977,24 @@
+@@ -6617,24 +5960,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8884,7 +8665,7 @@
$as_echo "no" >&6; }
fi
-@@ -6661,9 +6004,9 @@
+@@ -6644,9 +5987,9 @@
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -8896,7 +8677,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -6674,24 +6017,24 @@
+@@ -6657,24 +6000,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8926,7 +8707,7 @@
$as_echo "no" >&6; }
fi
-@@ -6700,7 +6043,7 @@
+@@ -6683,7 +6026,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8935,7 +8716,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6735,14 +6078,14 @@
+@@ -6718,7 +6061,7 @@
case `pwd` in
*\ * | *\ *)
@@ -8944,16 +8725,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-
-
--macro_version='2.2.6'
--macro_revision='1.3012'
-+macro_version='2.2.6b'
-+macro_revision='1.3017'
-
-
-
-@@ -6758,9 +6101,9 @@
+@@ -6741,9 +6084,9 @@
ltmain="$ac_aux_dir/ltmain.sh"
@@ -8965,7 +8737,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -6768,7 +6111,7 @@
+@@ -6751,7 +6094,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -8974,7 +8746,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -6777,7 +6120,7 @@
+@@ -6760,7 +6103,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8983,7 +8755,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -6797,7 +6140,7 @@
+@@ -6780,7 +6123,7 @@
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -8992,7 +8764,7 @@
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
-@@ -6812,19 +6155,17 @@
+@@ -6795,19 +6138,17 @@
$ac_path_SED_found && break 3
done
done
@@ -9015,7 +8787,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -6842,9 +6183,9 @@
+@@ -6825,9 +6166,9 @@
@@ -9027,7 +8799,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -6858,7 +6199,7 @@
+@@ -6841,7 +6182,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9036,7 +8808,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -6878,7 +6219,7 @@
+@@ -6861,7 +6202,7 @@
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -9045,7 +8817,7 @@
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -6893,12 +6234,10 @@
+@@ -6876,12 +6217,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -9060,7 +8832,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -6906,7 +6245,7 @@
+@@ -6889,7 +6228,7 @@
fi
fi
@@ -9069,7 +8841,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -6932,7 +6271,7 @@
+@@ -6915,7 +6254,7 @@
# Check whether --with-gnu-ld was given.
@@ -9078,7 +8850,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -6941,7 +6280,7 @@
+@@ -6924,7 +6263,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -9087,7 +8859,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -6971,13 +6310,13 @@
+@@ -6954,13 +6293,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -9104,7 +8876,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -7008,18 +6347,16 @@
+@@ -6991,18 +6330,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -9128,7 +8900,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 @@
+@@ -7015,7 +6352,7 @@
;;
esac
fi
@@ -9137,7 +8909,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -7044,9 +6381,9 @@
+@@ -7027,9 +6364,9 @@
@@ -9149,7 +8921,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -7093,7 +6430,7 @@
+@@ -7076,7 +6413,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -9158,7 +8930,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 @@
+@@ -7087,9 +6424,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -9170,7 +8942,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -7117,24 +6454,24 @@
+@@ -7100,24 +6437,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9200,7 +8972,7 @@
$as_echo "no" >&6; }
fi
-@@ -7148,9 +6485,9 @@
+@@ -7131,9 +6468,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -9212,7 +8984,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -7161,24 +6498,24 @@
+@@ -7144,24 +6481,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9242,7 +9014,7 @@
$as_echo "no" >&6; }
fi
-@@ -7191,7 +6528,7 @@
+@@ -7174,7 +6511,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9251,7 +9023,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7211,33 +6548,33 @@
+@@ -7194,33 +6531,33 @@
@@ -9264,16 +9036,16 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:7221: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6558: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:7204: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6541: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:7224: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6561: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:7207: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6544: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:7227: output\"" >&5)
-+ (eval echo "\"\$as_me:6564: output\"" >&5)
+- (eval echo "\"\$as_me:7210: output\"" >&5)
++ (eval echo "\"\$as_me:6547: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -9293,7 +9065,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -7355,10 +6692,10 @@
+@@ -7338,10 +6675,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -9306,7 +9078,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -7372,7 +6709,7 @@
+@@ -7355,7 +6692,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -9315,7 +9087,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -7382,17 +6719,17 @@
+@@ -7365,17 +6702,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -9336,7 +9108,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -7427,14 +6764,14 @@
+@@ -7410,14 +6747,14 @@
@@ -9354,7 +9126,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -7463,9 +6800,9 @@
+@@ -7446,9 +6783,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -9366,7 +9138,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -7476,24 +6813,24 @@
+@@ -7459,24 +6796,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9396,7 +9168,7 @@
$as_echo "no" >&6; }
fi
-@@ -7503,9 +6840,9 @@
+@@ -7486,9 +6823,9 @@
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -9408,7 +9180,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -7516,24 +6853,24 @@
+@@ -7499,24 +6836,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9438,7 +9210,7 @@
$as_echo "no" >&6; }
fi
-@@ -7542,7 +6879,7 @@
+@@ -7525,7 +6862,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9447,7 +9219,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7559,9 +6896,9 @@
+@@ -7542,9 +6879,9 @@
@@ -9459,7 +9231,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -7676,11 +7013,11 @@
+@@ -7659,11 +6996,11 @@
;;
# This must be Linux ELF.
@@ -9473,7 +9245,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -7755,7 +7092,7 @@
+@@ -7738,7 +7075,7 @@
esac
fi
@@ -9482,7 +9254,7 @@
$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -7775,9 +7112,9 @@
+@@ -7758,9 +7095,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -9494,7 +9266,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -7788,24 +7125,24 @@
+@@ -7771,24 +7108,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9524,7 +9296,7 @@
$as_echo "no" >&6; }
fi
-@@ -7815,9 +7152,9 @@
+@@ -7798,9 +7135,9 @@
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -9536,7 +9308,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -7828,24 +7165,24 @@
+@@ -7811,24 +7148,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9566,7 +9338,7 @@
$as_echo "no" >&6; }
fi
-@@ -7854,7 +7191,7 @@
+@@ -7837,7 +7174,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9575,7 +9347,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7880,9 +7217,9 @@
+@@ -7863,9 +7200,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -9587,7 +9359,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -7893,24 +7230,24 @@
+@@ -7876,24 +7213,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9617,7 +9389,7 @@
$as_echo "no" >&6; }
fi
-@@ -7920,9 +7257,9 @@
+@@ -7903,9 +7240,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -9629,7 +9401,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -7933,24 +7270,24 @@
+@@ -7916,24 +7253,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9659,7 +9431,7 @@
$as_echo "no" >&6; }
fi
-@@ -7959,7 +7296,7 @@
+@@ -7942,7 +7279,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9668,7 +9440,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7979,9 +7316,9 @@
+@@ -7962,9 +7299,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -9680,7 +9452,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -7992,24 +7329,24 @@
+@@ -7975,24 +7312,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9710,7 +9482,7 @@
$as_echo "no" >&6; }
fi
-@@ -8019,9 +7356,9 @@
+@@ -8002,9 +7339,9 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -9722,7 +9494,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -8032,24 +7369,24 @@
+@@ -8015,24 +7352,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9752,7 +9524,7 @@
$as_echo "no" >&6; }
fi
-@@ -8058,7 +7395,7 @@
+@@ -8041,7 +7378,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9761,7 +9533,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8136,9 +7473,9 @@
+@@ -8119,9 +7456,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -9773,7 +9545,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -8254,18 +7591,18 @@
+@@ -8237,18 +7574,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -9798,7 +9570,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -8318,11 +7655,11 @@
+@@ -8301,11 +7638,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -9813,7 +9585,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -8356,10 +7693,10 @@
+@@ -8339,10 +7676,10 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -9826,7 +9598,7 @@
$as_echo "ok" >&6; }
fi
-@@ -8385,7 +7722,7 @@
+@@ -8368,7 +7705,7 @@
# Check whether --enable-libtool-lock was given.
@@ -9835,7 +9607,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -8397,11 +7734,11 @@
+@@ -8380,11 +7717,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9850,13 +9622,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -8415,12 +7752,12 @@
+@@ -8398,12 +7735,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 8418 "configure"' > conftest.$ac_ext
+- echo '#line 8401 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 7755 "configure"' > conftest.$ac_ext
++ echo '#line 7738 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9867,7 +9639,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -8454,11 +7791,11 @@
+@@ -8437,11 +7774,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9882,7 +9654,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -8507,9 +7844,9 @@
+@@ -8490,9 +7827,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -9894,7 +9666,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -8518,11 +7855,7 @@
+@@ -8501,11 +7838,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -9907,7 +9679,7 @@
/* end confdefs.h. */
int
-@@ -8533,38 +7866,13 @@
+@@ -8516,38 +7849,13 @@
return 0;
}
_ACEOF
@@ -9950,7 +9722,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -8572,7 +7880,7 @@
+@@ -8555,7 +7863,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -9959,7 +9731,7 @@
$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -8582,11 +7890,11 @@
+@@ -8565,11 +7873,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9974,7 +9746,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -8612,9 +7920,9 @@
+@@ -8595,9 +7903,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -9986,7 +9758,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -8625,24 +7933,24 @@
+@@ -8608,24 +7916,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10016,7 +9788,7 @@
$as_echo "no" >&6; }
fi
-@@ -8652,9 +7960,9 @@
+@@ -8635,9 +7943,9 @@
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
@@ -10028,7 +9800,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -8665,24 +7973,24 @@
+@@ -8648,24 +7956,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10058,7 +9830,7 @@
$as_echo "no" >&6; }
fi
-@@ -8691,7 +7999,7 @@
+@@ -8674,7 +7982,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10067,7 +9839,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8704,9 +8012,9 @@
+@@ -8687,9 +7995,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -10079,7 +9851,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -8717,24 +8025,24 @@
+@@ -8700,24 +8008,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10109,7 +9881,7 @@
$as_echo "no" >&6; }
fi
-@@ -8744,9 +8052,9 @@
+@@ -8727,9 +8035,9 @@
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
@@ -10121,7 +9893,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -8757,24 +8065,24 @@
+@@ -8740,24 +8048,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10151,7 +9923,7 @@
$as_echo "no" >&6; }
fi
-@@ -8783,7 +8091,7 @@
+@@ -8766,7 +8074,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10160,7 +9932,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8796,9 +8104,9 @@
+@@ -8779,9 +8087,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -10172,7 +9944,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -8809,24 +8117,24 @@
+@@ -8792,24 +8100,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10202,7 +9974,7 @@
$as_echo "no" >&6; }
fi
-@@ -8836,9 +8144,9 @@
+@@ -8819,9 +8127,9 @@
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
@@ -10214,7 +9986,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -8849,24 +8157,24 @@
+@@ -8832,24 +8140,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10244,7 +10016,7 @@
$as_echo "no" >&6; }
fi
-@@ -8875,7 +8183,7 @@
+@@ -8858,7 +8166,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10253,7 +10025,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8888,9 +8196,9 @@
+@@ -8871,9 +8179,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -10265,7 +10037,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -8901,24 +8209,24 @@
+@@ -8884,24 +8192,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10295,7 +10067,7 @@
$as_echo "no" >&6; }
fi
-@@ -8928,9 +8236,9 @@
+@@ -8911,9 +8219,9 @@
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
@@ -10307,7 +10079,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -8941,24 +8249,24 @@
+@@ -8924,24 +8232,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10337,7 +10109,7 @@
$as_echo "no" >&6; }
fi
-@@ -8967,7 +8275,7 @@
+@@ -8950,7 +8258,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10346,7 +10118,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8980,9 +8288,9 @@
+@@ -8963,9 +8271,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -10358,7 +10130,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -8993,24 +8301,24 @@
+@@ -8976,24 +8284,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10388,7 +10160,7 @@
$as_echo "no" >&6; }
fi
-@@ -9020,9 +8328,9 @@
+@@ -9003,9 +8311,9 @@
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
@@ -10400,7 +10172,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -9033,24 +8341,24 @@
+@@ -9016,24 +8324,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10430,7 +10202,7 @@
$as_echo "no" >&6; }
fi
-@@ -9059,7 +8367,7 @@
+@@ -9042,7 +8350,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10439,7 +10211,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9095,9 +8403,9 @@
+@@ -9078,9 +8386,9 @@
@@ -10451,7 +10223,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -9122,22 +8430,18 @@
+@@ -9105,22 +8413,18 @@
rm -f conftest.*
fi
fi
@@ -10478,7 +10250,7 @@
/* end confdefs.h. */
int
-@@ -9148,42 +8452,17 @@
+@@ -9131,42 +8435,17 @@
return 0;
}
_ACEOF
@@ -10526,7 +10298,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -9220,62 +8499,13 @@
+@@ -9203,62 +8482,13 @@
;;
esac
@@ -10594,7 +10366,7 @@
_ACEOF
fi
-@@ -9293,7 +8523,7 @@
+@@ -9276,7 +8506,7 @@
# Check whether --enable-shared was given.
@@ -10603,7 +10375,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -9326,7 +8556,7 @@
+@@ -9309,7 +8539,7 @@
# Check whether --with-pic was given.
@@ -10612,7 +10384,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -9342,7 +8572,7 @@
+@@ -9325,7 +8555,7 @@
# Check whether --enable-fast-install was given.
@@ -10621,7 +10393,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -9423,9 +8653,9 @@
+@@ -9406,9 +8636,9 @@
setopt NO_GLOB_SUBST
fi
@@ -10633,7 +10405,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -9438,7 +8668,7 @@
+@@ -9421,7 +8651,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -10642,7 +10414,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -9531,9 +8761,9 @@
+@@ -9514,9 +8744,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -10654,7 +10426,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9584,10 +8814,10 @@
+@@ -9567,10 +8797,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -10667,7 +10439,7 @@
$as_echo "no" >&6; }
fi
-@@ -9597,9 +8827,9 @@
+@@ -9580,9 +8810,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -10679,7 +10451,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9650,10 +8880,10 @@
+@@ -9633,10 +8863,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -10692,7 +10464,7 @@
$as_echo "no" >&6; }
fi
-@@ -9734,9 +8964,9 @@
+@@ -9717,9 +8947,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -10704,21 +10476,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9752,11 +8982,11 @@
+@@ -9735,11 +8965,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9755: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8985: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9738: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8968: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9759: \$? = $ac_status" >&5
-+ echo "$as_me:8989: \$? = $ac_status" >&5
+- echo "$as_me:9742: \$? = $ac_status" >&5
++ echo "$as_me:8972: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9769,7 +8999,7 @@
+@@ -9752,7 +8982,7 @@
$RM conftest*
fi
@@ -10727,7 +10499,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 @@
+@@ -9772,7 +9002,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -10736,7 +10508,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -9921,7 +9151,7 @@
+@@ -9904,7 +9134,7 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -10745,7 +10517,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -10061,7 +9291,7 @@
+@@ -10044,7 +9274,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -10754,7 +10526,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -10073,9 +9303,9 @@
+@@ -10056,9 +9286,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -10766,21 +10538,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -10091,11 +9321,11 @@
+@@ -10074,11 +9304,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:10094: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9324: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:10077: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9307: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:10098: \$? = $ac_status" >&5
-+ echo "$as_me:9328: \$? = $ac_status" >&5
+- echo "$as_me:10081: \$? = $ac_status" >&5
++ echo "$as_me:9311: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -10108,7 +9338,7 @@
+@@ -10091,7 +9321,7 @@
$RM conftest*
fi
@@ -10789,7 +10561,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 @@
+@@ -10115,9 +9345,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -10801,7 +10573,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -10160,7 +9390,7 @@
+@@ -10143,7 +9373,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -10810,7 +10582,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 @@
+@@ -10158,9 +9388,9 @@
@@ -10822,21 +10594,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10196,11 +9426,11 @@
+@@ -10179,11 +9409,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:10199: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9429: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:10182: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9412: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:10203: \$? = $ac_status" >&5
-+ echo "$as_me:9433: \$? = $ac_status" >&5
+- echo "$as_me:10186: \$? = $ac_status" >&5
++ echo "$as_me:9416: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -10222,7 +9452,7 @@
+@@ -10205,7 +9435,7 @@
$RM conftest*
fi
@@ -10845,7 +10617,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10230,9 +9460,9 @@
+@@ -10213,9 +9443,9 @@
@@ -10857,21 +10629,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10251,11 +9481,11 @@
+@@ -10234,11 +9464,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:10254: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9484: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:10237: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9467: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:10258: \$? = $ac_status" >&5
-+ echo "$as_me:9488: \$? = $ac_status" >&5
+- echo "$as_me:10241: \$? = $ac_status" >&5
++ echo "$as_me:9471: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -10277,7 +9507,7 @@
+@@ -10260,7 +9490,7 @@
$RM conftest*
fi
@@ -10880,7 +10652,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10286,7 +9516,7 @@
+@@ -10269,7 +9499,7 @@
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -10889,7 +10661,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -10294,10 +9524,10 @@
+@@ -10277,10 +9507,10 @@
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -10902,7 +10674,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -10310,7 +9540,7 @@
+@@ -10293,7 +9523,7 @@
@@ -10911,7 +10683,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -10370,6 +9600,9 @@
+@@ -10353,6 +9583,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -10921,7 +10693,7 @@
esac
ld_shlibs=yes
-@@ -10391,6 +9624,7 @@
+@@ -10374,6 +9607,7 @@
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -10929,7 +10701,7 @@
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -10482,7 +9716,7 @@
+@@ -10465,7 +9699,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -10938,7 +10710,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -10552,7 +9786,7 @@
+@@ -10535,7 +9769,7 @@
fi
;;
@@ -10947,7 +10719,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 @@
+@@ -10710,6 +9944,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -10955,7 +10727,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10752,11 +9987,7 @@
+@@ -10735,11 +9970,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -10968,7 +10740,7 @@
/* end confdefs.h. */
int
-@@ -10767,27 +9998,7 @@
+@@ -10750,27 +9981,7 @@
return 0;
}
_ACEOF
@@ -10997,7 +10769,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10801,16 +10012,9 @@
+@@ -10784,16 +9995,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -11016,7 +10788,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 @@
+@@ -10806,11 +10010,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -11029,7 +10801,7 @@
/* end confdefs.h. */
int
-@@ -10838,27 +10038,7 @@
+@@ -10821,27 +10021,7 @@
return 0;
}
_ACEOF
@@ -11058,7 +10830,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10872,16 +10052,9 @@
+@@ -10855,16 +10035,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -11077,7 +10849,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 @@
+@@ -11076,42 +10249,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -11125,7 +10897,7 @@
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11141,7 +10288,7 @@
+@@ -11124,7 +10271,7 @@
link_all_deplibs=yes
;;
@@ -11134,7 +10906,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11384,7 +10531,7 @@
+@@ -11367,7 +10514,7 @@
fi
fi
@@ -11143,7 +10915,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -11421,16 +10568,16 @@
+@@ -11404,16 +10551,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -11164,7 +10936,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -11444,11 +10591,11 @@
+@@ -11427,11 +10574,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -11179,7 +10951,7 @@
then
archive_cmds_need_lc=no
else
-@@ -11459,7 +10606,7 @@
+@@ -11442,7 +10589,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -11188,7 +10960,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -11623,7 +10770,7 @@
+@@ -11606,7 +10753,7 @@
@@ -11197,7 +10969,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -12031,7 +11178,7 @@
+@@ -12014,7 +11161,7 @@
;;
# This must be Linux ELF.
@@ -11206,7 +10978,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -12045,11 +11192,7 @@
+@@ -12028,11 +11175,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -11219,7 +10991,7 @@
/* end confdefs.h. */
int
-@@ -12060,41 +11203,13 @@
+@@ -12043,41 +11186,13 @@
return 0;
}
_ACEOF
@@ -11265,7 +11037,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -12103,13 +11218,10 @@
+@@ -12086,13 +11201,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -11280,7 +11052,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -12121,6 +11233,18 @@
+@@ -12104,6 +11216,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11299,7 +11071,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -12309,7 +11433,7 @@
+@@ -12292,7 +11416,7 @@
dynamic_linker=no
;;
esac
@@ -11308,7 +11080,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -12411,7 +11535,7 @@
+@@ -12394,7 +11518,7 @@
@@ -11317,7 +11089,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 @@
+@@ -12419,7 +11543,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -11326,7 +11098,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -12481,18 +11605,14 @@
+@@ -12464,18 +11588,14 @@
darwin*)
# if libdl is installed we need to link against it
@@ -11348,7 +11120,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12510,43 +11630,18 @@
+@@ -12493,43 +11613,18 @@
return 0;
}
_ACEOF
@@ -11398,7 +11170,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -12559,33 +11654,19 @@
+@@ -12542,33 +11637,19 @@
;;
*)
@@ -11442,7 +11214,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 @@
+@@ -12577,13 +11658,6 @@
extern "C"
#endif
char shl_load ();
@@ -11456,7 +11228,7 @@
int
main ()
{
-@@ -12609,56 +11683,32 @@
+@@ -12592,56 +11666,32 @@
return 0;
}
_ACEOF
@@ -11532,7 +11304,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12667,81 +11717,38 @@
+@@ -12650,81 +11700,38 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -11631,7 +11403,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 @@
+@@ -12733,13 +11740,6 @@
extern "C"
#endif
char dlopen ();
@@ -11645,7 +11417,7 @@
int
main ()
{
-@@ -12765,192 +11765,28 @@
+@@ -12748,192 +11748,28 @@
return 0;
}
_ACEOF
@@ -11847,7 +11619,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12968,43 +11804,18 @@
+@@ -12951,43 +11787,18 @@
return 0;
}
_ACEOF
@@ -11897,7 +11669,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -13043,9 +11854,9 @@
+@@ -13026,9 +11837,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -11909,16 +11681,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -13054,7 +11865,7 @@
+@@ -13037,7 +11848,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 13057 "configure"
-+#line 11868 "configure"
+-#line 13040 "configure"
++#line 11851 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13113,11 +11924,11 @@
+@@ -13096,11 +11907,11 @@
return status;
}
_LT_EOF
@@ -11933,7 +11705,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13134,14 +11945,14 @@
+@@ -13117,14 +11928,14 @@
fi
@@ -11951,16 +11723,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -13150,7 +11961,7 @@
+@@ -13133,7 +11944,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 13153 "configure"
-+#line 11964 "configure"
+-#line 13136 "configure"
++#line 11947 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13209,11 +12020,11 @@
+@@ -13192,11 +12003,11 @@
return status;
}
_LT_EOF
@@ -11975,7 +11747,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13230,7 +12041,7 @@
+@@ -13213,7 +12024,7 @@
fi
@@ -11984,7 +11756,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -13269,12 +12080,12 @@
+@@ -13252,12 +12063,12 @@
striplib=
old_striplib=
@@ -11999,7 +11771,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -13283,15 +12094,15 @@
+@@ -13266,15 +12077,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -12018,7 +11790,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -13309,12 +12120,12 @@
+@@ -13292,12 +12103,12 @@
# Report which library types will actually be built
@@ -12034,7 +11806,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -13335,14 +12146,14 @@
+@@ -13318,14 +12129,14 @@
fi
;;
esac
@@ -12052,7 +11824,7 @@
$as_echo "$enable_static" >&6; }
-@@ -13379,9 +12190,9 @@
+@@ -13362,9 +12173,9 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -12064,7 +11836,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -13394,14 +12205,14 @@
+@@ -13377,14 +12188,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12082,7 +11854,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -13410,10 +12221,10 @@
+@@ -13393,28 +12204,23 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -12095,7 +11867,78 @@
$as_echo "no" >&6; }
fi
-@@ -13425,9 +12236,9 @@
+
+
+-
+-{ $as_echo "$as_me:$LINENO: checking for floor in -lm" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5
+ $as_echo_n "checking for floor in -lm... " >&6; }
+-if test "${ac_cv_lib_m_floor+set}" = set; then
++if test "${ac_cv_lib_m_floor+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lm $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -13432,43 +12238,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_m_floor=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_m_floor=no
++ ac_cv_lib_m_floor=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_floor" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5
+ $as_echo "$ac_cv_lib_m_floor" >&6; }
+-if test "x$ac_cv_lib_m_floor" = x""yes; then
++if test "x$ac_cv_lib_m_floor" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBM 1
+ _ACEOF
+@@ -13484,9 +12265,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -12107,7 +11950,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -13440,14 +12251,14 @@
+@@ -13499,14 +12280,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12125,7 +11968,7 @@
IFS=$as_save_IFS
;;
-@@ -13455,10 +12266,10 @@
+@@ -13514,10 +12295,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -12138,7 +11981,7 @@
$as_echo "no" >&6; }
fi
-@@ -13468,9 +12279,9 @@
+@@ -13527,9 +12308,9 @@
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -12150,7 +11993,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -13483,14 +12294,14 @@
+@@ -13542,14 +12323,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12168,7 +12011,7 @@
IFS=$as_save_IFS
;;
-@@ -13498,10 +12309,10 @@
+@@ -13557,10 +12338,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -12181,7 +12024,7 @@
$as_echo "no" >&6; }
fi
-@@ -13510,7 +12321,7 @@
+@@ -13569,7 +12350,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -12190,7 +12033,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -13523,13 +12334,13 @@
+@@ -13582,13 +12363,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -12207,7 +12050,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -13537,14 +12348,15 @@
+@@ -13596,14 +12377,15 @@
fi
pkg_failed=no
@@ -12226,19 +12069,19 @@
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
- glib-2.0 >= 2.21.3
- gnome-desktop-2.0 >= 2.25.5
+ glib-2.0 >= 2.24.0
+ gnome-desktop-2.0 >= 2.29.91
gthread-2.0
-@@ -13556,7 +12368,7 @@
+@@ -13615,7 +12397,7 @@
gail >= 0.16
unique-1.0
dbus-glib-1
-\"") >&5
+\""; } >&5
($PKG_CONFIG --exists --print-errors "
- glib-2.0 >= 2.21.3
- gnome-desktop-2.0 >= 2.25.5
-@@ -13571,8 +12383,8 @@
+ glib-2.0 >= 2.24.0
+ gnome-desktop-2.0 >= 2.29.91
+@@ -13630,8 +12412,8 @@
dbus-glib-1
") 2>&5
ac_status=$?
@@ -12247,9 +12090,9 @@
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_ALL_CFLAGS=`$PKG_CONFIG --cflags "
- glib-2.0 >= 2.21.3
- gnome-desktop-2.0 >= 2.25.5
-@@ -13589,14 +12401,16 @@
+ glib-2.0 >= 2.24.0
+ gnome-desktop-2.0 >= 2.29.91
+@@ -13648,14 +12430,16 @@
else
pkg_failed=yes
fi
@@ -12270,19 +12113,19 @@
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
- glib-2.0 >= 2.21.3
- gnome-desktop-2.0 >= 2.25.5
+ glib-2.0 >= 2.24.0
+ gnome-desktop-2.0 >= 2.29.91
gthread-2.0
-@@ -13608,7 +12422,7 @@
+@@ -13667,7 +12451,7 @@
gail >= 0.16
unique-1.0
dbus-glib-1
-\"") >&5
+\""; } >&5
($PKG_CONFIG --exists --print-errors "
- glib-2.0 >= 2.21.3
- gnome-desktop-2.0 >= 2.25.5
-@@ -13623,8 +12437,8 @@
+ glib-2.0 >= 2.24.0
+ gnome-desktop-2.0 >= 2.29.91
+@@ -13682,8 +12466,8 @@
dbus-glib-1
") 2>&5
ac_status=$?
@@ -12291,9 +12134,9 @@
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_ALL_LIBS=`$PKG_CONFIG --libs "
- glib-2.0 >= 2.21.3
- gnome-desktop-2.0 >= 2.25.5
-@@ -13641,8 +12455,9 @@
+ glib-2.0 >= 2.24.0
+ gnome-desktop-2.0 >= 2.29.91
+@@ -13700,8 +12484,9 @@
else
pkg_failed=yes
fi
@@ -12305,16 +12148,16 @@
fi
-@@ -13655,7 +12470,7 @@
+@@ -13714,7 +12499,7 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- ALL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
+ ALL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
- glib-2.0 >= 2.21.3
- gnome-desktop-2.0 >= 2.25.5
+ glib-2.0 >= 2.24.0
+ gnome-desktop-2.0 >= 2.29.91
gthread-2.0
-@@ -13667,9 +12482,9 @@
+@@ -13726,9 +12511,9 @@
gail >= 0.16
unique-1.0
dbus-glib-1
@@ -12323,10 +12166,10 @@
else
- ALL_PKG_ERRORS=`$PKG_CONFIG --print-errors "
+ ALL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
- glib-2.0 >= 2.21.3
- gnome-desktop-2.0 >= 2.25.5
+ glib-2.0 >= 2.24.0
+ gnome-desktop-2.0 >= 2.29.91
gthread-2.0
-@@ -13681,35 +12496,12 @@
+@@ -13740,35 +12525,12 @@
gail >= 0.16
unique-1.0
dbus-glib-1
@@ -12337,13 +12180,13 @@
echo "$ALL_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (
-- glib-2.0 >= 2.21.3
-- gnome-desktop-2.0 >= 2.25.5
+- glib-2.0 >= 2.24.0
+- gnome-desktop-2.0 >= 2.29.91
- gthread-2.0
- gio-unix-2.0
- gio-2.0
- pango >= 1.1.2
-- gtk+-2.0 >= 2.16.0
+- gtk+-2.0 >= 2.20.0
- libxml-2.0 >= 2.4.7
- gail >= 0.16
- unique-1.0
@@ -12361,10 +12204,10 @@
-" >&5
-$as_echo "$as_me: error: Package requirements (
+ as_fn_error "Package requirements (
- glib-2.0 >= 2.21.3
- gnome-desktop-2.0 >= 2.25.5
+ glib-2.0 >= 2.24.0
+ gnome-desktop-2.0 >= 2.29.91
gthread-2.0
-@@ -13731,22 +12523,11 @@
+@@ -13790,12 +12552,11 @@
Alternatively, you may set the environment variables ALL_CFLAGS
and ALL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -12376,6 +12219,16 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -13804,22 +12565,11 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
@@ -12384,16 +12237,6 @@
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -13755,12 +12536,11 @@
- See the pkg-config man page for more details.
-
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
@@ -12405,7 +12248,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -13774,151 +12554,12 @@
+@@ -13833,151 +12583,12 @@
@@ -12562,7 +12405,7 @@
_ACEOF
fi
-@@ -13926,16 +12567,12 @@
+@@ -13985,16 +12596,12 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -12582,7 +12425,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -13946,46 +12583,19 @@
+@@ -14005,46 +12612,19 @@
return 0;
}
_ACEOF
@@ -12635,7 +12478,7 @@
fi
fi
-@@ -13998,155 +12608,20 @@
+@@ -14057,155 +12637,20 @@
XGETTEXT=:
INTLLIBS=
@@ -12796,7 +12639,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -14159,54 +12634,25 @@
+@@ -14218,201 +12663,57 @@
return 0;
}
_ACEOF
@@ -12847,19 +12690,207 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
$as_echo_n "checking for dgettext in libc... " >&6; }
-if test "${gt_cv_func_dgettext_libc+set}" = set; then
-+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <libintl.h>
+-
+-int
+-main ()
+-{
+-return !dgettext ("","")
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- gt_cv_func_dgettext_libc=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- gt_cv_func_dgettext_libc=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
+-$as_echo "$gt_cv_func_dgettext_libc" >&6; }
+- fi
+-
+- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+-
+-for ac_func in bind_textdomain_codeset
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++if test "${gt_cv_func_dgettext_libc+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++#include <libintl.h>
+
+ int
+ main ()
+ {
+-return $ac_func ();
++return !dgettext ("","")
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
++if ac_fn_c_try_link "$LINENO"; then :
++ gt_cv_func_dgettext_libc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
++ gt_cv_func_dgettext_libc=no
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
++$as_echo "$gt_cv_func_dgettext_libc" >&6; }
++ fi
++
++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++ for ac_func in bind_textdomain_codeset
++do :
++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+ _ACEOF
+
+ fi
+@@ -14427,18 +12728,14 @@
+ || test "$gt_cv_func_ngettext_libc" != "yes" \
+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+
+- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
+ $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
++if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- #include <libintl.h>
-@@ -14219,141 +12665,26 @@
+ /* Override any GCC internal prototype to avoid an error.
+@@ -14456,55 +12753,26 @@
return 0;
}
_ACEOF
@@ -12885,13 +12916,13 @@
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
- gt_cv_func_dgettext_libc=yes
+ ac_cv_lib_intl_bindtextdomain=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- gt_cv_func_dgettext_libc=no
-+ gt_cv_func_dgettext_libc=no
+- ac_cv_lib_intl_bindtextdomain=no
++ ac_cv_lib_intl_bindtextdomain=no
fi
-
-rm -rf conftest.dSYM
@@ -12899,14 +12930,293 @@
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
- $as_echo "$gt_cv_func_dgettext_libc" >&6; }
- fi
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
+ $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
+-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
+- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
++if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+ $as_echo_n "checking for ngettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
++if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -14522,55 +12790,26 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_ngettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_ngettext=no
++ ac_cv_lib_intl_ngettext=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
+ $as_echo_n "checking for dgettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_dgettext+set}" = set; then
++if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -14588,43 +12827,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_dgettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_dgettext=no
++ ac_cv_lib_intl_dgettext=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
++if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
+ gt_cv_func_dgettext_libintl=yes
+ fi
+
+@@ -14634,22 +12848,18 @@
+
+
+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
+ $as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
+- { $as_echo "$as_me:$LINENO: result: " >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+ $as_echo "" >&6; }
+- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+ $as_echo_n "checking for ngettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
++if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl -liconv $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -14667,55 +12877,26 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_ngettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_ngettext=no
++ ac_cv_lib_intl_ngettext=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
+ $as_echo_n "checking for dcgettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
++if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl -liconv $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -14733,43 +12914,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_dcgettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_dcgettext=no
++ ac_cv_lib_intl_dcgettext=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
+ gt_cv_func_dgettext_libintl=yes
+ libintl_extra_libs=-liconv
+ else
+@@ -14791,102 +12947,12 @@
+ glib_save_LIBS="$LIBS"
+ LIBS="$LIBS -lintl $libintl_extra_libs"
+ unset ac_cv_func_bind_textdomain_codeset
-
-for ac_func in bind_textdomain_codeset
-do
@@ -13001,7 +13311,7 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+ for ac_func in bind_textdomain_codeset
++ for ac_func in bind_textdomain_codeset
+do :
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
@@ -13011,357 +13321,42 @@
_ACEOF
fi
-@@ -14368,18 +12699,14 @@
- || test "$gt_cv_func_ngettext_libc" != "yes" \
- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-
-- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
- $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
-+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
+@@ -14916,15 +12982,13 @@
+
+ if test "$gt_cv_have_gettext" = "yes"; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETTEXT 1
+-_ACEOF
++$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+
+ # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGFMT+set}" = set; then
++if test "${ac_cv_path_MSGFMT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -14397,55 +12724,26 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_bindtextdomain=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_bindtextdomain=no
-+ ac_cv_lib_intl_bindtextdomain=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
- $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
--if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
-- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
- $as_echo_n "checking for ngettext in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_ngettext+set}" = set; then
-+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -14463,55 +12761,26 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_ngettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_ngettext=no
-+ ac_cv_lib_intl_ngettext=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
- $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
--if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
-- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
-+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
- $as_echo_n "checking for dgettext in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_dgettext+set}" = set; then
-+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -14529,43 +12798,18 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_dgettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_dgettext=no
-+ ac_cv_lib_intl_dgettext=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
- $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
--if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
-+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
- gt_cv_func_dgettext_libintl=yes
- fi
-
-@@ -14575,22 +12819,18 @@
-
-
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
- $as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
-- { $as_echo "$as_me:$LINENO: result: " >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
- $as_echo "" >&6; }
-- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
- $as_echo_n "checking for ngettext in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_ngettext+set}" = set; then
-+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -14608,55 +12848,26 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_ngettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_ngettext=no
-+ ac_cv_lib_intl_ngettext=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
- $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
--if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
-- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
-+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
- $as_echo_n "checking for dcgettext in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
-+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -14674,43 +12885,18 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_dcgettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_dcgettext=no
-+ ac_cv_lib_intl_dcgettext=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
- $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
--if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
-+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
- gt_cv_func_dgettext_libintl=yes
- libintl_extra_libs=-liconv
- else
-@@ -14732,108 +12918,18 @@
+ case "$MSGFMT" in
+@@ -14949,118 +13013,28 @@
+ fi
+ MSGFMT="$ac_cv_path_MSGFMT"
+ if test "$MSGFMT" != "no"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+ $as_echo "$MSGFMT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ if test "$MSGFMT" != "no"; then
glib_save_LIBS="$LIBS"
- LIBS="$LIBS -lintl $libintl_extra_libs"
- unset ac_cv_func_bind_textdomain_codeset
--
--for ac_func in bind_textdomain_codeset
+ LIBS="$LIBS $INTLLIBS"
+-
+-for ac_func in dcgettext
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -13371,13 +13366,7 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+ for ac_func in bind_textdomain_codeset
-+do :
-+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -13389,15 +13378,13 @@
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+fi
-+done
-
+-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
@@ -13462,102 +13449,125 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++ for ac_func in dcgettext
++do :
++ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
++if test "x$ac_cv_func_dcgettext" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--done
--
-- LIBS="$glib_save_LIBS"
-+ LIBS="$glib_save_LIBS"
-
- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
- gt_cv_func_dgettext_libc=no
-@@ -14857,15 +12953,13 @@
-
- if test "$gt_cv_have_gettext" = "yes"; then
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETTEXT 1
--_ACEOF
-+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
-
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
++#define HAVE_DCGETTEXT 1
+ _ACEOF
+
+ fi
+ done
+
+ MSGFMT_OPTS=
+- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
+ $as_echo_n "checking if msgfmt accepts -c... " >&6; }
+ cat >conftest.foo <<_ACEOF
+
+@@ -15075,14 +13049,14 @@
+ "Content-Transfer-Encoding: 8bit\n"
+
+ _ACEOF
+-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
++if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
+ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-else { $as_echo "$as_me:$LINENO: result: no" >&5
++else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ echo "$as_me: failed input was:" >&5
+ sed 's/^/| /' conftest.foo >&5
+@@ -15090,9 +13064,9 @@
+
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_MSGFMT+set}" = set; then
-+if test "${ac_cv_path_MSGFMT+set}" = set; then :
+-if test "${ac_cv_path_GMSGFMT+set}" = set; then
++if test "${ac_cv_path_GMSGFMT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- case "$MSGFMT" in
-@@ -14890,118 +12984,28 @@
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
- if test "$MSGFMT" != "no"; then
-- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
- $as_echo "$MSGFMT" >&6; }
+ case $GMSGFMT in
+@@ -15105,14 +13079,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+@@ -15121,19 +13095,19 @@
+ fi
+ GMSGFMT=$ac_cv_path_GMSGFMT
+ if test -n "$GMSGFMT"; then
+- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+ $as_echo "$GMSGFMT" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- if test "$MSGFMT" != "no"; then
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS $INTLLIBS"
--
--for ac_func in dcgettext
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
+
+
+ # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XGETTEXT+set}" = set; then
++if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case "$XGETTEXT" in
+@@ -15154,148 +13128,37 @@
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+ ;;
+-esac
+-fi
+-XGETTEXT="$ac_cv_path_XGETTEXT"
+-if test "$XGETTEXT" != ":"; then
+- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+-$as_echo "$XGETTEXT" >&6; }
-else
-- cat >conftest.$ac_ext <<_ACEOF
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
-
-int
-main ()
-{
--return $ac_func ();
+-extern int _nl_msg_cat_cntr;
+- return _nl_msg_cat_cntr
- ;
- return 0;
-}
@@ -13583,66 +13593,488 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- eval "$as_ac_var=yes"
--else
+- CATOBJEXT=.gmo
+- DATADIRNAME=share
++esac
++fi
++XGETTEXT="$ac_cv_path_XGETTEXT"
++if test "$XGETTEXT" != ":"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
++$as_echo "$XGETTEXT" >&6; }
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+
+- case $host in
+- *-*-solaris*)
+- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
+-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char bind_textdomain_codeset (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef bind_textdomain_codeset
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char bind_textdomain_codeset ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+-choke me
+-#endif
+
+ int
+ main ()
+ {
+-return bind_textdomain_codeset ();
++extern int _nl_msg_cat_cntr;
++ return _nl_msg_cat_cntr
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_func_bind_textdomain_codeset=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ CATOBJEXT=.gmo
++ DATADIRNAME=share
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_bind_textdomain_codeset=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ for ac_func in dcgettext
-+do :
-+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
-+if test "x$ac_cv_func_dcgettext" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_DCGETTEXT 1
- _ACEOF
-
- fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
+-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
++ case $host in
++ *-*-solaris*)
++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+ CATOBJEXT=.gmo
+ DATADIRNAME=share
+ else
+@@ -15310,10 +13173,8 @@
+ ;;
+ esac
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$glib_save_LIBS"
+ INSTOBJEXT=.mo
+ else
+@@ -15327,9 +13188,7 @@
+
+ if test "$gt_cv_have_gettext" = "yes" ; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_NLS 1
+-_ACEOF
++$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+
+ fi
+
+@@ -15337,7 +13196,7 @@
+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+ : ;
+ else
+- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
+ $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
+ XGETTEXT=":"
+ fi
+@@ -15370,7 +13229,7 @@
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
+ else
+- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
+ $as_echo_n "checking for catalogs to be installed... " >&6; }
+ NEW_LINGUAS=
+ for presentlang in $ALL_LINGUAS; do
+@@ -15395,7 +13254,7 @@
+ fi
+ done
+ LINGUAS=$NEW_LINGUAS
+- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
+ $as_echo "$LINGUAS" >&6; }
+ fi
+
+@@ -15449,16 +13308,16 @@
+
+
+
+- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+ $as_echo_n "checking whether NLS is requested... " >&6; }
+ # Check whether --enable-nls was given.
+-if test "${enable_nls+set}" = set; then
++if test "${enable_nls+set}" = set; then :
+ enableval=$enable_nls; USE_NLS=$enableval
+ else
+ USE_NLS=yes
+ fi
+
+- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+ $as_echo "$USE_NLS" >&6; }
+
+
+@@ -15466,35 +13325,31 @@
+
+ case "$am__api_version" in
+ 1.01234)
+- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
+-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+ ;;
+ *)
+ ;;
+ esac
+
+ if test -n "0.40.1"; then
+- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.40.1" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.1" >&5
+ $as_echo_n "checking for intltool >= 0.40.1... " >&6; }
+
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+ INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
+ $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.40.1 or later." >&5
+-$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.40.1 or later." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "Your intltool is too old. You need intltool 0.40.1 or later." "$LINENO" 5
+ fi
+
+ # Extract the first word of "intltool-update", so it can be a program name with args.
+ set dummy intltool-update; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_UPDATE in
+@@ -15507,14 +13362,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
done
-
- MSGFMT_OPTS=
-- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
- $as_echo_n "checking if msgfmt accepts -c... " >&6; }
- cat >conftest.foo <<_ACEOF
-
-@@ -15016,14 +13020,14 @@
- "Content-Transfer-Encoding: 8bit\n"
-
- _ACEOF
--if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
-+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
- ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
--else { $as_echo "$as_me:$LINENO: result: no" >&5
-+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -15522,19 +13377,19 @@
+ fi
+ INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
+ if test -n "$INTLTOOL_UPDATE"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
+ $as_echo "$INTLTOOL_UPDATE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- echo "$as_me: failed input was:" >&5
- sed 's/^/| /' conftest.foo >&5
-@@ -15031,9 +13035,9 @@
-
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ fi
+
+
+ # Extract the first word of "intltool-merge", so it can be a program name with args.
+ set dummy intltool-merge; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_MERGE in
+@@ -15547,14 +13402,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -15562,19 +13417,19 @@
+ fi
+ INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
+ if test -n "$INTLTOOL_MERGE"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
+ $as_echo "$INTLTOOL_MERGE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "intltool-extract", so it can be a program name with args.
+ set dummy intltool-extract; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_EXTRACT in
+@@ -15587,14 +13442,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -15602,18 +13457,16 @@
+ fi
+ INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
+ if test -n "$INTLTOOL_EXTRACT"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
+ $as_echo "$INTLTOOL_EXTRACT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
+-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+ fi
+
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+@@ -15735,9 +13588,9 @@
+ # 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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XGETTEXT+set}" = set; then
++if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $XGETTEXT in
+@@ -15750,14 +13603,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -15765,19 +13618,19 @@
+ fi
+ XGETTEXT=$ac_cv_path_XGETTEXT
+ if test -n "$XGETTEXT"; then
+- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+ $as_echo "$XGETTEXT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "msgmerge", so it can be a program name with args.
+ set dummy msgmerge; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGMERGE+set}" = set; then
++if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MSGMERGE in
+@@ -15790,14 +13643,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -15805,19 +13658,19 @@
+ fi
+ MSGMERGE=$ac_cv_path_MSGMERGE
+ if test -n "$MSGMERGE"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+ $as_echo "$MSGMERGE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGFMT+set}" = set; then
++if test "${ac_cv_path_MSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MSGFMT in
+@@ -15830,14 +13683,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -15845,19 +13698,19 @@
+ fi
+ MSGFMT=$ac_cv_path_MSGFMT
+ if test -n "$MSGFMT"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+ $as_echo "$MSGFMT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -13652,7 +14084,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -15046,14 +13050,14 @@
+@@ -15870,14 +13723,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13670,7 +14102,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -15062,19 +13066,19 @@
+@@ -15886,33 +13739,29 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -13684,39 +14116,115 @@
fi
- # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
+ if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ fi
+ xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+ mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+ mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+ if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ fi
+
+ # Extract the first word of "perl", so it can be a program name with args.
+ set dummy perl; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_XGETTEXT+set}" = set; then
-+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- case "$XGETTEXT" in
-@@ -15099,18 +13103,14 @@
- fi
- XGETTEXT="$ac_cv_path_XGETTEXT"
- if test "$XGETTEXT" != ":"; then
-- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
- $as_echo "$XGETTEXT" >&6; }
+ case $INTLTOOL_PERL in
+@@ -15925,14 +13774,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -15940,41 +13789,35 @@
+ fi
+ INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+ if test -n "$INTLTOOL_PERL"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
+ $as_echo "$INTLTOOL_PERL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-- cat >conftest.$ac_ext <<_ACEOF
+
+ if test -z "$INTLTOOL_PERL"; then
+- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
+-$as_echo "$as_me: error: perl not found" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "perl not found" "$LINENO" 5
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
+ $as_echo_n "checking for perl >= 5.8.1... " >&6; }
+ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+ if test $? -ne 0; then
+- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
+-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
+ else
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
+ $as_echo "$IT_PERL_VERSION" >&6; }
+ fi
+ if test "x" != "xno-xml"; then
+- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
+ $as_echo_n "checking for XML::Parser... " >&6; }
+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+- { $as_echo "$as_me:$LINENO: result: ok" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+ $as_echo "ok" >&6; }
+ else
+- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
+ fi
+ fi
+
+@@ -15984,11 +13827,7 @@
+ # Set DATADIRNAME correctly if it is not set yet
+ # (copied from glib-gettext.m4)
+ if test -z "$DATADIRNAME"; then
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
-@@ -15122,121 +13122,14 @@
+@@ -16000,120 +13839,13 @@
return 0;
}
_ACEOF
@@ -13742,16 +14250,15 @@
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
- CATOBJEXT=.gmo
- DATADIRNAME=share
+ DATADIRNAME=share
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- case $host in
+ case $host in
- *-*-solaris*)
-- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+ *-*-solaris*)
+- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
- $as_echo_n "(cached) " >&6
@@ -13837,14 +14344,14 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
- CATOBJEXT=.gmo
- DATADIRNAME=share
- else
-@@ -15251,10 +13144,8 @@
- ;;
- esac
+ DATADIRNAME=share
+ else
+ DATADIRNAME=lib
+@@ -16125,10 +13857,8 @@
+ ;;
+ esac
fi
-
-rm -rf conftest.dSYM
@@ -13852,665 +14359,10 @@
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$glib_save_LIBS"
- INSTOBJEXT=.mo
- else
-@@ -15268,9 +13159,7 @@
-
- if test "$gt_cv_have_gettext" = "yes" ; then
-
--cat >>confdefs.h <<\_ACEOF
--#define ENABLE_NLS 1
--_ACEOF
-+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
-
- fi
-
-@@ -15278,7 +13167,7 @@
- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- : ;
- else
-- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
- $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
- XGETTEXT=":"
- fi
-@@ -15311,7 +13200,7 @@
- if test "x$ALL_LINGUAS" = "x"; then
- LINGUAS=
- else
-- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
- $as_echo_n "checking for catalogs to be installed... " >&6; }
- NEW_LINGUAS=
- for presentlang in $ALL_LINGUAS; do
-@@ -15336,7 +13225,7 @@
- fi
- done
- LINGUAS=$NEW_LINGUAS
-- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
- $as_echo "$LINGUAS" >&6; }
- fi
-
-@@ -15390,16 +13279,16 @@
-
-
-
-- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
- $as_echo_n "checking whether NLS is requested... " >&6; }
- # Check whether --enable-nls was given.
--if test "${enable_nls+set}" = set; then
-+if test "${enable_nls+set}" = set; then :
- enableval=$enable_nls; USE_NLS=$enableval
- else
- USE_NLS=yes
- fi
-
-- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
- $as_echo "$USE_NLS" >&6; }
-
-
-@@ -15407,35 +13296,31 @@
-
- case "$am__api_version" in
- 1.01234)
-- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
--$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
- ;;
- *)
- ;;
- esac
-
- if test -n "0.40.1"; then
-- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.40.1" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.1" >&5
- $as_echo_n "checking for intltool >= 0.40.1... " >&6; }
-
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
- INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
- $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.40.1 or later." >&5
--$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.40.1 or later." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "Your intltool is too old. You need intltool 0.40.1 or later." "$LINENO" 5
- fi
-
- # Extract the first word of "intltool-update", so it can be a program name with args.
- set dummy intltool-update; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_UPDATE in
-@@ -15448,14 +13333,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -15463,19 +13348,19 @@
- fi
- INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
- if test -n "$INTLTOOL_UPDATE"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
- $as_echo "$INTLTOOL_UPDATE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "intltool-merge", so it can be a program name with args.
- set dummy intltool-merge; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_MERGE in
-@@ -15488,14 +13373,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -15503,19 +13388,19 @@
- fi
- INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
- if test -n "$INTLTOOL_MERGE"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
- $as_echo "$INTLTOOL_MERGE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "intltool-extract", so it can be a program name with args.
- set dummy intltool-extract; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_EXTRACT in
-@@ -15528,14 +13413,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -15543,18 +13428,16 @@
- fi
- INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
- if test -n "$INTLTOOL_EXTRACT"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
- $as_echo "$INTLTOOL_EXTRACT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
--$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
- 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 @@
- # 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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_XGETTEXT+set}" = set; then
-+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $XGETTEXT in
-@@ -15691,14 +13574,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -15706,19 +13589,19 @@
- fi
- XGETTEXT=$ac_cv_path_XGETTEXT
- if test -n "$XGETTEXT"; then
-- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
- $as_echo "$XGETTEXT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "msgmerge", so it can be a program name with args.
- set dummy msgmerge; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_MSGMERGE+set}" = set; then
-+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $MSGMERGE in
-@@ -15731,14 +13614,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -15746,19 +13629,19 @@
- fi
- MSGMERGE=$ac_cv_path_MSGMERGE
- if test -n "$MSGMERGE"; then
-- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
- $as_echo "$MSGMERGE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_MSGFMT+set}" = set; then
-+if test "${ac_cv_path_MSGFMT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $MSGFMT in
-@@ -15771,14 +13654,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -15786,19 +13669,19 @@
- fi
- MSGFMT=$ac_cv_path_MSGFMT
- if test -n "$MSGFMT"; then
-- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
- $as_echo "$MSGFMT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GMSGFMT+set}" = set; then
-+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $GMSGFMT in
-@@ -15811,14 +13694,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -15827,33 +13710,29 @@
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
- if test -n "$GMSGFMT"; then
-- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
- $as_echo "$GMSGFMT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
- fi
- xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
- mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
- mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
- if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
- fi
-
- # Extract the first word of "perl", so it can be a program name with args.
- set dummy perl; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_PERL in
-@@ -15866,14 +13745,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -15881,41 +13760,35 @@
- fi
- INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
- if test -n "$INTLTOOL_PERL"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
- $as_echo "$INTLTOOL_PERL" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- if test -z "$INTLTOOL_PERL"; then
-- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
--$as_echo "$as_me: error: perl not found" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "perl not found" "$LINENO" 5
- fi
--{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
- $as_echo_n "checking for perl >= 5.8.1... " >&6; }
- $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
- if test $? -ne 0; then
-- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
--$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
- else
- IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
- $as_echo "$IT_PERL_VERSION" >&6; }
- fi
- if test "x" != "xno-xml"; then
-- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
- $as_echo_n "checking for XML::Parser... " >&6; }
- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-- { $as_echo "$as_me:$LINENO: result: ok" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
- $as_echo "ok" >&6; }
- else
-- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
--$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
- fi
- fi
-
-@@ -15925,11 +13798,7 @@
- # Set DATADIRNAME correctly if it is not set yet
- # (copied from glib-gettext.m4)
- if test -z "$DATADIRNAME"; then
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -15941,136 +13810,27 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- DATADIRNAME=share
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- case $host in
-+ case $host in
- *-*-solaris*)
-- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
--$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
--if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
-+ DATADIRNAME=share
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
-+ DATADIRNAME=lib
-+fi
-
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char bind_textdomain_codeset (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef bind_textdomain_codeset
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char bind_textdomain_codeset ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
--choke me
--#endif
--
--int
--main ()
--{
--return bind_textdomain_codeset ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_bind_textdomain_codeset=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_bind_textdomain_codeset=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
--$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
--if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-- DATADIRNAME=share
--else
-- DATADIRNAME=lib
--fi
--
-- ;;
-- *)
-- DATADIRNAME=lib
-- ;;
-- esac
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
-+ ;;
-+ *)
-+ DATADIRNAME=lib
-+ ;;
-+ esac
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-
-
-
-@@ -16082,9 +13842,9 @@
+ fi
+
+
+@@ -16141,9 +13871,9 @@
# Extract the first word of "gtkdoc-check", so it can be a program name with args.
set dummy gtkdoc-check; ac_word=$2
@@ -14522,7 +14374,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_CHECK in
-@@ -16097,14 +13857,14 @@
+@@ -16156,14 +13886,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14540,7 +14392,7 @@
IFS=$as_save_IFS
;;
-@@ -16112,10 +13872,10 @@
+@@ -16171,10 +13901,10 @@
fi
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
if test -n "$GTKDOC_CHECK"; then
@@ -14553,7 +14405,7 @@
$as_echo "no" >&6; }
fi
-@@ -16124,9 +13884,9 @@
+@@ -16183,9 +13913,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -14565,7 +14417,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_REBASE in
-@@ -16139,14 +13899,14 @@
+@@ -16198,14 +13928,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14583,7 +14435,7 @@
IFS=$as_save_IFS
;;
-@@ -16154,10 +13914,10 @@
+@@ -16213,10 +13943,10 @@
fi
GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
if test -n "$GTKDOC_REBASE"; then
@@ -14596,7 +14448,7 @@
$as_echo "no" >&6; }
fi
-@@ -16168,9 +13928,9 @@
+@@ -16227,9 +13957,9 @@
# Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
set dummy gtkdoc-mkpdf; ac_word=$2
@@ -14608,7 +14460,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_MKPDF in
-@@ -16183,14 +13943,14 @@
+@@ -16242,14 +13972,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14626,7 +14478,7 @@
IFS=$as_save_IFS
;;
-@@ -16198,10 +13958,10 @@
+@@ -16257,10 +13987,10 @@
fi
GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
if test -n "$GTKDOC_MKPDF"; then
@@ -14639,7 +14491,7 @@
$as_echo "no" >&6; }
fi
-@@ -16209,7 +13969,7 @@
+@@ -16268,7 +13998,7 @@
# Check whether --with-html-dir was given.
@@ -14648,7 +14500,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -16219,7 +13979,7 @@
+@@ -16278,7 +14008,7 @@
# Check whether --enable-gtk-doc was given.
@@ -14657,7 +14509,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -16228,33 +13988,31 @@
+@@ -16287,33 +14017,31 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -14699,7 +14551,7 @@
enableval=$enable_gtk_doc_pdf;
else
enable_gtk_doc_pdf=no
-@@ -16311,12 +14069,10 @@
+@@ -16370,12 +14098,10 @@
ENABLE_PROFILER=
# Check whether --enable-profiler was given.
@@ -14714,7 +14566,7 @@
fi
-@@ -16344,9 +14100,9 @@
+@@ -16403,9 +14129,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -14726,7 +14578,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$PERL"; then
-@@ -16357,24 +14113,24 @@
+@@ -16416,24 +14142,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14756,7 +14608,7 @@
$as_echo "no" >&6; }
fi
-@@ -16384,9 +14140,9 @@
+@@ -16443,9 +14169,9 @@
# Extract the first word of "glib-genmarshal", so it can be a program name with args.
set dummy glib-genmarshal; ac_word=$2
@@ -14768,7 +14620,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -16399,14 +14155,14 @@
+@@ -16458,177 +14184,37 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14782,31 +14634,28 @@
fi
done
-done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -16414,162 +14170,22 @@
- fi
- GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
- if test -n "$GLIB_GENMARSHAL"; then
+-IFS=$as_save_IFS
+-
+- ;;
+-esac
+-fi
+-GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
+-if test -n "$GLIB_GENMARSHAL"; then
- { $as_echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5
- $as_echo "$GLIB_GENMARSHAL" >&6; }
- else
+-$as_echo "$GLIB_GENMARSHAL" >&6; }
+-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
-
-
--
--
--
--
- for ac_header in sys/mount.h sys/vfs.h sys/param.h malloc.h
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-
+-
+-
+-
+-
+-
+-for ac_header in sys/mount.h sys/vfs.h sys/param.h malloc.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -14931,23 +14780,38 @@
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
--esac
++ done
++IFS=$as_save_IFS
++
++ ;;
+ esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$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
--else
++fi
++GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
++if test -n "$GLIB_GENMARSHAL"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5
++$as_echo "$GLIB_GENMARSHAL" >&6; }
+ else
- eval "$as_ac_Header=\$ac_header_preproc"
--fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--
+
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++
++
++
++for ac_header in sys/mount.h sys/vfs.h sys/param.h malloc.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -14956,7 +14820,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -16578,102 +14194,12 @@
+@@ -16637,102 +14223,12 @@
done
@@ -15063,7 +14927,7 @@
_ACEOF
fi
-@@ -16691,12 +14217,12 @@
+@@ -16750,12 +14246,12 @@
x_extra_libs=
if test $pango_omitted_x_deps = yes ; then
@@ -15078,7 +14942,7 @@
withval=$with_x;
fi
-@@ -16706,10 +14232,8 @@
+@@ -16765,10 +14261,8 @@
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -15091,7 +14955,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 @@
+@@ -16816,21 +14310,25 @@
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
@@ -15117,7 +14981,7 @@
/usr/local/include/X11R6
/usr/local/include/X11R5
/usr/local/include/X11R4
-@@ -16793,37 +14321,14 @@
+@@ -16852,37 +14350,14 @@
if test "$ac_x_includes" = no; then
# Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
@@ -15157,7 +15021,7 @@
for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
-@@ -16831,7 +14336,6 @@
+@@ -16890,7 +14365,6 @@
fi
done
fi
@@ -15165,7 +15029,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
-@@ -16841,11 +14345,7 @@
+@@ -16900,11 +14374,7 @@
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
@@ -15178,7 +15042,7 @@
/* end confdefs.h. */
#include <X11/Xlib.h>
int
-@@ -16856,35 +14356,12 @@
+@@ -16915,35 +14385,12 @@
return 0;
}
_ACEOF
@@ -15216,7 +15080,7 @@
for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do
# Don't even attempt the hair of trying to link an X program!
-@@ -16896,10 +14373,8 @@
+@@ -16955,10 +14402,8 @@
done
done
fi
@@ -15229,7 +15093,7 @@
fi # $ac_x_libraries = no
case $ac_x_includes,$ac_x_libraries in #(
-@@ -16920,7 +14395,7 @@
+@@ -16979,7 +14424,7 @@
fi # $with_x != no
if test "$have_x" != yes; then
@@ -15238,7 +15102,7 @@
$as_echo "$have_x" >&6; }
no_x=yes
else
-@@ -16931,16 +14406,14 @@
+@@ -16990,16 +14435,14 @@
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -15257,7 +15121,7 @@
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
else
-@@ -16953,16 +14426,12 @@
+@@ -17012,16 +14455,12 @@
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
@@ -15276,7 +15140,7 @@
/* end confdefs.h. */
int
-@@ -16973,40 +14442,13 @@
+@@ -17032,40 +14471,13 @@
return 0;
}
_ACEOF
@@ -15321,7 +15185,7 @@
/* end confdefs.h. */
int
-@@ -17017,46 +14459,19 @@
+@@ -17076,46 +14488,19 @@
return 0;
}
_ACEOF
@@ -15375,7 +15239,7 @@
ac_c_werror_flag=$ac_xsave_c_werror_flag
LIBS=$ac_xsave_LIBS
fi
-@@ -17072,11 +14487,7 @@
+@@ -17131,11 +14516,7 @@
# libraries were built with DECnet support. And Karl Berry says
# the Alpha needs dnet_stub (dnet does not exist).
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
@@ -15388,7 +15252,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17094,44 +14505,17 @@
+@@ -17153,44 +14534,17 @@
return 0;
}
_ACEOF
@@ -15414,13 +15278,13 @@
- $as_test_x conftest$ac_exeext
- }; then
- :
-+if ac_fn_c_try_link "$LINENO"; then :
-+
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++if ac_fn_c_try_link "$LINENO"; then :
+
- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
++else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
@@ -15438,7 +15302,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17149,59 +14533,30 @@
+@@ -17208,59 +14562,30 @@
return 0;
}
_ACEOF
@@ -15507,7 +15371,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17219,52 +14574,25 @@
+@@ -17278,52 +14603,25 @@
return 0;
}
_ACEOF
@@ -15568,7 +15432,7 @@
LIBS="$ac_xsave_LIBS"
# msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -17275,105 +14603,20 @@
+@@ -17334,105 +14632,20 @@
# on Irix 5.2, according to T.E. Dickey.
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
@@ -15679,7 +15543,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17391,59 +14634,30 @@
+@@ -17450,59 +14663,30 @@
return 0;
}
_ACEOF
@@ -15748,7 +15612,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17461,43 +14675,18 @@
+@@ -17520,43 +14704,18 @@
return 0;
}
_ACEOF
@@ -15798,7 +15662,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
-@@ -17511,105 +14700,20 @@
+@@ -17570,105 +14729,20 @@
# variants that don't use the name server (or something). -lsocket
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
@@ -15843,9 +15707,7 @@
-#if defined __stub_connect || defined __stub___connect
-choke me
-#endif
-+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-+if test "x$ac_cv_func_connect" = x""yes; then :
-
+-
-int
-main ()
-{
@@ -15882,7 +15744,9 @@
-
- ac_cv_func_connect=no
-fi
--
++ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
++if test "x$ac_cv_func_connect" = x""yes; then :
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -15909,7 +15773,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17627,148 +14731,38 @@
+@@ -17686,148 +14760,38 @@
return 0;
}
_ACEOF
@@ -15981,9 +15845,7 @@
- which can conflict with char remove (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
-+if test "x$ac_cv_func_remove" = x""yes; then :
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
@@ -16042,7 +15904,9 @@
-
- ac_cv_func_remove=no
-fi
--
++ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
++if test "x$ac_cv_func_remove" = x""yes; then :
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -16069,7 +15933,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17786,148 +14780,38 @@
+@@ -17845,148 +14809,38 @@
return 0;
}
_ACEOF
@@ -16094,28 +15958,34 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_posix_remove=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_posix_remove=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_posix_remove=no
--fi
++ ac_cv_lib_posix_remove=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
--$as_echo "$ac_cv_lib_posix_remove" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
+ $as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test "x$ac_cv_lib_posix_remove" = x""yes; then
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
--fi
--
-- fi
--
-- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
++if test "x$ac_cv_lib_posix_remove" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+ fi
+
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
- { $as_echo "$as_me:$LINENO: checking for shmat" >&5
-$as_echo_n "checking for shmat... " >&6; }
-if test "${ac_cv_func_shmat+set}" = set; then
@@ -16188,34 +16058,18 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_shmat=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_posix_remove=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_shmat=no
-+ ac_cv_lib_posix_remove=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
-+$as_echo "$ac_cv_lib_posix_remove" >&6; }
-+if test "x$ac_cv_lib_posix_remove" = x""yes; then :
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
- fi
+-fi
++ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
++if test "x$ac_cv_func_shmat" = x""yes; then :
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+ fi
-+
-+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-+if test "x$ac_cv_func_shmat" = x""yes; then :
-+
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-$as_echo "$ac_cv_func_shmat" >&6; }
@@ -16239,7 +16093,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17945,43 +14829,18 @@
+@@ -18004,43 +14858,18 @@
return 0;
}
_ACEOF
@@ -16289,7 +16143,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -17997,18 +14856,14 @@
+@@ -18056,18 +14885,14 @@
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# John Interrante, Karl Berry
@@ -16311,7 +16165,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18026,43 +14881,18 @@
+@@ -18085,43 +14910,18 @@
return 0;
}
_ACEOF
@@ -16361,7 +16215,7 @@
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -18072,9 +14902,7 @@
+@@ -18131,9 +14931,7 @@
if test x$no_x = xyes ; then
@@ -16372,7 +16226,7 @@
fi
x_libs="$X_LIBS -lX11 $X_EXTRA_LIBS"
-@@ -18090,18 +14918,14 @@
+@@ -18149,18 +14947,14 @@
# esac
#done
@@ -16394,7 +16248,602 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18119,48 +14943,21 @@
+@@ -18175,51 +14969,24 @@
+ {
+ return XOpenDisplay ();
+ ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_X11_XOpenDisplay=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_X11_XOpenDisplay=no
++ ac_cv_lib_X11_XOpenDisplay=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ $as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; }
+-if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then
++if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then :
+ :
+ else
+- { { $as_echo "$as_me:$LINENO: error: *** libX11 not found. Check 'config.log' for more details." >&5
+-$as_echo "$as_me: error: *** libX11 not found. Check 'config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "*** libX11 not found. Check 'config.log' for more details." "$LINENO" 5
+ fi
+
+
+@@ -18236,40 +15003,44 @@
+
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for EXIF" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXIF" >&5
+ $as_echo_n "checking for EXIF... " >&6; }
+
+-if test -n "$EXIF_CFLAGS"; then
+- pkg_cv_EXIF_CFLAGS="$EXIF_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif > 0.5.12\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$EXIF_CFLAGS"; then
++ pkg_cv_EXIF_CFLAGS="$EXIF_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif > 0.5.12\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libexif > 0.5.12") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_EXIF_CFLAGS=`$PKG_CONFIG --cflags "libexif > 0.5.12" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$EXIF_LIBS"; then
+- pkg_cv_EXIF_LIBS="$EXIF_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif > 0.5.12\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$EXIF_LIBS"; then
++ pkg_cv_EXIF_LIBS="$EXIF_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif > 0.5.12\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libexif > 0.5.12") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_EXIF_LIBS=`$PKG_CONFIG --libs "libexif > 0.5.12" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -18282,52 +15053,56 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libexif > 0.5.12" 2>&1`
++ EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libexif > 0.5.12"`
+ else
+- EXIF_PKG_ERRORS=`$PKG_CONFIG --print-errors "libexif > 0.5.12" 2>&1`
++ EXIF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libexif > 0.5.12"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$EXIF_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for EXIF" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXIF" >&5
+ $as_echo_n "checking for EXIF... " >&6; }
+
+-if test -n "$EXIF_CFLAGS"; then
+- pkg_cv_EXIF_CFLAGS="$EXIF_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$EXIF_CFLAGS"; then
++ pkg_cv_EXIF_CFLAGS="$EXIF_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libexif = 0.5.12") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_EXIF_CFLAGS=`$PKG_CONFIG --cflags "libexif = 0.5.12" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$EXIF_LIBS"; then
+- pkg_cv_EXIF_LIBS="$EXIF_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$EXIF_LIBS"; then
++ pkg_cv_EXIF_LIBS="$EXIF_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libexif = 0.5.12") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_EXIF_LIBS=`$PKG_CONFIG --libs "libexif = 0.5.12" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -18340,14 +15115,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libexif = 0.5.12" 2>&1`
++ EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libexif = 0.5.12"`
+ else
+- EXIF_PKG_ERRORS=`$PKG_CONFIG --print-errors "libexif = 0.5.12" 2>&1`
++ EXIF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libexif = 0.5.12"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$EXIF_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ if false; then
+ HAVE_EXIF_TRUE=
+@@ -18369,7 +15144,7 @@
+ else
+ EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
+ EXIF_LIBS=$pkg_cv_EXIF_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+
+ if true; then
+@@ -18381,9 +15156,7 @@
+ fi
+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_OLD_EXIF 1
+-_ACEOF
++$as_echo "#define HAVE_OLD_EXIF 1" >>confdefs.h
+
+
+ fi
+@@ -18392,40 +15165,44 @@
+
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for EXIF" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXIF" >&5
+ $as_echo_n "checking for EXIF... " >&6; }
+
+-if test -n "$EXIF_CFLAGS"; then
+- pkg_cv_EXIF_CFLAGS="$EXIF_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$EXIF_CFLAGS"; then
++ pkg_cv_EXIF_CFLAGS="$EXIF_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libexif = 0.5.12") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_EXIF_CFLAGS=`$PKG_CONFIG --cflags "libexif = 0.5.12" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$EXIF_LIBS"; then
+- pkg_cv_EXIF_LIBS="$EXIF_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$EXIF_LIBS"; then
++ pkg_cv_EXIF_LIBS="$EXIF_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libexif = 0.5.12") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_EXIF_LIBS=`$PKG_CONFIG --libs "libexif = 0.5.12" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -18438,14 +15215,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libexif = 0.5.12" 2>&1`
++ EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libexif = 0.5.12"`
+ else
+- EXIF_PKG_ERRORS=`$PKG_CONFIG --print-errors "libexif = 0.5.12" 2>&1`
++ EXIF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libexif = 0.5.12"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$EXIF_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ if false; then
+ HAVE_EXIF_TRUE=
+@@ -18467,7 +15244,7 @@
+ else
+ EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
+ EXIF_LIBS=$pkg_cv_EXIF_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+
+ if true; then
+@@ -18479,9 +15256,7 @@
+ fi
+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_OLD_EXIF 1
+-_ACEOF
++$as_echo "#define HAVE_OLD_EXIF 1" >>confdefs.h
+
+
+ fi
+@@ -18489,7 +15264,7 @@
+ else
+ EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
+ EXIF_LIBS=$pkg_cv_EXIF_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+
+ if true; then
+@@ -18501,9 +15276,7 @@
+ fi
+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_EXIF 1
+-_ACEOF
++$as_echo "#define HAVE_EXIF 1" >>confdefs.h
+
+
+ fi
+@@ -18523,7 +15296,7 @@
+
+
+ # Check whether --enable-xmp was given.
+-if test "${enable_xmp+set}" = set; then
++if test "${enable_xmp+set}" = set; then :
+ enableval=$enable_xmp;
+ fi
+
+@@ -18531,40 +15304,44 @@
+ if test "x$enable_xmp" != "xno"; then
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for EXEMPI" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXEMPI" >&5
+ $as_echo_n "checking for EXEMPI... " >&6; }
+
+-if test -n "$EXEMPI_CFLAGS"; then
+- pkg_cv_EXEMPI_CFLAGS="$EXEMPI_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.2\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$EXEMPI_CFLAGS"; then
++ pkg_cv_EXEMPI_CFLAGS="$EXEMPI_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "exempi-2.0 >= 1.99.2") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_EXEMPI_CFLAGS=`$PKG_CONFIG --cflags "exempi-2.0 >= 1.99.2" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$EXEMPI_LIBS"; then
+- pkg_cv_EXEMPI_LIBS="$EXEMPI_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.2\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$EXEMPI_LIBS"; then
++ pkg_cv_EXEMPI_LIBS="$EXEMPI_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "exempi-2.0 >= 1.99.2") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_EXEMPI_LIBS=`$PKG_CONFIG --libs "exempi-2.0 >= 1.99.2" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -18577,14 +15354,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- EXEMPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "exempi-2.0 >= 1.99.2" 2>&1`
++ EXEMPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "exempi-2.0 >= 1.99.2"`
+ else
+- EXEMPI_PKG_ERRORS=`$PKG_CONFIG --print-errors "exempi-2.0 >= 1.99.2" 2>&1`
++ EXEMPI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "exempi-2.0 >= 1.99.2"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$EXEMPI_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ if false; then
+ HAVE_EXEMPI_TRUE=
+@@ -18606,7 +15383,7 @@
+ else
+ EXEMPI_CFLAGS=$pkg_cv_EXEMPI_CFLAGS
+ EXEMPI_LIBS=$pkg_cv_EXEMPI_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+
+ if true; then
+@@ -18618,9 +15395,7 @@
+ fi
+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_EXEMPI 1
+-_ACEOF
++$as_echo "#define HAVE_EXEMPI 1" >>confdefs.h
+
+
+ msg_xmp=yes
+@@ -18628,40 +15403,44 @@
+
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for EXEMPI_NEW_API" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXEMPI_NEW_API" >&5
+ $as_echo_n "checking for EXEMPI_NEW_API... " >&6; }
+
+-if test -n "$EXEMPI_NEW_API_CFLAGS"; then
+- pkg_cv_EXEMPI_NEW_API_CFLAGS="$EXEMPI_NEW_API_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.5\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$EXEMPI_NEW_API_CFLAGS"; then
++ pkg_cv_EXEMPI_NEW_API_CFLAGS="$EXEMPI_NEW_API_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.5\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "exempi-2.0 >= 1.99.5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_EXEMPI_NEW_API_CFLAGS=`$PKG_CONFIG --cflags "exempi-2.0 >= 1.99.5" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$EXEMPI_NEW_API_LIBS"; then
+- pkg_cv_EXEMPI_NEW_API_LIBS="$EXEMPI_NEW_API_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.5\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$EXEMPI_NEW_API_LIBS"; then
++ pkg_cv_EXEMPI_NEW_API_LIBS="$EXEMPI_NEW_API_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.5\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "exempi-2.0 >= 1.99.5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_EXEMPI_NEW_API_LIBS=`$PKG_CONFIG --libs "exempi-2.0 >= 1.99.5" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -18674,14 +15453,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- EXEMPI_NEW_API_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "exempi-2.0 >= 1.99.5" 2>&1`
++ EXEMPI_NEW_API_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "exempi-2.0 >= 1.99.5"`
+ else
+- EXEMPI_NEW_API_PKG_ERRORS=`$PKG_CONFIG --print-errors "exempi-2.0 >= 1.99.5" 2>&1`
++ EXEMPI_NEW_API_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "exempi-2.0 >= 1.99.5"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$EXEMPI_NEW_API_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ true
+ elif test $pkg_failed = untried; then
+@@ -18689,12 +15468,10 @@
+ else
+ EXEMPI_NEW_API_CFLAGS=$pkg_cv_EXEMPI_NEW_API_CFLAGS
+ EXEMPI_NEW_API_LIBS=$pkg_cv_EXEMPI_NEW_API_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_EXEMPI_NEW_API 1
+-_ACEOF
++$as_echo "#define HAVE_EXEMPI_NEW_API 1" >>confdefs.h
+
+ fi
+
+@@ -18706,18 +15483,14 @@
+
+ SELINUX_LIBS=
+ msg_selinux=no
+-{ $as_echo "$as_me:$LINENO: checking for is_selinux_enabled in -lselinux" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_selinux_enabled in -lselinux" >&5
+ $as_echo_n "checking for is_selinux_enabled in -lselinux... " >&6; }
+-if test "${ac_cv_lib_selinux_is_selinux_enabled+set}" = set; then
++if test "${ac_cv_lib_selinux_is_selinux_enabled+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lselinux $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -18735,200 +15508,32 @@
return 0;
}
_ACEOF
@@ -16420,13 +16869,13 @@
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_X11_XOpenDisplay=yes
+ ac_cv_lib_selinux_is_selinux_enabled=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_X11_XOpenDisplay=no
-+ ac_cv_lib_X11_XOpenDisplay=no
+- ac_cv_lib_selinux_is_selinux_enabled=no
++ ac_cv_lib_selinux_is_selinux_enabled=no
fi
-
-rm -rf conftest.dSYM
@@ -16436,1048 +16885,9 @@
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5
- $as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; }
--if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then
-+if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then :
- :
- else
-- { { $as_echo "$as_me:$LINENO: error: *** libX11 not found. Check 'config.log' for more details." >&5
--$as_echo "$as_me: error: *** libX11 not found. Check 'config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "*** libX11 not found. Check 'config.log' for more details." "$LINENO" 5
- fi
-
-
-@@ -18177,40 +14974,44 @@
-
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for EXIF" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXIF" >&5
- $as_echo_n "checking for EXIF... " >&6; }
-
--if test -n "$EXIF_CFLAGS"; then
-- pkg_cv_EXIF_CFLAGS="$EXIF_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif > 0.5.12\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EXIF_CFLAGS"; then
-+ pkg_cv_EXIF_CFLAGS="$EXIF_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif > 0.5.12\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libexif > 0.5.12") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_EXIF_CFLAGS=`$PKG_CONFIG --cflags "libexif > 0.5.12" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$EXIF_LIBS"; then
-- pkg_cv_EXIF_LIBS="$EXIF_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif > 0.5.12\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EXIF_LIBS"; then
-+ pkg_cv_EXIF_LIBS="$EXIF_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif > 0.5.12\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libexif > 0.5.12") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_EXIF_LIBS=`$PKG_CONFIG --libs "libexif > 0.5.12" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -18223,52 +15024,56 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libexif > 0.5.12" 2>&1`
-+ EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libexif > 0.5.12"`
- else
-- EXIF_PKG_ERRORS=`$PKG_CONFIG --print-errors "libexif > 0.5.12" 2>&1`
-+ EXIF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libexif > 0.5.12"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$EXIF_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for EXIF" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXIF" >&5
- $as_echo_n "checking for EXIF... " >&6; }
-
--if test -n "$EXIF_CFLAGS"; then
-- pkg_cv_EXIF_CFLAGS="$EXIF_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EXIF_CFLAGS"; then
-+ pkg_cv_EXIF_CFLAGS="$EXIF_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libexif = 0.5.12") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_EXIF_CFLAGS=`$PKG_CONFIG --cflags "libexif = 0.5.12" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$EXIF_LIBS"; then
-- pkg_cv_EXIF_LIBS="$EXIF_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EXIF_LIBS"; then
-+ pkg_cv_EXIF_LIBS="$EXIF_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libexif = 0.5.12") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_EXIF_LIBS=`$PKG_CONFIG --libs "libexif = 0.5.12" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -18281,14 +15086,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libexif = 0.5.12" 2>&1`
-+ EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libexif = 0.5.12"`
- else
-- EXIF_PKG_ERRORS=`$PKG_CONFIG --print-errors "libexif = 0.5.12" 2>&1`
-+ EXIF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libexif = 0.5.12"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$EXIF_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- if false; then
- HAVE_EXIF_TRUE=
-@@ -18310,7 +15115,7 @@
- else
- EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
- EXIF_LIBS=$pkg_cv_EXIF_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-
- if true; then
-@@ -18322,9 +15127,7 @@
- fi
-
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_OLD_EXIF 1
--_ACEOF
-+$as_echo "#define HAVE_OLD_EXIF 1" >>confdefs.h
-
-
- fi
-@@ -18333,40 +15136,44 @@
-
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for EXIF" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXIF" >&5
- $as_echo_n "checking for EXIF... " >&6; }
-
--if test -n "$EXIF_CFLAGS"; then
-- pkg_cv_EXIF_CFLAGS="$EXIF_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EXIF_CFLAGS"; then
-+ pkg_cv_EXIF_CFLAGS="$EXIF_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libexif = 0.5.12") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_EXIF_CFLAGS=`$PKG_CONFIG --cflags "libexif = 0.5.12" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$EXIF_LIBS"; then
-- pkg_cv_EXIF_LIBS="$EXIF_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EXIF_LIBS"; then
-+ pkg_cv_EXIF_LIBS="$EXIF_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libexif = 0.5.12") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_EXIF_LIBS=`$PKG_CONFIG --libs "libexif = 0.5.12" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -18379,14 +15186,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libexif = 0.5.12" 2>&1`
-+ EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libexif = 0.5.12"`
- else
-- EXIF_PKG_ERRORS=`$PKG_CONFIG --print-errors "libexif = 0.5.12" 2>&1`
-+ EXIF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libexif = 0.5.12"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$EXIF_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- if false; then
- HAVE_EXIF_TRUE=
-@@ -18408,7 +15215,7 @@
- else
- EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
- EXIF_LIBS=$pkg_cv_EXIF_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-
- if true; then
-@@ -18420,9 +15227,7 @@
- fi
-
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_OLD_EXIF 1
--_ACEOF
-+$as_echo "#define HAVE_OLD_EXIF 1" >>confdefs.h
-
-
- fi
-@@ -18430,7 +15235,7 @@
- else
- EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
- EXIF_LIBS=$pkg_cv_EXIF_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-
- if true; then
-@@ -18442,9 +15247,7 @@
- fi
-
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_EXIF 1
--_ACEOF
-+$as_echo "#define HAVE_EXIF 1" >>confdefs.h
-
-
- fi
-@@ -18464,7 +15267,7 @@
-
-
- # Check whether --enable-xmp was given.
--if test "${enable_xmp+set}" = set; then
-+if test "${enable_xmp+set}" = set; then :
- enableval=$enable_xmp;
- fi
-
-@@ -18472,40 +15275,44 @@
- if test "x$enable_xmp" != "xno"; then
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for EXEMPI" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXEMPI" >&5
- $as_echo_n "checking for EXEMPI... " >&6; }
-
--if test -n "$EXEMPI_CFLAGS"; then
-- pkg_cv_EXEMPI_CFLAGS="$EXEMPI_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.2\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EXEMPI_CFLAGS"; then
-+ pkg_cv_EXEMPI_CFLAGS="$EXEMPI_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "exempi-2.0 >= 1.99.2") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_EXEMPI_CFLAGS=`$PKG_CONFIG --cflags "exempi-2.0 >= 1.99.2" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$EXEMPI_LIBS"; then
-- pkg_cv_EXEMPI_LIBS="$EXEMPI_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.2\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EXEMPI_LIBS"; then
-+ pkg_cv_EXEMPI_LIBS="$EXEMPI_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "exempi-2.0 >= 1.99.2") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_EXEMPI_LIBS=`$PKG_CONFIG --libs "exempi-2.0 >= 1.99.2" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -18518,14 +15325,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- EXEMPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "exempi-2.0 >= 1.99.2" 2>&1`
-+ EXEMPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "exempi-2.0 >= 1.99.2"`
- else
-- EXEMPI_PKG_ERRORS=`$PKG_CONFIG --print-errors "exempi-2.0 >= 1.99.2" 2>&1`
-+ EXEMPI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "exempi-2.0 >= 1.99.2"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$EXEMPI_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- if false; then
- HAVE_EXEMPI_TRUE=
-@@ -18547,7 +15354,7 @@
- else
- EXEMPI_CFLAGS=$pkg_cv_EXEMPI_CFLAGS
- EXEMPI_LIBS=$pkg_cv_EXEMPI_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-
- if true; then
-@@ -18559,9 +15366,7 @@
- fi
-
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_EXEMPI 1
--_ACEOF
-+$as_echo "#define HAVE_EXEMPI 1" >>confdefs.h
-
-
- msg_xmp=yes
-@@ -18569,40 +15374,44 @@
-
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for EXEMPI_NEW_API" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXEMPI_NEW_API" >&5
- $as_echo_n "checking for EXEMPI_NEW_API... " >&6; }
-
--if test -n "$EXEMPI_NEW_API_CFLAGS"; then
-- pkg_cv_EXEMPI_NEW_API_CFLAGS="$EXEMPI_NEW_API_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.5\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EXEMPI_NEW_API_CFLAGS"; then
-+ pkg_cv_EXEMPI_NEW_API_CFLAGS="$EXEMPI_NEW_API_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.5\""; } >&5
- ($PKG_CONFIG --exists --print-errors "exempi-2.0 >= 1.99.5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_EXEMPI_NEW_API_CFLAGS=`$PKG_CONFIG --cflags "exempi-2.0 >= 1.99.5" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$EXEMPI_NEW_API_LIBS"; then
-- pkg_cv_EXEMPI_NEW_API_LIBS="$EXEMPI_NEW_API_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.5\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EXEMPI_NEW_API_LIBS"; then
-+ pkg_cv_EXEMPI_NEW_API_LIBS="$EXEMPI_NEW_API_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.5\""; } >&5
- ($PKG_CONFIG --exists --print-errors "exempi-2.0 >= 1.99.5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_EXEMPI_NEW_API_LIBS=`$PKG_CONFIG --libs "exempi-2.0 >= 1.99.5" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -18615,14 +15424,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- EXEMPI_NEW_API_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "exempi-2.0 >= 1.99.5" 2>&1`
-+ EXEMPI_NEW_API_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "exempi-2.0 >= 1.99.5"`
- else
-- EXEMPI_NEW_API_PKG_ERRORS=`$PKG_CONFIG --print-errors "exempi-2.0 >= 1.99.5" 2>&1`
-+ EXEMPI_NEW_API_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "exempi-2.0 >= 1.99.5"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$EXEMPI_NEW_API_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- true
- elif test $pkg_failed = untried; then
-@@ -18630,12 +15439,10 @@
- else
- EXEMPI_NEW_API_CFLAGS=$pkg_cv_EXEMPI_NEW_API_CFLAGS
- EXEMPI_NEW_API_LIBS=$pkg_cv_EXEMPI_NEW_API_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_EXEMPI_NEW_API 1
--_ACEOF
-+$as_echo "#define HAVE_EXEMPI_NEW_API 1" >>confdefs.h
-
- fi
-
-@@ -18655,7 +15462,7 @@
-
-
- # Check whether --enable-tracker was given.
--if test "${enable_tracker+set}" = set; then
-+if test "${enable_tracker+set}" = set; then :
- enableval=$enable_tracker;
- fi
-
-@@ -18663,40 +15470,44 @@
- if test "x$enable_tracker" != "xno"; then
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for TRACKER" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRACKER" >&5
- $as_echo_n "checking for TRACKER... " >&6; }
-
--if test -n "$TRACKER_CFLAGS"; then
-- pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7\"") >&5
-- ($PKG_CONFIG --exists --print-errors "tracker-client-0.7") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker-client-0.7" 2>/dev/null`
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$TRACKER_CFLAGS"; then
-+ pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "tracker-client-0.8") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker-client-0.8" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$TRACKER_LIBS"; then
-- pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7\"") >&5
-- ($PKG_CONFIG --exists --print-errors "tracker-client-0.7") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker-client-0.7" 2>/dev/null`
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$TRACKER_LIBS"; then
-+ pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "tracker-client-0.8") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker-client-0.8" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -18709,52 +15520,56 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker-client-0.7" 2>&1`
-+ TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker-client-0.8"`
- else
-- TRACKER_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker-client-0.7" 2>&1`
-+ TRACKER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker-client-0.8"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$TRACKER_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for TRACKER" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRACKER" >&5
- $as_echo_n "checking for TRACKER... " >&6; }
-
--if test -n "$TRACKER_CFLAGS"; then
-- pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.0.1\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$TRACKER_CFLAGS"; then
-+ pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.0.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "tracker >= 0.0.1") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker >= 0.0.1" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$TRACKER_LIBS"; then
-- pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.0.1\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$TRACKER_LIBS"; then
-+ pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.0.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "tracker >= 0.0.1") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker >= 0.0.1" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -18767,14 +15582,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker >= 0.0.1" 2>&1`
-+ TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker >= 0.0.1"`
- else
-- TRACKER_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker >= 0.0.1" 2>&1`
-+ TRACKER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker >= 0.0.1"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$TRACKER_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- if false; then
- HAVE_TRACKER_TRUE=
-@@ -18796,7 +15611,7 @@
- else
- TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
- TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-
- if true; then
-@@ -18808,9 +15623,7 @@
- fi
-
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_TRACKER 1
--_ACEOF
-+$as_echo "#define HAVE_TRACKER 1" >>confdefs.h
-
-
- msg_tracker=yes
-@@ -18820,40 +15633,44 @@
-
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for TRACKER" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRACKER" >&5
- $as_echo_n "checking for TRACKER... " >&6; }
-
--if test -n "$TRACKER_CFLAGS"; then
-- pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.0.1\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$TRACKER_CFLAGS"; then
-+ pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.0.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "tracker >= 0.0.1") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker >= 0.0.1" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$TRACKER_LIBS"; then
-- pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.0.1\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$TRACKER_LIBS"; then
-+ pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.0.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "tracker >= 0.0.1") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker >= 0.0.1" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -18866,14 +15683,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker >= 0.0.1" 2>&1`
-+ TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker >= 0.0.1"`
- else
-- TRACKER_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker >= 0.0.1" 2>&1`
-+ TRACKER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker >= 0.0.1"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$TRACKER_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- if false; then
- HAVE_TRACKER_TRUE=
-@@ -18895,7 +15712,7 @@
- else
- TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
- TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-
- if true; then
-@@ -18907,9 +15724,7 @@
- fi
-
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_TRACKER 1
--_ACEOF
-+$as_echo "#define HAVE_TRACKER 1" >>confdefs.h
-
-
- msg_tracker=yes
-@@ -18918,7 +15733,7 @@
- else
- TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
- TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-
- if true; then
-@@ -18930,14 +15745,10 @@
- fi
-
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_TRACKER 1
--_ACEOF
-+$as_echo "#define HAVE_TRACKER 1" >>confdefs.h
-
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_TRACKER_0_7 1
--_ACEOF
-+$as_echo "#define HAVE_TRACKER_0_8 1" >>confdefs.h
-
-
- msg_tracker=yes
-@@ -18959,7 +15770,7 @@
-
-
- # Check whether --enable-beagle was given.
--if test "${enable_beagle+set}" = set; then
-+if test "${enable_beagle+set}" = set; then :
- enableval=$enable_beagle;
- fi
-
-@@ -18974,40 +15785,44 @@
-
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for BEAGLE" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BEAGLE" >&5
- $as_echo_n "checking for BEAGLE... " >&6; }
-
--if test -n "$BEAGLE_CFLAGS"; then
-- pkg_cv_BEAGLE_CFLAGS="$BEAGLE_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$BEAGLE_PKGCONFIG >= 0.2.4\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$BEAGLE_CFLAGS"; then
-+ pkg_cv_BEAGLE_CFLAGS="$BEAGLE_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$BEAGLE_PKGCONFIG >= 0.2.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "$BEAGLE_PKGCONFIG >= 0.2.4") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_BEAGLE_CFLAGS=`$PKG_CONFIG --cflags "$BEAGLE_PKGCONFIG >= 0.2.4" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$BEAGLE_LIBS"; then
-- pkg_cv_BEAGLE_LIBS="$BEAGLE_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$BEAGLE_PKGCONFIG >= 0.2.4\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$BEAGLE_LIBS"; then
-+ pkg_cv_BEAGLE_LIBS="$BEAGLE_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$BEAGLE_PKGCONFIG >= 0.2.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "$BEAGLE_PKGCONFIG >= 0.2.4") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_BEAGLE_LIBS=`$PKG_CONFIG --libs "$BEAGLE_PKGCONFIG >= 0.2.4" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -19020,14 +15835,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- BEAGLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$BEAGLE_PKGCONFIG >= 0.2.4" 2>&1`
-+ BEAGLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$BEAGLE_PKGCONFIG >= 0.2.4"`
- else
-- BEAGLE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$BEAGLE_PKGCONFIG >= 0.2.4" 2>&1`
-+ BEAGLE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$BEAGLE_PKGCONFIG >= 0.2.4"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$BEAGLE_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- if false; then
- HAVE_BEAGLE_TRUE=
-@@ -19043,262 +15858,88 @@
- HAVE_BEAGLE_FALSE='#'
- else
- HAVE_BEAGLE_TRUE='#'
-- HAVE_BEAGLE_FALSE=
--fi
--
--else
-- BEAGLE_CFLAGS=$pkg_cv_BEAGLE_CFLAGS
-- BEAGLE_LIBS=$pkg_cv_BEAGLE_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--
-- if true; then
-- HAVE_BEAGLE_TRUE=
-- HAVE_BEAGLE_FALSE='#'
--else
-- HAVE_BEAGLE_TRUE='#'
-- HAVE_BEAGLE_FALSE=
--fi
--
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_BEAGLE 1
--_ACEOF
--
--
-- msg_beagle=yes
--fi
--
--
--fi
--
--
--
--SELINUX_LIBS=
--msg_selinux=no
--{ $as_echo "$as_me:$LINENO: checking for is_selinux_enabled in -lselinux" >&5
--$as_echo_n "checking for is_selinux_enabled in -lselinux... " >&6; }
--if test "${ac_cv_lib_selinux_is_selinux_enabled+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lselinux $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char is_selinux_enabled ();
--int
--main ()
--{
--return is_selinux_enabled ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_lib_selinux_is_selinux_enabled=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_selinux_is_selinux_enabled=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5
--$as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5
+ $as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; }
-if test "x$ac_cv_lib_selinux_is_selinux_enabled" = x""yes; then
-
-for ac_header in selinux/selinux.h
@@ -17525,30 +16935,17 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+ HAVE_BEAGLE_FALSE=
-+fi
-+
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ BEAGLE_CFLAGS=$pkg_cv_BEAGLE_CFLAGS
-+ BEAGLE_LIBS=$pkg_cv_BEAGLE_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-
+-
- ac_header_compiler=no
-+ if true; then
-+ HAVE_BEAGLE_TRUE=
-+ HAVE_BEAGLE_FALSE='#'
-+else
-+ HAVE_BEAGLE_TRUE='#'
-+ HAVE_BEAGLE_FALSE=
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
+-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -17581,17 +16978,14 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define HAVE_BEAGLE 1" >>confdefs.h
-
+-
- ac_header_preproc=no
-+
-+ msg_beagle=yes
- fi
-
+-fi
+-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
+-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -17625,57 +17019,19 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+fi
-+
-+
-+
-+SELINUX_LIBS=
-+msg_selinux=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_selinux_enabled in -lselinux" >&5
-+$as_echo_n "checking for is_selinux_enabled in -lselinux... " >&6; }
-+if test "${ac_cv_lib_selinux_is_selinux_enabled+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lselinux $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char is_selinux_enabled ();
-+int
-+main ()
-+{
-+return is_selinux_enabled ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_selinux_is_selinux_enabled=yes
-+else
-+ ac_cv_lib_selinux_is_selinux_enabled=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
+-
+-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5
-+$as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; }
+if test "x$ac_cv_lib_selinux_is_selinux_enabled" = x""yes; then :
+ for ac_header in selinux/selinux.h
+do :
@@ -17702,7 +17058,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19323,59 +15964,30 @@
+@@ -18953,59 +15558,30 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -17771,7 +17127,7 @@
SELINUX_LIBS="-lselinux"
msg_selinux=yes
-@@ -19393,12 +16005,10 @@
+@@ -19023,12 +15599,10 @@
# Check whether --enable-empty_view was given.
@@ -17786,7 +17142,7 @@
fi
-@@ -19415,7 +16025,7 @@
+@@ -19045,7 +15619,7 @@
# Check whether --enable-packagekit was given.
@@ -17795,7 +17151,7 @@
enableval=$enable_packagekit;
fi
-@@ -19423,16 +16033,14 @@
+@@ -19053,16 +15627,14 @@
if test "x$enable_packagekit" != "xno"; then
msg_packagekit=yes
@@ -17814,7 +17170,7 @@
enableval=$enable_more_warnings; set_more_warnings="$enableval"
else
-@@ -19445,10 +16053,10 @@
+@@ -19075,10 +15647,10 @@
fi
@@ -17827,7 +17183,7 @@
$as_echo "yes" >&6; }
WARNING_CFLAGS="\
-Wall \
-@@ -19460,13 +16068,9 @@
+@@ -19090,13 +15662,9 @@
for option in -Wstrict-aliasing=0 -Wno-pointer-sign; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -17843,7 +17199,7 @@
/* end confdefs.h. */
int
-@@ -19477,37 +16081,16 @@
+@@ -19107,37 +15675,16 @@
return 0;
}
_ACEOF
@@ -17884,7 +17240,7 @@
$as_echo "$has_option" >&6; }
CFLAGS="$SAVE_CFLAGS"
unset has_option
-@@ -19515,26 +16098,19 @@
+@@ -19145,26 +15692,19 @@
done
unset option
else
@@ -17917,7 +17273,7 @@
/* end confdefs.h. */
#include <time.h>
int main ()
-@@ -19549,65 +16125,32 @@
+@@ -19179,65 +15719,32 @@
}
_ACEOF
@@ -17990,7 +17346,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19625,228 +16168,62 @@
+@@ -19255,43 +15762,18 @@
return 0;
}
_ACEOF
@@ -18033,42 +17389,28 @@
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderFindFormat" >&5
--$as_echo "$ac_cv_lib_Xrender_XRenderFindFormat" >&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
-- :
--fi
--
--
--if $have_render ; then
-- RENDER_LIBS="-lXrender -lXext"
++if test "x$ac_cv_lib_Xrender_XRenderFindFormat" = x""yes; then :
+ have_render=true
+ else
+ :
+@@ -19300,9 +15782,7 @@
+
+ if $have_render ; then
+ RENDER_LIBS="-lXrender -lXext"
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_RENDER 1
-_ACEOF
--
--fi
--
--
--
--
--
--
--LIBEGG_MODULES="gtk+-2.0"
--LIBEGG_CFLAGS="`$PKG_CONFIG --cflags $LIBEGG_MODULES`"
--
--LIBEGG_LIBS="`$PKG_CONFIG --libs $LIBEGG_MODULES`"
--
--
--LIBNAUTILUS_EXTENSION_MODULES="glib-2.0 gtk+-2.0"
--LIBNAUTILUS_EXTENSION_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_EXTENSION_MODULES` $WARNING_CFLAGS"
--
--LIBNAUTILUS_EXTENSION_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_EXTENSION_MODULES`"
--
--
--CORE_MODULES="glib-2.0 gnome-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 unique-1.0 dbus-glib-1 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES"
--CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags $WARNING_CFLAGS"
--
++ $as_echo "#define HAVE_RENDER 1" >>confdefs.h
+
+ fi
+
+@@ -19326,157 +15806,18 @@
+ CORE_MODULES="glib-2.0 gnome-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 unique-1.0 dbus-glib-1 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES"
+ CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags $WARNING_CFLAGS"
+
-CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
-
-
@@ -18164,14 +17506,16 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
+
- ac_header_preproc=no
-fi
--
+
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
--
++DISABLE_DEPRECATED_CFLAGS=""
+
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -18206,55 +17550,18 @@
-$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
+-else
- eval "$as_ac_Header=\$ac_header_preproc"
-+ :
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+
-+
-+if $have_render ; then
-+ RENDER_LIBS="-lXrender -lXext"
-+ $as_echo "#define HAVE_RENDER 1" >>confdefs.h
-
- fi
+
+-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+
-+
-+
-+
-+
-+
-+LIBEGG_MODULES="gtk+-2.0"
-+LIBEGG_CFLAGS="`$PKG_CONFIG --cflags $LIBEGG_MODULES`"
-+
-+LIBEGG_LIBS="`$PKG_CONFIG --libs $LIBEGG_MODULES`"
-+
-+
-+LIBNAUTILUS_EXTENSION_MODULES="glib-2.0 gtk+-2.0"
-+LIBNAUTILUS_EXTENSION_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_EXTENSION_MODULES` $WARNING_CFLAGS"
-+
-+LIBNAUTILUS_EXTENSION_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_EXTENSION_MODULES`"
-+
-+
-+CORE_MODULES="glib-2.0 gnome-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 unique-1.0 dbus-glib-1 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES"
-+CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags $WARNING_CFLAGS"
-+
-+CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
-+
-+
-+DISABLE_DEPRECATED_CFLAGS=""
-+
-+
+for ac_header in X11/XF86keysym.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "X11/XF86keysym.h" "ac_cv_header_X11_XF86keysym_h" "$ac_includes_default"
@@ -18265,7 +17572,7 @@
_ACEOF
fi
-@@ -19857,9 +16234,9 @@
+@@ -19487,9 +15828,9 @@
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -18277,7 +17584,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -19872,14 +16249,14 @@
+@@ -19502,14 +15843,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18295,7 +17602,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-@@ -19888,19 +16265,17 @@
+@@ -19518,19 +15859,17 @@
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -18318,7 +17625,7 @@
fi
-@@ -19912,13 +16287,13 @@
+@@ -19542,13 +15881,13 @@
# Check whether --with-gconf-source was given.
@@ -18334,7 +17641,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -19927,22 +16302,20 @@
+@@ -19557,22 +15896,20 @@
# Check whether --with-gconf-schema-file-dir was given.
@@ -18361,7 +17668,7 @@
esac
fi
-@@ -19959,9 +16332,9 @@
+@@ -19589,9 +15926,9 @@
# Extract the first word of "update-mime-database", so it can be a program name with args.
set dummy update-mime-database; ac_word=$2
@@ -18373,7 +17680,7 @@
$as_echo_n "(cached) " >&6
else
case $UPDATE_MIME_DATABASE in
-@@ -19974,14 +16347,14 @@
+@@ -19604,14 +15941,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18391,7 +17698,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_UPDATE_MIME_DATABASE" && ac_cv_path_UPDATE_MIME_DATABASE="no"
-@@ -19990,17 +16363,17 @@
+@@ -19620,17 +15957,17 @@
fi
UPDATE_MIME_DATABASE=$ac_cv_path_UPDATE_MIME_DATABASE
if test -n "$UPDATE_MIME_DATABASE"; then
@@ -18412,59 +17719,7 @@
enableval=$enable_update_mimedb;
else
enable_update_mimedb=yes
-@@ -20018,7 +16391,7 @@
-
-
- # Check whether --enable-shave was given.
--if test "${enable_shave+set}" = set; then
-+if test "${enable_shave+set}" = set; then :
- enableval=$enable_shave;
- else
- enable_shave=yes
-@@ -20038,9 +16411,9 @@
-
- # Extract the first word of "sed", so it can be a program name with args.
- set dummy sed; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_SED+set}" = set; then
-+if test "${ac_cv_prog_SED+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$SED"; then
-@@ -20051,14 +16424,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_SED="sed"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- test -z "$ac_cv_prog_SED" && ac_cv_prog_SED="false"
-@@ -20066,10 +16439,10 @@
- fi
- SED=$ac_cv_prog_SED
- if test -n "$SED"; then
-- { $as_echo "$as_me:$LINENO: result: $SED" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
- $as_echo "$SED" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -20134,13 +16507,13 @@
+@@ -19675,13 +16012,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -18480,7 +17735,7 @@
esac ;;
esac
done
-@@ -20148,8 +16521,8 @@
+@@ -19689,8 +16026,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -18491,7 +17746,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -20172,11 +16545,11 @@
+@@ -19713,11 +16050,11 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -18505,7 +17760,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -20196,8 +16569,8 @@
+@@ -19737,8 +16074,8 @@
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
@@ -18516,7 +17771,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -20213,277 +16586,167 @@
+@@ -19754,193 +16091,119 @@
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -18720,114 +17975,6 @@
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"HAVE_EXEMPI\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_TRACKER_TRUE}" && test -z "${HAVE_TRACKER_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TRACKER\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_TRACKER\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_TRACKER\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_TRACKER_TRUE}" && test -z "${HAVE_TRACKER_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TRACKER\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_TRACKER\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_TRACKER\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_TRACKER_TRUE}" && test -z "${HAVE_TRACKER_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TRACKER\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_TRACKER\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_TRACKER\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_TRACKER_TRUE}" && test -z "${HAVE_TRACKER_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TRACKER\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_TRACKER\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_TRACKER\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_TRACKER_TRUE}" && test -z "${HAVE_TRACKER_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TRACKER\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_TRACKER\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_TRACKER\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_TRACKER_TRUE}" && test -z "${HAVE_TRACKER_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TRACKER\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_TRACKER\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_TRACKER\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_TRACKER_TRUE}" && test -z "${HAVE_TRACKER_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TRACKER\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_TRACKER\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_TRACKER\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_TRACKER_TRUE}" && test -z "${HAVE_TRACKER_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TRACKER\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_TRACKER\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_TRACKER\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_BEAGLE_TRUE}" && test -z "${HAVE_BEAGLE_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_BEAGLE\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_BEAGLE\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_BEAGLE\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_BEAGLE_TRUE}" && test -z "${HAVE_BEAGLE_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_BEAGLE\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_BEAGLE\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_BEAGLE\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_BEAGLE_TRUE}" && test -z "${HAVE_BEAGLE_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_BEAGLE\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_BEAGLE\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_BEAGLE\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_BEAGLE_TRUE}" && test -z "${HAVE_BEAGLE_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_BEAGLE\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_BEAGLE\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_BEAGLE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_EMPTY_VIEW_TRUE}" && test -z "${ENABLE_EMPTY_VIEW_FALSE}"; then
@@ -18871,7 +18018,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -20493,17 +16756,18 @@
+@@ -19950,17 +16213,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -18897,7 +18044,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -20511,23 +16775,15 @@
+@@ -19968,23 +16232,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -18926,7 +18073,7 @@
as_nl='
'
export as_nl
-@@ -20535,7 +16791,13 @@
+@@ -19992,7 +16248,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -18941,7 +18088,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -20546,7 +16808,7 @@
+@@ -20003,7 +16265,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -18950,7 +18097,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -20569,13 +16831,6 @@
+@@ -20026,13 +16288,6 @@
}
fi
@@ -18964,7 +18111,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -20585,15 +16840,15 @@
+@@ -20042,15 +16297,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -18983,7 +18130,7 @@
IFS=$as_save_IFS
;;
-@@ -20605,12 +16860,16 @@
+@@ -20062,12 +16317,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -19004,7 +18151,7 @@
done
PS1='$ '
PS2='> '
-@@ -20622,7 +16881,89 @@
+@@ -20079,7 +16338,89 @@
LANGUAGE=C
export LANGUAGE
@@ -19095,7 +18242,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -20636,8 +16977,12 @@
+@@ -20093,8 +16434,12 @@
as_basename=false
fi
@@ -19109,7 +18256,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -20657,76 +17002,25 @@
+@@ -20114,76 +16459,25 @@
}
s/.*/./; q'`
@@ -19197,7 +18344,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -20755,8 +17049,56 @@
+@@ -20212,8 +16506,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -19255,7 +18402,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -20775,10 +17117,10 @@
+@@ -20232,10 +16574,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -19268,7 +18415,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -20793,13 +17135,19 @@
+@@ -20250,13 +16592,19 @@
exec 6>&1
@@ -19284,13 +18431,13 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by nautilus $as_me 2.28.4, which was
+ This file was extended by nautilus $as_me 2.30.0, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -20831,13 +17179,15 @@
+@@ -20288,13 +16636,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -19309,7 +18456,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -20856,16 +17206,17 @@
+@@ -20313,16 +16663,17 @@
Configuration commands:
$config_commands
@@ -19320,7 +18467,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- nautilus config.status 2.28.4
+ nautilus config.status 2.30.0
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
@@ -19331,7 +18478,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 @@
+@@ -20358,6 +16709,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -19340,7 +18487,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -20908,20 +17261,19 @@
+@@ -20365,20 +16718,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -19365,7 +18512,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -20929,11 +17281,10 @@
+@@ -20386,11 +16738,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -19380,7 +18527,7 @@
ac_need_defaults=false ;;
esac
-@@ -21277,9 +17628,7 @@
+@@ -20731,9 +17082,7 @@
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -19391,7 +18538,7 @@
esac
done
-@@ -21306,7 +17655,7 @@
+@@ -20760,7 +17109,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -19400,7 +18547,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -21317,11 +17666,7 @@
+@@ -20771,11 +17120,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -19413,7 +18560,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -21329,10 +17674,16 @@
+@@ -20783,10 +17128,16 @@
if test -n "$CONFIG_FILES"; then
@@ -19432,7 +18579,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -21346,24 +17697,18 @@
+@@ -20800,24 +17151,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -19460,7 +18607,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -21385,7 +17730,7 @@
+@@ -20839,7 +17184,7 @@
t delim
:nl
h
@@ -19469,7 +18616,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -21399,7 +17744,7 @@
+@@ -20853,7 +17198,7 @@
t nl
:delim
h
@@ -19478,7 +18625,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -21452,9 +17797,7 @@
+@@ -20906,9 +17251,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -19489,7 +18636,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -21495,9 +17838,7 @@
+@@ -20949,9 +17292,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -19500,7 +18647,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -21582,9 +17923,7 @@
+@@ -21036,9 +17377,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -19511,7 +18658,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -21597,9 +17936,7 @@
+@@ -21051,9 +17390,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -19522,7 +18669,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -21627,12 +17964,10 @@
+@@ -21081,12 +17418,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -19537,7 +18684,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -21643,7 +17978,7 @@
+@@ -21097,7 +17432,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -19546,7 +18693,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -21656,9 +17991,7 @@
+@@ -21110,9 +17445,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -19557,7 +18704,7 @@
esac
;;
esac
-@@ -21686,47 +18019,7 @@
+@@ -21140,47 +17473,7 @@
q
}
s/.*/./; q'`
@@ -19606,7 +18753,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -21783,7 +18076,6 @@
+@@ -21237,7 +17530,6 @@
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -19614,7 +18761,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -21793,12 +18085,11 @@
+@@ -21247,12 +17539,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -19629,7 +18776,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -21808,7 +18099,7 @@
+@@ -21262,7 +17553,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -19638,7 +18785,7 @@
esac
_ACEOF
-@@ -21837,14 +18128,12 @@
+@@ -21291,14 +17582,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -19655,7 +18802,7 @@
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
-@@ -21854,9 +18143,7 @@
+@@ -21308,9 +17597,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -19666,7 +18813,7 @@
;;
:H)
#
-@@ -21867,25 +18154,19 @@
+@@ -21321,25 +17608,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -19696,7 +18843,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -21923,7 +18204,7 @@
+@@ -21377,7 +17658,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -19705,7 +18852,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -22018,47 +18299,7 @@
+@@ -21472,47 +17753,7 @@
q
}
s/.*/./; q'`
@@ -19754,7 +18901,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -22711,9 +18952,7 @@
+@@ -22165,9 +18406,7 @@
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -19765,7 +18912,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -22736,15 +18975,12 @@
+@@ -22190,15 +18429,12 @@
done # for ac_tag
@@ -19783,7 +18930,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -22765,10 +19001,10 @@
+@@ -22219,10 +18455,10 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -19796,17 +18943,11 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-Index: nautilus-2.28.4/cut-n-paste-code/libegg/Makefile.in
+Index: nautilus-2.30.0/cut-n-paste-code/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/cut-n-paste-code/libegg/Makefile.in 2009-12-15 10:12:57.000000000 +0100
-+++ nautilus-2.28.4/cut-n-paste-code/libegg/Makefile.in 2010-04-09 02:23:22.385092385 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -188,6 +188,7 @@
+--- nautilus-2.30.0.orig/cut-n-paste-code/Makefile.in 2010-04-13 23:22:33.791716084 +0200
++++ nautilus-2.30.0/cut-n-paste-code/Makefile.in 2010-04-13 23:22:09.459709541 +0200
+@@ -198,6 +198,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19814,17 +18955,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.4/cut-n-paste-code/Makefile.in
+Index: nautilus-2.30.0/cut-n-paste-code/libegg/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/cut-n-paste-code/Makefile.in 2009-12-15 10:12:57.000000000 +0100
-+++ nautilus-2.28.4/cut-n-paste-code/Makefile.in 2010-04-09 02:23:22.221093284 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -199,6 +199,7 @@
+--- nautilus-2.30.0.orig/cut-n-paste-code/libegg/Makefile.in 2010-04-13 23:22:33.927711892 +0200
++++ nautilus-2.30.0/cut-n-paste-code/libegg/Makefile.in 2010-04-13 23:22:09.647709190 +0200
+@@ -197,6 +197,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19832,35 +18967,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -330,7 +331,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -355,7 +356,7 @@
- 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
+Index: nautilus-2.30.0/data/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/data/icons/Makefile.in 2009-12-15 10:12:57.000000000 +0100
-+++ nautilus-2.28.4/data/icons/Makefile.in 2010-04-09 02:23:22.613094325 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -161,6 +161,7 @@
+--- nautilus-2.30.0.orig/data/Makefile.in 2010-04-13 23:22:31.411713487 +0200
++++ nautilus-2.30.0/data/Makefile.in 2010-04-13 23:22:09.775710973 +0200
+@@ -234,6 +234,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19868,17 +18979,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.4/data/Makefile.in
+Index: nautilus-2.30.0/data/icons/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/data/Makefile.in 2009-12-15 10:12:57.000000000 +0100
-+++ nautilus-2.28.4/data/Makefile.in 2010-04-09 02:23:22.513092479 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -235,6 +235,7 @@
+--- nautilus-2.30.0.orig/data/icons/Makefile.in 2010-04-13 23:22:31.611716055 +0200
++++ nautilus-2.30.0/data/icons/Makefile.in 2010-04-13 23:22:09.879710809 +0200
+@@ -160,6 +160,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19886,35 +18991,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -478,7 +479,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -503,7 +504,7 @@
- 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
+Index: nautilus-2.30.0/data/patterns/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/data/patterns/Makefile.in 2009-12-15 10:12:57.000000000 +0100
-+++ nautilus-2.28.4/data/patterns/Makefile.in 2010-04-09 02:23:22.729094862 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -183,6 +183,7 @@
+--- nautilus-2.30.0.orig/data/patterns/Makefile.in 2010-04-13 23:22:31.499716029 +0200
++++ nautilus-2.30.0/data/patterns/Makefile.in 2010-04-13 23:22:09.983710361 +0200
+@@ -182,6 +182,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19922,17 +19003,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.4/docs/Makefile.in
+Index: nautilus-2.30.0/docs/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/docs/Makefile.in 2009-12-15 10:12:57.000000000 +0100
-+++ nautilus-2.28.4/docs/Makefile.in 2010-04-09 02:23:22.853094456 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -224,6 +224,7 @@
+--- nautilus-2.30.0.orig/docs/Makefile.in 2010-04-13 23:22:31.731710675 +0200
++++ nautilus-2.30.0/docs/Makefile.in 2010-04-13 23:22:10.107711355 +0200
+@@ -223,6 +223,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19940,35 +19015,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -416,7 +417,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -441,7 +442,7 @@
- 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
+Index: nautilus-2.30.0/docs/reference/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/docs/reference/libnautilus-extension/Makefile.in 2009-12-15 10:12:57.000000000 +0100
-+++ nautilus-2.28.4/docs/reference/libnautilus-extension/Makefile.in 2010-04-09 02:23:23.077092249 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -166,6 +166,7 @@
+--- nautilus-2.30.0.orig/docs/reference/Makefile.in 2010-04-13 23:22:31.883717744 +0200
++++ nautilus-2.30.0/docs/reference/Makefile.in 2010-04-13 23:22:10.211708406 +0200
+@@ -198,6 +198,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19976,17 +19027,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.4/docs/reference/Makefile.in
+Index: nautilus-2.30.0/docs/reference/libnautilus-extension/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/docs/reference/Makefile.in 2009-12-15 10:12:57.000000000 +0100
-+++ nautilus-2.28.4/docs/reference/Makefile.in 2010-04-09 02:23:22.957093172 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -199,6 +199,7 @@
+--- nautilus-2.30.0.orig/docs/reference/libnautilus-extension/Makefile.in 2010-04-13 23:22:32.039713022 +0200
++++ nautilus-2.30.0/docs/reference/libnautilus-extension/Makefile.in 2010-04-13 23:22:10.343711533 +0200
+@@ -165,6 +165,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19994,34 +19039,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -330,7 +331,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -355,7 +356,7 @@
- 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
+Index: nautilus-2.30.0/eel/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/eel/Makefile.in 2009-12-15 10:12:58.000000000 +0100
-+++ nautilus-2.28.4/eel/Makefile.in 2010-04-09 02:23:23.241092480 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- nautilus-2.30.0.orig/eel/Makefile.in 2010-04-13 23:22:32.459711776 +0200
++++ nautilus-2.30.0/eel/Makefile.in 2010-04-13 23:22:10.535710277 +0200
@@ -52,7 +52,9 @@
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -20033,7 +19054,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 @@
+@@ -217,6 +219,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20041,7 +19062,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -308,6 +311,9 @@
+@@ -312,6 +315,9 @@
libeel_2_la_LDFLAGS = \
-no-undefined \
@@ -20051,17 +19072,11 @@
$(CORE_LIBS) \
$(RENDER_LIBS) \
$(X_LIBS) \
-Index: nautilus-2.28.4/icons/Makefile.in
+Index: nautilus-2.30.0/icons/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/icons/Makefile.in 2009-12-15 10:12:58.000000000 +0100
-+++ nautilus-2.28.4/icons/Makefile.in 2010-04-09 02:23:23.341094324 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -183,6 +183,7 @@
+--- nautilus-2.30.0.orig/icons/Makefile.in 2010-04-13 23:22:39.959713730 +0200
++++ nautilus-2.30.0/icons/Makefile.in 2010-04-13 23:22:10.659710160 +0200
+@@ -182,6 +182,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20069,343 +19084,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.4/INSTALL
+Index: nautilus-2.30.0/libnautilus-extension/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/INSTALL 2009-05-23 20:14:13.000000000 +0200
-+++ nautilus-2.28.4/INSTALL 2010-04-09 02:23:24.277095949 +0200
-@@ -2,18 +2,24 @@
- *************************
-
- Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
--2006, 2007 Free Software Foundation, Inc.
-+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
--This file is free documentation; the Free Software Foundation gives
--unlimited permission to copy, distribute and modify it.
-+ Copying and distribution of this file, with or without modification,
-+are permitted in any medium without royalty provided the copyright
-+notice and this notice are preserved. This file is offered as-is,
-+without warranty of any kind.
-
- Basic Installation
- ==================
-
--Briefly, the shell commands `./configure; make; make install' should
-+ Briefly, the shell commands `./configure; make; make install' should
- configure, build, and install this package. The following
- more-detailed instructions are generic; see the `README' file for
--instructions specific to this package.
-+instructions specific to this package. Some packages provide this
-+`INSTALL' file but do not implement all of the features documented
-+below. The lack of an optional feature in a given package is not
-+necessarily a bug. More recommendations for GNU packages can be found
-+in *note Makefile Conventions: (standards)Makefile Conventions.
-
- The `configure' shell script attempts to guess correct values for
- various system-dependent variables used during compilation. It uses
-@@ -42,7 +48,7 @@
- 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 @@
- 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 @@
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-- 6. Often, you can also type `make uninstall' to remove the installed
-- files again.
-+ 7. Often, you can also type `make uninstall' to remove the installed
-+ files again. In practice, not all packages have tested that
-+ uninstallation works correctly, even though it is required by the
-+ GNU Coding Standards.
-+
-+ 8. Some packages, particularly those that use Automake, provide `make
-+ distcheck', which can by used by developers to test that all other
-+ targets like `make install' and `make uninstall' work correctly.
-+ This target is generally not run by end users.
-
- Compilers and Options
- =====================
-
--Some systems require unusual options for compilation or linking that the
--`configure' script does not know about. Run `./configure --help' for
--details on some of the pertinent environment variables.
-+ Some systems require unusual options for compilation or linking that
-+the `configure' script does not know about. Run `./configure --help'
-+for details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
- by setting variables in the command line or in the environment. Here
-@@ -88,25 +111,41 @@
- Compiling For Multiple Architectures
- ====================================
-
--You can compile the package for more than one kind of computer at the
-+ You can compile the package for more than one kind of computer at the
- same time, by placing the object files for each architecture in their
- own directory. To do this, you can use GNU `make'. `cd' to the
- directory where you want the object files and executables to go and run
- the `configure' script. `configure' automatically checks for the
--source code in the directory that `configure' is in and in `..'.
-+source code in the directory that `configure' is in and in `..'. This
-+is known as a "VPATH" build.
-
- With a non-GNU `make', it is safer to compile the package for one
- architecture at a time in the source code directory. After you have
- installed the package for one architecture, use `make distclean' before
- reconfiguring for another architecture.
-
-+ On MacOS X 10.5 and later systems, you can create libraries and
-+executables that work on multiple system types--known as "fat" or
-+"universal" binaries--by specifying multiple `-arch' options to the
-+compiler but only a single `-arch' option to the preprocessor. Like
-+this:
-+
-+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+ CPP="gcc -E" CXXCPP="g++ -E"
-+
-+ This is not guaranteed to produce working output in all cases, you
-+may have to build one architecture at a time and combine the results
-+using the `lipo' tool if you have problems.
-+
- Installation Names
- ==================
-
--By default, `make install' installs the package's commands under
-+ By default, `make install' installs the package's commands under
- `/usr/local/bin', include files under `/usr/local/include', etc. You
- can specify an installation prefix other than `/usr/local' by giving
--`configure' the option `--prefix=PREFIX'.
-+`configure' the option `--prefix=PREFIX', where PREFIX must be an
-+absolute file name.
-
- You can specify separate installation prefixes for
- architecture-specific files and architecture-independent files. If you
-@@ -117,16 +156,47 @@
- In addition, if you use an unusual directory layout you can give
- options like `--bindir=DIR' to specify different values for particular
- kinds of files. Run `configure --help' for a list of the directories
--you can set and what kinds of files go in them.
-+you can set and what kinds of files go in them. In general, the
-+default for these options is expressed in terms of `${prefix}', so that
-+specifying just `--prefix' will affect all of the other directory
-+specifications that were not explicitly provided.
-+
-+ The most portable way to affect installation locations is to pass the
-+correct locations to `configure'; however, many packages provide one or
-+both of the following shortcuts of passing variable assignments to the
-+`make install' command line to change installation locations without
-+having to reconfigure or recompile.
-+
-+ The first method involves providing an override variable for each
-+affected directory. For example, `make install
-+prefix=/alternate/directory' will choose an alternate location for all
-+directory configuration variables that were expressed in terms of
-+`${prefix}'. Any directories that were specified during `configure',
-+but not in terms of `${prefix}', must each be overridden at install
-+time for the entire installation to be relocated. The approach of
-+makefile variable overrides for each directory variable is required by
-+the GNU Coding Standards, and ideally causes no recompilation.
-+However, some platforms have known limitations with the semantics of
-+shared libraries that end up requiring recompilation when using this
-+method, particularly noticeable in packages that use GNU Libtool.
-+
-+ The second method involves providing the `DESTDIR' variable. For
-+example, `make install DESTDIR=/alternate/directory' will prepend
-+`/alternate/directory' before all installation names. The approach of
-+`DESTDIR' overrides is not required by the GNU Coding Standards, and
-+does not work on platforms that have drive letters. On the other hand,
-+it does better at avoiding recompilation issues, and works well even
-+when some directory options were not specified in terms of `${prefix}'
-+at `configure' time.
-+
-+Optional Features
-+=================
-
- If the package supports it, you can cause programs to be installed
- with an extra prefix or suffix on their names by giving `configure' the
- option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
--Optional Features
--=================
--
--Some packages pay attention to `--enable-FEATURE' options to
-+ Some packages pay attention to `--enable-FEATURE' options to
- `configure', where FEATURE indicates an optional part of the package.
- They may also pay attention to `--with-PACKAGE' options, where PACKAGE
- is something like `gnu-as' or `x' (for the X Window System). The
-@@ -138,14 +208,53 @@
- you can use the `configure' options `--x-includes=DIR' and
- `--x-libraries=DIR' to specify their locations.
-
-+ Some packages offer the ability to configure how verbose the
-+execution of `make' will be. For these packages, running `./configure
-+--enable-silent-rules' sets the default to minimal output, which can be
-+overridden with `make V=1'; while running `./configure
-+--disable-silent-rules' sets the default to verbose, which can be
-+overridden with `make V=0'.
-+
-+Particular systems
-+==================
-+
-+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-+CC is not installed, it is recommended to use the following options in
-+order to use an ANSI C compiler:
-+
-+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-+
-+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-+
-+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
-+a workaround. If GNU CC is not installed, it is therefore recommended
-+to try
-+
-+ ./configure CC="cc"
-+
-+and if that doesn't work, try
-+
-+ ./configure CC="cc -nodtk"
-+
-+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
-+directory contains several dysfunctional programs; working variants of
-+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
-+in your `PATH', put it _after_ `/usr/bin'.
-+
-+ On Haiku, software installed for all users goes in `/boot/common',
-+not `/usr/local'. It is recommended to use the following options:
-+
-+ ./configure --prefix=/boot/common
-+
- Specifying the System Type
- ==========================
-
--There may be some features `configure' cannot figure out automatically,
--but needs to determine by the type of machine the package will run on.
--Usually, assuming the package is built to be run on the _same_
--architectures, `configure' can figure that out, but if it prints a
--message saying it cannot guess the machine type, give it the
-+ There may be some features `configure' cannot figure out
-+automatically, but needs to determine by the type of machine the package
-+will run on. Usually, assuming the package is built to be run on the
-+_same_ architectures, `configure' can figure that out, but if it prints
-+a message saying it cannot guess the machine type, give it the
- `--build=TYPE' option. TYPE can either be a short name for the system
- type, such as `sun4', or a canonical name which has the form:
-
-@@ -153,7 +262,8 @@
-
- where SYSTEM can have one of these forms:
-
-- OS KERNEL-OS
-+ OS
-+ KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
- `config.sub' isn't included in this package, then this package doesn't
-@@ -171,9 +281,9 @@
- Sharing Defaults
- ================
-
--If you want to set default values for `configure' scripts to share, you
--can create a site shell script called `config.site' that gives default
--values for variables like `CC', `cache_file', and `prefix'.
-+ If you want to set default values for `configure' scripts to share,
-+you can create a site shell script called `config.site' that gives
-+default values for variables like `CC', `cache_file', and `prefix'.
- `configure' looks for `PREFIX/share/config.site' if it exists, then
- `PREFIX/etc/config.site' if it exists. Or, you can set the
- `CONFIG_SITE' environment variable to the location of the site script.
-@@ -182,7 +292,7 @@
- Defining Variables
- ==================
-
--Variables not defined in a site shell script can be set in the
-+ Variables not defined in a site shell script can be set in the
- environment passed to `configure'. However, some packages may run
- configure again during the build, and the customized values of these
- variables may be lost. In order to avoid this problem, you should set
-@@ -201,11 +311,19 @@
- `configure' Invocation
- ======================
-
--`configure' recognizes the following options to control how it operates.
-+ `configure' recognizes the following options to control how it
-+operates.
-
- `--help'
- `-h'
-- Print a summary of the options to `configure', and exit.
-+ Print a summary of all of the options to `configure', and exit.
-+
-+`--help=short'
-+`--help=recursive'
-+ Print a summary of the options unique to this package's
-+ `configure', and exit. The `short' variant lists options used
-+ only in the top level, while the `recursive' variant lists options
-+ also present in any nested packages.
-
- `--version'
- `-V'
-@@ -232,6 +350,16 @@
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-+`--prefix=DIR'
-+ Use DIR as the installation prefix. *note Installation Names::
-+ for more details, including other options available for fine-tuning
-+ the installation locations.
-+
-+`--no-create'
-+`-n'
-+ Run the configure checks, but stop before creating any output
-+ files.
-+
- `configure' also accepts some other, not widely useful, options. Run
- `configure --help' for more details.
-
-Index: nautilus-2.28.4/libnautilus-extension/Makefile.in
-===================================================================
---- nautilus-2.28.4.orig/libnautilus-extension/Makefile.in 2009-12-15 10:12:58.000000000 +0100
-+++ nautilus-2.28.4/libnautilus-extension/Makefile.in 2010-04-09 02:23:23.481094551 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -222,6 +222,7 @@
+--- nautilus-2.30.0.orig/libnautilus-extension/Makefile.in 2010-04-13 23:22:34.595713177 +0200
++++ nautilus-2.30.0/libnautilus-extension/Makefile.in 2010-04-13 23:22:10.839709906 +0200
+@@ -232,6 +232,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20413,17 +19096,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.4/libnautilus-private/Makefile.in
+Index: nautilus-2.30.0/libnautilus-private/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/libnautilus-private/Makefile.in 2009-12-15 10:12:58.000000000 +0100
-+++ nautilus-2.28.4/libnautilus-private/Makefile.in 2010-04-09 02:23:23.657093788 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -341,6 +341,7 @@
+--- nautilus-2.30.0.orig/libnautilus-private/Makefile.in 2010-04-13 23:22:29.371713140 +0200
++++ nautilus-2.30.0/libnautilus-private/Makefile.in 2010-04-13 23:22:11.067710725 +0200
+@@ -264,6 +264,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20431,39 +19108,28 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.4/ltmain.sh
+Index: nautilus-2.30.0/ltmain.sh
===================================================================
---- nautilus-2.28.4.orig/ltmain.sh 2009-12-15 10:12:49.000000000 +0100
-+++ nautilus-2.28.4/ltmain.sh 2010-04-09 02:23:05.649105896 +0200
-@@ -1,6 +1,6 @@
- # Generated from ltmain.m4sh.
-
--# ltmain.sh (GNU libtool) 2.2.6
-+# ltmain.sh (GNU libtool) 2.2.6b
- # Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+--- nautilus-2.30.0.orig/ltmain.sh 2010-04-13 23:22:33.671713087 +0200
++++ nautilus-2.30.0/ltmain.sh 2010-04-13 23:21:18.239710577 +0200
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
--# $progname: (GNU libtool) 2.2.6
+-# $progname: (GNU libtool) 2.2.6b
+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2
# automake: $automake_version
# autoconf: $autoconf_version
#
-@@ -73,9 +73,9 @@
+@@ -73,7 +73,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
--VERSION=2.2.6
+-VERSION=2.2.6b
+VERSION="2.2.6b Debian-2.2.6b-2"
TIMESTAMP=""
--package_revision=1.3012
-+package_revision=1.3017
-
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ package_revision=1.3017
+
@@ -5033,7 +5033,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
@@ -20524,366 +19190,10 @@
esac
;;
no)
-Index: nautilus-2.28.4/Makefile.in
+Index: nautilus-2.30.0/m4/libtool.m4
===================================================================
---- nautilus-2.28.4.orig/Makefile.in 2009-12-15 10:12:59.000000000 +0100
-+++ nautilus-2.28.4/Makefile.in 2010-04-09 02:23:24.357095245 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -216,6 +216,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_REQUIRED = @PANGO_REQUIRED@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -414,7 +415,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -439,7 +440,7 @@
- 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 @@
- 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 @@
- 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
-===================================================================
---- nautilus-2.28.4.orig/src/file-manager/Makefile.in 2009-12-15 10:12:59.000000000 +0100
-+++ nautilus-2.28.4/src/file-manager/Makefile.in 2010-04-09 02:23:24.077092808 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -223,6 +223,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_REQUIRED = @PANGO_REQUIRED@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.4/src/Makefile.in
-===================================================================
---- nautilus-2.28.4.orig/src/Makefile.in 2009-12-15 10:12:58.000000000 +0100
-+++ nautilus-2.28.4/src/Makefile.in 2010-04-09 02:23:23.937093699 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -342,6 +342,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_REQUIRED = @PANGO_REQUIRED@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -858,7 +859,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -883,7 +884,7 @@
- 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
-===================================================================
---- nautilus-2.28.4.orig/test/Makefile.in 2009-12-15 10:12:59.000000000 +0100
-+++ nautilus-2.28.4/test/Makefile.in 2010-04-09 02:23:24.241095833 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -271,6 +271,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_REQUIRED = @PANGO_REQUIRED@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.4/config.sub
-===================================================================
---- nautilus-2.28.4.orig/config.sub 2009-12-15 10:12:56.000000000 +0100
-+++ nautilus-2.28.4/config.sub 2010-04-09 02:23:22.037096650 +0200
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # 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, 2010
- # Free Software Foundation, Inc.
-
--timestamp='2009-04-17'
-+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
-@@ -32,13 +32,16 @@
-
-
- # 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 @@
- 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 @@
- -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
- ;;
-+ -bluegene*)
-+ os=-cnk
-+ ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
-@@ -281,6 +288,7 @@
- | 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 @@
- | 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 @@
- | 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 @@
- | 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 @@
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
-+ bluegene*)
-+ basic_machine=powerpc-ibm
-+ os=-cnk
-+ ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
-@@ -719,6 +734,9 @@
- basic_machine=ns32k-utek
- os=-sysv
- ;;
-+ microblaze)
-+ basic_machine=microblaze-xilinx
-+ ;;
- mingw32)
- basic_machine=i386-pc
- os=-mingw32
-@@ -1069,6 +1087,11 @@
- 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 @@
- # 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 @@
- # 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* | -auroraux* | -solaris* \
-+ | -sym* | -kopensolaris* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-@@ -1283,7 +1309,7 @@
- | -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 @@
- -dicos*)
- os=-dicos
- ;;
-+ -nacl*)
-+ ;;
- -none)
- ;;
- *)
-@@ -1613,7 +1641,7 @@
- -sunos*)
- vendor=sun
- ;;
-- -aix*)
-+ -cnk*|-aix*)
- vendor=ibm
- ;;
- -beos*)
-Index: nautilus-2.28.4/m4/Makefile.in
-===================================================================
---- nautilus-2.28.4.orig/m4/Makefile.in 2009-12-15 10:12:58.000000000 +0100
-+++ nautilus-2.28.4/m4/Makefile.in 2010-04-09 02:23:23.749092941 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -160,6 +160,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_REQUIRED = @PANGO_REQUIRED@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.4/m4/libtool.m4
-===================================================================
---- nautilus-2.28.4.orig/m4/libtool.m4 2009-12-15 10:12:49.000000000 +0100
-+++ nautilus-2.28.4/m4/libtool.m4 2010-04-09 02:23:05.733097046 +0200
+--- nautilus-2.30.0.orig/m4/libtool.m4 2010-04-13 23:22:40.327711730 +0200
++++ nautilus-2.30.0/m4/libtool.m4 2010-04-13 23:21:18.415717628 +0200
@@ -2445,7 +2445,7 @@
;;
@@ -21040,28 +19350,39 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-Index: nautilus-2.28.4/m4/ltversion.m4
+Index: nautilus-2.30.0/src/Makefile.in
===================================================================
---- nautilus-2.28.4.orig/m4/ltversion.m4 2009-12-15 10:12:49.000000000 +0100
-+++ nautilus-2.28.4/m4/ltversion.m4 2010-04-09 02:23:05.981096506 +0200
-@@ -9,15 +9,15 @@
-
- # Generated from ltversion.in.
-
--# serial 3012 ltversion.m4
-+# serial 3017 ltversion.m4
- # This file is part of GNU Libtool
-
--m4_define([LT_PACKAGE_VERSION], [2.2.6])
--m4_define([LT_PACKAGE_REVISION], [1.3012])
-+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-+m4_define([LT_PACKAGE_REVISION], [1.3017])
-
- AC_DEFUN([LTVERSION_VERSION],
--[macro_version='2.2.6'
--macro_revision='1.3012'
-+[macro_version='2.2.6b'
-+macro_revision='1.3017'
- _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
- _LT_DECL(, macro_revision, 0)
- ])
+--- nautilus-2.30.0.orig/src/Makefile.in 2010-04-13 23:22:34.887715739 +0200
++++ nautilus-2.30.0/src/Makefile.in 2010-04-13 23:22:11.275710973 +0200
+@@ -353,6 +353,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_REQUIRED = @PANGO_REQUIRED@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+Index: nautilus-2.30.0/src/file-manager/Makefile.in
+===================================================================
+--- nautilus-2.30.0.orig/src/file-manager/Makefile.in 2010-04-13 23:22:35.031716192 +0200
++++ nautilus-2.30.0/src/file-manager/Makefile.in 2010-04-13 23:22:11.427711054 +0200
+@@ -232,6 +232,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_REQUIRED = @PANGO_REQUIRED@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+Index: nautilus-2.30.0/test/Makefile.in
+===================================================================
+--- nautilus-2.30.0.orig/test/Makefile.in 2010-04-13 23:22:39.263713355 +0200
++++ nautilus-2.30.0/test/Makefile.in 2010-04-13 23:22:11.659710160 +0200
+@@ -280,6 +280,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_REQUIRED = @PANGO_REQUIRED@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
More information about the pkg-gnome-commits
mailing list