r22043 - in /desktop/unstable/control-center/debian: changelog control control.in patches/70_relibtoolize.patch rules
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Thu Oct 22 03:43:50 UTC 2009
Author: pochu
Date: Thu Oct 22 03:43:50 2009
New Revision: 22043
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22043
Log:
* New upstream release.
- debian/patches/70_relibtoolize.patch:
+ Updated.
- debian/control.in:
+ Stop build depending on libhal-dev, it's not needed anymore.
* debian/rules: Remove check-dist.mk include to upload to unstable.
Modified:
desktop/unstable/control-center/debian/changelog
desktop/unstable/control-center/debian/control
desktop/unstable/control-center/debian/control.in
desktop/unstable/control-center/debian/patches/70_relibtoolize.patch
desktop/unstable/control-center/debian/rules
Modified: desktop/unstable/control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/changelog?rev=22043&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/changelog [utf-8] (original)
+++ desktop/unstable/control-center/debian/changelog [utf-8] Thu Oct 22 03:43:50 2009
@@ -1,3 +1,14 @@
+control-center (1:2.28.1-1) unstable; urgency=low
+
+ * New upstream release.
+ - debian/patches/70_relibtoolize.patch:
+ + Updated.
+ - debian/control.in:
+ + Stop build depending on libhal-dev, it's not needed anymore.
+ * debian/rules: Remove check-dist.mk include to upload to unstable.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Thu, 22 Oct 2009 05:11:23 +0200
+
control-center (1:2.28.0-2) experimental; urgency=low
* Build depend on a recent libslab-dev to build against one that doesn't
Modified: desktop/unstable/control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/control?rev=22043&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/control [utf-8] (original)
+++ desktop/unstable/control-center/debian/control [utf-8] Thu Oct 22 03:43:50 2009
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>
Standards-Version: 3.8.3
Build-Depends: cdbs (>= 0.4.41),
gnome-pkg-tools (>= 0.10),
@@ -37,7 +37,6 @@
libgnomekbd-dev (>= 2.27.4),
libxklavier-dev (>= 4.0),
libebook1.2-dev (>= 1.7.90),
- libhal-dev (>= 0.5.6),
libunique-dev,
desktop-file-utils,
shared-mime-info,
Modified: desktop/unstable/control-center/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/control.in?rev=22043&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/control.in [utf-8] (original)
+++ desktop/unstable/control-center/debian/control.in [utf-8] Thu Oct 22 03:43:50 2009
@@ -37,7 +37,6 @@
libgnomekbd-dev (>= 2.27.4),
libxklavier-dev (>= 4.0),
libebook1.2-dev (>= 1.7.90),
- libhal-dev (>= 0.5.6),
libunique-dev,
desktop-file-utils,
shared-mime-info,
Modified: desktop/unstable/control-center/debian/patches/70_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/patches/70_relibtoolize.patch?rev=22043&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/patches/70_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/control-center/debian/patches/70_relibtoolize.patch [utf-8] Thu Oct 22 03:43:50 2009
@@ -6,7 +6,7 @@
--- a/aclocal.m4
+++ b/aclocal.m4
-@@ -13,1892 +13,1891 @@
+@@ -13,1892 +13,1894 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
@@ -350,10 +350,7 @@
- [case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac])
-+ CATOBJEXT=NONE
-+ XGETTEXT=:
-+ INTLLIBS=
-
+-
- 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
@@ -370,10 +367,7 @@
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+ AC_CHECK_HEADER(libintl.h,
-+ [gt_cv_func_dgettext_libintl="no"
-+ libintl_extra_libs=""
-
+-
- # 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
@@ -392,28 +386,7 @@
- continue
- else
- break
-+ #
-+ # First check in libc
-+ #
-+ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
-+ [AC_TRY_LINK([
-+#include <libintl.h>
-+],
-+ [return !ngettext ("","", 1)],
-+ gt_cv_func_ngettext_libc=yes,
-+ gt_cv_func_ngettext_libc=no)
-+ ])
-+
-+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-+ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
-+ [AC_TRY_LINK([
-+#include <libintl.h>
-+],
-+ [return !dgettext ("","")],
-+ gt_cv_func_dgettext_libc=yes,
-+ gt_cv_func_dgettext_libc=no)
-+ ])
- fi
+- fi
- ;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
@@ -444,10 +417,7 @@
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
- break
-+
-+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-+ AC_CHECK_FUNCS(bind_textdomain_codeset)
- fi
+- fi
- fi
- done
-
@@ -473,7 +443,7 @@
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
+-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
@@ -488,60 +458,18 @@
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-])
-+ #
-+ # If we don't have everything we want, check in libintl
-+ #
-+ if test "$gt_cv_func_dgettext_libc" != "yes" \
-+ || test "$gt_cv_func_ngettext_libc" != "yes" \
-+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-+
-+ AC_CHECK_LIB(intl, bindtextdomain,
-+ [AC_CHECK_LIB(intl, ngettext,
-+ [AC_CHECK_LIB(intl, dgettext,
-+ gt_cv_func_dgettext_libintl=yes)])])
-
+-
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-+ AC_MSG_CHECKING([if -liconv is needed to use gettext])
-+ AC_MSG_RESULT([])
-+ AC_CHECK_LIB(intl, ngettext,
-+ [AC_CHECK_LIB(intl, dcgettext,
-+ [gt_cv_func_dgettext_libintl=yes
-+ libintl_extra_libs=-liconv],
-+ :,-liconv)],
-+ :,-liconv)
-+ fi
-
+-
-# 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.
-+ #
-+ # If we found libintl, then check in it for bind_textdomain_codeset();
-+ # we'll prefer libc if neither have bind_textdomain_codeset(),
-+ # and both have dgettext and ngettext
-+ #
-+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-+ glib_save_LIBS="$LIBS"
-+ LIBS="$LIBS -lintl $libintl_extra_libs"
-+ unset ac_cv_func_bind_textdomain_codeset
-+ AC_CHECK_FUNCS(bind_textdomain_codeset)
-+ LIBS="$glib_save_LIBS"
-
+-
-#serial 5
-+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-+ gt_cv_func_dgettext_libc=no
-+ else
-+ if test "$gt_cv_func_dgettext_libc" = "yes" \
-+ && test "$gt_cv_func_ngettext_libc" = "yes"; then
-+ gt_cv_func_dgettext_libintl=no
-+ fi
-+ fi
-+ fi
-+ fi
-
+-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -679,7 +607,10 @@
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
--
++ CATOBJEXT=NONE
++ XGETTEXT=:
++ INTLLIBS=
+
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
@@ -721,18 +652,68 @@
-[m4_provide_if([_AM_COMPILER_EXEEXT],
- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
--
++ AC_CHECK_HEADER(libintl.h,
++ [gt_cv_func_dgettext_libintl="no"
++ libintl_extra_libs=""
+
-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])])
--
--
++ #
++ # First check in libc
++ #
++ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
++ [AC_TRY_LINK([
++#include <libintl.h>
++],
++ [return !ngettext ("","", 1)],
++ gt_cv_func_ngettext_libc=yes,
++ gt_cv_func_ngettext_libc=no)
++ ])
++
++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
++ [AC_TRY_LINK([
++#include <libintl.h>
++],
++ [return !dgettext ("","")],
++ gt_cv_func_dgettext_libc=yes,
++ gt_cv_func_dgettext_libc=no)
++ ])
++ fi
++
++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++ AC_CHECK_FUNCS(bind_textdomain_codeset)
++ fi
+
++ #
++ # If we don't have everything we want, check in libintl
++ #
++ if test "$gt_cv_func_dgettext_libc" != "yes" \
++ || test "$gt_cv_func_ngettext_libc" != "yes" \
++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
++
++ AC_CHECK_LIB(intl, bindtextdomain,
++ [AC_CHECK_LIB(intl, ngettext,
++ [AC_CHECK_LIB(intl, dgettext,
++ gt_cv_func_dgettext_libintl=yes)])])
+
-# 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.
--
++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
++ AC_MSG_CHECKING([if -liconv is needed to use gettext])
++ AC_MSG_RESULT([])
++ AC_CHECK_LIB(intl, ngettext,
++ [AC_CHECK_LIB(intl, dcgettext,
++ [gt_cv_func_dgettext_libintl=yes
++ libintl_extra_libs=-liconv],
++ :,-liconv)],
++ :,-liconv)
++ fi
+
-# 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.
@@ -749,13 +730,34 @@
- esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
--
++ #
++ # If we found libintl, then check in it for bind_textdomain_codeset();
++ # we'll prefer libc if neither have bind_textdomain_codeset(),
++ # and both have dgettext and ngettext
++ #
++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
++ glib_save_LIBS="$LIBS"
++ LIBS="$LIBS -lintl $libintl_extra_libs"
++ unset ac_cv_func_bind_textdomain_codeset
++ AC_CHECK_FUNCS(bind_textdomain_codeset)
++ LIBS="$glib_save_LIBS"
+
-# Copyright (C) 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 test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
++ gt_cv_func_dgettext_libc=no
++ else
++ if test "$gt_cv_func_dgettext_libc" = "yes" \
++ && test "$gt_cv_func_ngettext_libc" = "yes"; then
++ gt_cv_func_dgettext_libintl=no
++ fi
++ fi
++ fi
++ fi
+
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
@@ -1244,11 +1246,14 @@
- [[\\/$]]* | ?:[[\\/]]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
++ DISABLE_DEPRECATED=""
+ if test $USE_MAINTAINER_MODE = yes; then
-+ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED"
-+ else
-+ DISABLE_DEPRECATED=""
++ DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
++ for DOMAIN in $DOMAINS; do
++ DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
++ done
+ fi
++
+ AC_SUBST(DISABLE_DEPRECATED)
])
@@ -1654,50 +1659,33 @@
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
-+
-+
+
+-# Check how to create a tarball. -*- Autoconf -*-
+
+-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
-+#
-+#
+ #
+-# 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 2
+-
+-# _AM_PROG_TAR(FORMAT)
+-# --------------------
+-# Check how to create a tarball in format FORMAT.
+-# FORMAT should be one of `v7', `ustar', or `pax'.
+ #
+-# Substitute a variable $(am__tar) that is a command
+-# writing to stdout a FORMAT-tarball containing the directory
+-# $tardir.
+-# tardir=directory && $(am__tar) > result.tar
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
-+#
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_MODULES],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
--# Check how to create a tarball. -*- Autoconf -*-
-+pkg_failed=no
-+AC_MSG_CHECKING([for $1])
-
--# Copyright (C) 2004, 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.
-+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
--# serial 2
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
-
--# _AM_PROG_TAR(FORMAT)
--# --------------------
--# Check how to create a tarball in format FORMAT.
--# FORMAT should be one of `v7', `ustar', or `pax'.
--#
--# Substitute a variable $(am__tar) that is a command
--# writing to stdout a FORMAT-tarball containing the directory
--# $tardir.
--# tardir=directory && $(am__tar) > result.tar
--#
+ #
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-# $(am__untar) < result.tar
@@ -1750,21 +1738,17 @@
- am__untar=false
- ;;
- esac
-+if test $pkg_failed = yes; then
-+ _PKG_SHORT_ERRORS_SUPPORTED
-+ if test $_pkg_short_errors_supported = yes; then
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-+ else
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_MODULES],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
-+ ifelse([$4], , [AC_MSG_ERROR(dnl
-+[Package requirements ($2) were not met:
++pkg_failed=no
++AC_MSG_CHECKING([for $1])
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
@@ -1778,15 +1762,17 @@
- fi
-done
-rm -rf conftest.dir
-+$$1_PKG_ERRORS
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
-dnl AM_GCONF_SOURCE_2
-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
@@ -1794,6 +1780,40 @@
-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-dnl you should install foo.schemas files
-dnl
++if test $pkg_failed = yes; then
++ _PKG_SHORT_ERRORS_SUPPORTED
++ if test $_pkg_short_errors_supported = yes; then
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++ else
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+-AC_DEFUN([AM_GCONF_SOURCE_2],
+-[
+- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
+- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+- else
+- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
+- fi
++ ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met:
+
+- AC_ARG_WITH([gconf-source],
+- AC_HELP_STRING([--with-gconf-source=sourceaddress],
+- [Config database for installing schema files.]),
+- [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
++$$1_PKG_ERRORS
+
+- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
+- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+- fi
+_PKG_TEXT
+])],
+ [AC_MSG_RESULT([no])
@@ -1804,19 +1824,14 @@
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
--AC_DEFUN([AM_GCONF_SOURCE_2],
--[
-- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-- else
-- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-- fi
+- 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"],)
+_PKG_TEXT
-- 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_FILE_DIR)
+- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+ [$4])
+else
@@ -1827,17 +1842,20 @@
+fi[]dnl
+])# PKG_CHECK_MODULES
-- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
+- 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])
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 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 "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-- fi
++
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -1849,41 +1867,7 @@
+dnl require some minimum version. Point them to the right macro.
+m4_if([$1], [1.11], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])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"],)
-+# _AM_AUTOCONF_VERSION(VERSION)
-+# -----------------------------
-+# aclocal traces this macro to find the Autoconf version.
-+# This is a private macro too. Using m4_define simplifies
-+# the logic in aclocal, which can simply ignore this definition.
-+m4_define([_AM_AUTOCONF_VERSION], [])
-
-- AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# 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
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-- 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])
--])
-+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+ ])
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
@@ -1897,13 +1881,29 @@
-# 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.
--#
++# _AM_AUTOCONF_VERSION(VERSION)
++# -----------------------------
++# aclocal traces this macro to find the Autoconf version.
++# This is a private macro too. Using m4_define simplifies
++# the logic in aclocal, which can simply ignore this definition.
++m4_define([_AM_AUTOCONF_VERSION], [])
++
++# AM_SET_CURRENT_AUTOMAKE_VERSION
++# -------------------------------
++# 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
++m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
++
++# AM_AUX_DIR_EXPAND -*- Autoconf -*-
++
++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+ #
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
- #
--# Modified to never use included libintl.
--# Owen Taylor <otaylor at redhat.com>, 12/15/1998
+# 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.
@@ -1912,8 +1912,8 @@
+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
#
--# Major rework to remove unused code
--# Owen Taylor <otaylor at redhat.com>, 12/11/2002
+-# Modified to never use included libintl.
+-# Owen Taylor <otaylor at redhat.com>, 12/15/1998
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory. The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
@@ -1922,8 +1922,8 @@
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
#
--# Added better handling of ALL_LINGUAS from GNU gettext version
--# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
+-# Major rework to remove unused code
+-# Owen Taylor <otaylor at redhat.com>, 12/11/2002
+# $ac_aux_dir/missing
+# fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
@@ -1931,17 +1931,15 @@
+# fails when called from a subdirectory in a VPATH build with
+# a relative $ac_aux_dir
#
--# Modified to require ngettext
--# Matthias Clasen <mclasen at redhat.com> 08/06/2004
+-# Added better handling of ALL_LINGUAS from GNU gettext version
+-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir. In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
#
--# 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)
+-# Modified to require ngettext
+-# Matthias Clasen <mclasen at redhat.com> 08/06/2004
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
@@ -1951,10 +1949,21 @@
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
-+#
+ #
+-# 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)
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
++
++AC_DEFUN([AM_AUX_DIR_EXPAND],
++[dnl Rely on autoconf to set up CDPATH properly.
++AC_PREREQ([2.50])dnl
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
++])
-dnl
-dnl We go to great lengths to make sure that aclocal won't
@@ -1967,12 +1976,7 @@
-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_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+])
++# AM_CONDITIONAL -*- Autoconf -*-
-# GLIB_LC_MESSAGES
-#--------------------
@@ -1987,7 +1991,12 @@
- [Define if your <locale.h> file defines LC_MESSAGES.])
- fi
- fi])
-+# AM_CONDITIONAL -*- Autoconf -*-
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 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.
-# GLIB_PATH_PROG_WITH_TEST
-#----------------------------
@@ -2023,13 +2032,6 @@
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
- AC_MSG_RESULT([$]$1)
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 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 9
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
@@ -2252,6 +2254,17 @@
- [AC_CHECK_LIB(intl, ngettext,
- [AC_CHECK_LIB(intl, dgettext,
- gt_cv_func_dgettext_libintl=yes)])])
+-
+- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+- AC_MSG_CHECKING([if -liconv is needed to use gettext])
+- AC_MSG_RESULT([])
+- AC_CHECK_LIB(intl, ngettext,
+- [AC_CHECK_LIB(intl, dcgettext,
+- [gt_cv_func_dgettext_libintl=yes
+- libintl_extra_libs=-liconv],
+- :,-liconv)],
+- :,-liconv)
+- fi
+ cd ..
+ rm -rf conftest.dir
+else
@@ -2264,17 +2277,6 @@
+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
-- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-- AC_MSG_CHECKING([if -liconv is needed to use gettext])
-- AC_MSG_RESULT([])
-- AC_CHECK_LIB(intl, ngettext,
-- [AC_CHECK_LIB(intl, dcgettext,
-- [gt_cv_func_dgettext_libintl=yes
-- libintl_extra_libs=-liconv],
-- :,-liconv)],
-- :,-liconv)
-- fi
-
- #
- # If we found libintl, then check in it for bind_textdomain_codeset();
- # we'll prefer libc if neither have bind_textdomain_codeset(),
@@ -2286,14 +2288,6 @@
- unset ac_cv_func_bind_textdomain_codeset
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- LIBS="$glib_save_LIBS"
-+# AM_SET_DEPDIR
-+# -------------
-+# Choose a directory name for dependency files.
-+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-+AC_DEFUN([AM_SET_DEPDIR],
-+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-+])
- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
- gt_cv_func_dgettext_libc=no
@@ -2305,6 +2299,14 @@
- fi
- fi
- fi
++# AM_SET_DEPDIR
++# -------------
++# Choose a directory name for dependency files.
++# This macro is AC_REQUIREd in _AM_DEPENDENCIES
++AC_DEFUN([AM_SET_DEPDIR],
++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
++])
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
@@ -2370,6 +2372,11 @@
- fi
- fi
- ])
+
+- if test "$gt_cv_have_gettext" = "yes" ; then
+- AC_DEFINE(ENABLE_NLS, 1,
+- [always defined to indicate that i18n is enabled])
+- fi
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
@@ -2385,12 +2392,6 @@
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+])
-- if test "$gt_cv_have_gettext" = "yes" ; then
-- AC_DEFINE(ENABLE_NLS, 1,
-- [always defined to indicate that i18n is enabled])
-- fi
-+# Generate code to set up dependency tracking. -*- Autoconf -*-
-
- dnl Test whether we really found GNU xgettext.
- if test "$XGETTEXT" != ":"; then
- dnl If it is not GNU xgettext we define it as : so that the
@@ -2402,15 +2403,30 @@
- [found xgettext program is not GNU xgettext; ignore it])
- XGETTEXT=":"
- fi
+- fi
++# Generate code to set up dependency tracking. -*- Autoconf -*-
+
+- # We need to process the po/ directory.
+- POSUB=po
+# 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.
-+
+
+- AC_OUTPUT_COMMANDS(
+- [case "$CONFIG_FILES" in *po/Makefile.in*)
+- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+- esac])
+#serial 5
-+
+
+- 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"
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -2438,7 +2454,7 @@
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
- fi
++ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
@@ -2461,39 +2477,10 @@
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
-+ done
+ done
+ done
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-- # We need to process the po/ directory.
-- POSUB=po
-
-- AC_OUTPUT_COMMANDS(
-- [case "$CONFIG_FILES" in *po/Makefile.in*)
-- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-- esac])
-+# AM_OUTPUT_DEPENDENCY_COMMANDS
-+# -----------------------------
-+# This macro should only be invoked once -- use via AC_REQUIRE.
-+#
-+# This code is only required when automatic dependency tracking
-+# is enabled. FIXME. This creates each `.P' file that we will
-+# need in order to bootstrap the dependency handling code.
-+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[AC_CONFIG_COMMANDS([depfiles],
-+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-+])
-
-- 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
-+# Do all the work for Automake. -*- Autoconf -*-
- dnl Make all variables we use known to autoconf.
- AC_SUBST(CATALOGS)
@@ -2507,13 +2494,7 @@
- AC_SUBST(POFILES)
- AC_SUBST(POSUB)
- ])
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006, 2008, 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.
-
+-
-# AM_GLIB_GNU_GETTEXT
-# -------------------
-# Do checks necessary for use of gettext. If a suitable implementation
@@ -2530,7 +2511,6 @@
-
- GLIB_LC_MESSAGES
- GLIB_WITH_NLS
-+# serial 16
- if test "$gt_cv_have_gettext" = "yes"; then
- if test "x$ALL_LINGUAS" = "x"; then
@@ -2562,14 +2542,81 @@
- LINGUAS=$NEW_LINGUAS
- AC_MSG_RESULT($LINGUAS)
- fi
-+# This macro actually does too much. Some checks are only needed if
-+# your package does certain things. But this isn't really a big deal.
++# AM_OUTPUT_DEPENDENCY_COMMANDS
++# -----------------------------
++# This macro should only be invoked once -- use via AC_REQUIRE.
++#
++# This code is only required when automatic dependency tracking
++# is enabled. FIXME. This creates each `.P' file that we will
++# need in order to bootstrap the dependency handling code.
++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
++[AC_CONFIG_COMMANDS([depfiles],
++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
++])
- dnl Construct list of names of catalog files to be constructed.
- if test -n "$LINGUAS"; then
- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
- fi
- fi
++# Do all the work for Automake. -*- Autoconf -*-
+
+- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+- dnl Try to locate is.
+- MKINSTALLDIRS=
+- if test -n "$ac_aux_dir"; then
+- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+- fi
+- if test -z "$MKINSTALLDIRS"; then
+- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+- fi
+- AC_SUBST(MKINSTALLDIRS)
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005, 2006, 2008, 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.
+
+- dnl Generate list of files to be processed by xgettext which will
+- dnl be included in po/Makefile.
+- test -d po || mkdir po
+- if test "x$srcdir" != "x."; then
+- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+- posrcprefix="$srcdir/"
+- else
+- posrcprefix="../$srcdir/"
+- fi
+- else
+- posrcprefix="../"
+- fi
+- rm -f po/POTFILES
+- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+- < $srcdir/po/POTFILES.in > po/POTFILES
+- ])
++# serial 16
+
+-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+-# -------------------------------
+-# Define VARIABLE to the location where catalog files will
+-# be installed by po/Makefile.
+-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
+-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
+-glib_save_prefix="$prefix"
+-glib_save_exec_prefix="$exec_prefix"
+-glib_save_datarootdir="$datarootdir"
+-test "x$prefix" = xNONE && prefix=$ac_default_prefix
+-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+-datarootdir=`eval echo "${datarootdir}"`
+-if test "x$CATOBJEXT" = "x.mo" ; then
+- localedir=`eval echo "${libdir}/locale"`
+-else
+- localedir=`eval echo "${datadir}/locale"`
++# This macro actually does too much. Some checks are only needed if
++# your package does certain things. But this isn't really a big deal.
++
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
@@ -2596,19 +2643,13 @@
+ if test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
-+fi
-
-- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-- dnl Try to locate is.
-- MKINSTALLDIRS=
-- if test -n "$ac_aux_dir"; then
-- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-- fi
-- if test -z "$MKINSTALLDIRS"; then
-- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-- fi
-- AC_SUBST(MKINSTALLDIRS)
+ fi
+-prefix="$glib_save_prefix"
+-exec_prefix="$glib_save_exec_prefix"
+-datarootdir="$glib_save_datarootdir"
+-AC_DEFINE_UNQUOTED($1, "$localedir",
+- [Define the location where the catalogs will be installed])
++
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
@@ -2618,23 +2659,7 @@
+ fi
+fi
+AC_SUBST([CYGPATH_W])
-
-- dnl Generate list of files to be processed by xgettext which will
-- dnl be included in po/Makefile.
-- test -d po || mkdir po
-- if test "x$srcdir" != "x."; then
-- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-- posrcprefix="$srcdir/"
-- else
-- posrcprefix="../$srcdir/"
-- fi
-- else
-- posrcprefix="../"
-- fi
-- rm -f po/POTFILES
-- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-- < $srcdir/po/POTFILES.in > po/POTFILES
-- ])
++
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
@@ -2647,29 +2672,7 @@
+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
--# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
--# -------------------------------
--# Define VARIABLE to the location where catalog files will
--# be installed by po/Makefile.
--glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
--[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
--glib_save_prefix="$prefix"
--glib_save_exec_prefix="$exec_prefix"
--glib_save_datarootdir="$datarootdir"
--test "x$prefix" = xNONE && prefix=$ac_default_prefix
--test "x$exec_prefix" = xNONE && exec_prefix=$prefix
--datarootdir=`eval echo "${datarootdir}"`
--if test "x$CATOBJEXT" = "x.mo" ; then
-- localedir=`eval echo "${libdir}/locale"`
--else
-- localedir=`eval echo "${datadir}/locale"`
--fi
--prefix="$glib_save_prefix"
--exec_prefix="$glib_save_exec_prefix"
--datarootdir="$glib_save_datarootdir"
--AC_DEFINE_UNQUOTED($1, "$localedir",
-- [Define the location where the catalogs will be installed])
++
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
@@ -3602,7 +3605,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -266,6 +268,7 @@
+@@ -264,6 +266,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3621,7 +3624,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -224,6 +226,7 @@
+@@ -222,6 +224,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3640,7 +3643,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -211,6 +213,7 @@
+@@ -209,6 +211,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3659,7 +3662,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -203,6 +205,7 @@
+@@ -201,6 +203,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3678,7 +3681,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -246,6 +248,7 @@
+@@ -244,6 +246,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3697,7 +3700,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -204,6 +206,7 @@
+@@ -202,6 +204,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3716,7 +3719,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -239,6 +241,7 @@
+@@ -237,6 +239,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3735,7 +3738,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -233,6 +235,7 @@
+@@ -231,6 +233,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3754,7 +3757,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -224,6 +226,7 @@
+@@ -222,6 +224,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3773,7 +3776,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -230,6 +232,7 @@
+@@ -228,6 +230,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3792,7 +3795,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -212,6 +214,7 @@
+@@ -210,6 +212,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3811,7 +3814,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -220,6 +222,7 @@
+@@ -218,6 +220,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3830,7 +3833,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -229,6 +231,7 @@
+@@ -227,6 +229,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3849,7 +3852,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -222,6 +224,7 @@
+@@ -220,6 +222,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3857,7 +3860,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -321,7 +324,7 @@
+@@ -319,7 +322,7 @@
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) \
-I$(top_srcdir)/libwindow-settings \
@@ -3871,8 +3874,8 @@
@@ -1,20 +1,22 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for gnome-control-center 2.28.0.
-+# Generated by GNU Autoconf 2.64 for gnome-control-center 2.28.0.
+-# Generated by GNU Autoconf 2.63 for gnome-control-center 2.28.1.
++# Generated by GNU Autoconf 2.64 for gnome-control-center 2.28.1.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center>.
#
@@ -4666,14 +4669,14 @@
# Identity of this package.
PACKAGE_NAME='gnome-control-center'
@@ -748,6 +702,7 @@
- PACKAGE_VERSION='2.28.0'
- PACKAGE_STRING='gnome-control-center 2.28.0'
+ PACKAGE_VERSION='2.28.1'
+ PACKAGE_STRING='gnome-control-center 2.28.1'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center'
+PACKAGE_URL=''
ac_unique_file="shell"
# Factoring default headers for most tests.
-@@ -831,12 +786,16 @@
+@@ -829,12 +784,16 @@
FONT_VIEWER_CFLAGS
FONT_CAPPLET_LIBS
FONT_CAPPLET_CFLAGS
@@ -4692,7 +4695,7 @@
GTK_ENGINE_DIR
GIO_LIBS
GIO_CFLAGS
-@@ -1026,6 +985,7 @@
+@@ -1024,6 +983,7 @@
program_transform_name
prefix
exec_prefix
@@ -4700,7 +4703,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1093,6 +1053,8 @@
+@@ -1090,6 +1050,8 @@
GSD_DBUS_LIBS
GIO_CFLAGS
GIO_LIBS
@@ -4709,7 +4712,7 @@
LIBSLAB_CFLAGS
LIBSLAB_LIBS
FONT_CAPPLET_CFLAGS
-@@ -1223,8 +1185,7 @@
+@@ -1218,8 +1180,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 &&
@@ -4719,7 +4722,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1250,8 +1211,7 @@
+@@ -1245,8 +1206,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 &&
@@ -4729,7 +4732,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1455,8 +1415,7 @@
+@@ -1450,8 +1410,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 &&
@@ -4739,7 +4742,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1472,8 +1431,7 @@
+@@ -1467,8 +1426,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 &&
@@ -4749,7 +4752,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1503,17 +1461,17 @@
+@@ -1498,17 +1456,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -4773,7 +4776,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1530,15 +1488,13 @@
+@@ -1525,15 +1483,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -4791,7 +4794,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1561,8 +1517,7 @@
+@@ -1556,8 +1512,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -4801,7 +4804,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1592,11 +1547,9 @@
+@@ -1587,11 +1542,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -4815,7 +4818,7 @@
# Find the source files, if location was not specified.
-@@ -1635,13 +1588,11 @@
+@@ -1630,13 +1583,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -4831,7 +4834,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1839,6 +1790,10 @@
+@@ -1833,6 +1784,10 @@
linker flags for GSD_DBUS, overriding pkg-config
GIO_CFLAGS C compiler flags for GIO, overriding pkg-config
GIO_LIBS linker flags for GIO, overriding pkg-config
@@ -4842,10 +4845,10 @@
LIBSLAB_CFLAGS
C compiler flags for LIBSLAB, overriding pkg-config
LIBSLAB_LIBS
-@@ -1948,21 +1903,378 @@
+@@ -1940,21 +1895,378 @@
if $ac_init_version; then
cat <<\_ACEOF
- gnome-control-center configure 2.28.0
+ gnome-control-center configure 2.28.1
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.64
@@ -5219,13 +5222,13 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by gnome-control-center $as_me 2.28.0, which was
+ It was created by gnome-control-center $as_me 2.28.1, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
-@@ -1998,8 +2310,8 @@
+@@ -1990,8 +2302,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5236,7 +5239,7 @@
IFS=$as_save_IFS
} >&5
-@@ -2036,9 +2348,9 @@
+@@ -2028,9 +2340,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -5248,7 +5251,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -2054,13 +2366,13 @@
+@@ -2046,13 +2358,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -5265,7 +5268,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -2085,13 +2397,13 @@
+@@ -2077,13 +2389,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -5281,7 +5284,7 @@
esac ;;
esac
done
-@@ -2163,39 +2475,41 @@
+@@ -2155,39 +2467,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -5328,7 +5331,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2214,7 +2528,7 @@
+@@ -2206,7 +2520,7 @@
do
test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
@@ -5337,7 +5340,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2225,7 +2539,7 @@
+@@ -2217,7 +2531,7 @@
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
@@ -5346,7 +5349,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2233,7 +2547,7 @@
+@@ -2225,7 +2539,7 @@
esac
fi
else
@@ -5355,7 +5358,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2248,11 +2562,11 @@
+@@ -2240,11 +2554,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -5369,7 +5372,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2262,17 +2576,17 @@
+@@ -2254,17 +2568,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
@@ -5391,7 +5394,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2284,43 +2598,20 @@
+@@ -2276,43 +2590,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -5442,7 +5445,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2339,24 +2630,16 @@
+@@ -2331,24 +2622,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -5475,7 +5478,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2382,10 +2665,10 @@
+@@ -2374,10 +2657,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.
@@ -5488,7 +5491,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2393,11 +2676,11 @@
+@@ -2385,11 +2668,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5504,7 +5507,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2434,7 +2717,7 @@
+@@ -2426,7 +2709,7 @@
;;
esac
@@ -5513,7 +5516,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2450,7 +2733,7 @@
+@@ -2442,7 +2725,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -5522,7 +5525,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2461,7 +2744,7 @@
+@@ -2453,7 +2736,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -5531,7 +5534,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2472,15 +2755,11 @@
+@@ -2464,15 +2747,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -5549,7 +5552,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2502,11 +2781,8 @@
+@@ -2494,11 +2773,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".
@@ -5563,7 +5566,7 @@
fi
test "$2" = conftest.file
-@@ -2515,13 +2791,10 @@
+@@ -2507,13 +2783,10 @@
# Ok.
:
else
@@ -5580,7 +5583,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2549,7 +2822,7 @@
+@@ -2541,7 +2814,7 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -5589,7 +5592,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2570,9 +2843,9 @@
+@@ -2562,9 +2835,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
@@ -5601,7 +5604,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2583,24 +2856,24 @@
+@@ -2575,24 +2848,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5631,7 +5634,7 @@
$as_echo "no" >&6; }
fi
-@@ -2610,9 +2883,9 @@
+@@ -2602,9 +2875,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
@@ -5643,7 +5646,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2623,24 +2896,24 @@
+@@ -2615,24 +2888,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5673,7 +5676,7 @@
$as_echo "no" >&6; }
fi
-@@ -2649,7 +2922,7 @@
+@@ -2641,7 +2914,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5682,7 +5685,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2662,10 +2935,10 @@
+@@ -2654,10 +2927,10 @@
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -5695,7 +5698,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2673,7 +2946,7 @@
+@@ -2665,7 +2938,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5704,7 +5707,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 #(
-@@ -2685,7 +2958,7 @@
+@@ -2677,7 +2950,7 @@
esac
done
done
@@ -5713,7 +5716,7 @@
IFS=$as_save_IFS
fi
-@@ -2701,7 +2974,7 @@
+@@ -2693,7 +2966,7 @@
MKDIR_P="$ac_install_sh -d"
fi
fi
@@ -5722,7 +5725,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2714,9 +2987,9 @@
+@@ -2706,9 +2979,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
@@ -5734,7 +5737,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2727,24 +3000,24 @@
+@@ -2719,24 +2992,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5764,7 +5767,7 @@
$as_echo "no" >&6; }
fi
-@@ -2752,11 +3025,11 @@
+@@ -2744,11 +3017,11 @@
test -n "$AWK" && break
done
@@ -5778,7 +5781,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2774,11 +3047,11 @@
+@@ -2766,11 +3039,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -5792,7 +5795,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2798,9 +3071,7 @@
+@@ -2790,9 +3063,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -5803,7 +5806,7 @@
fi
fi
-@@ -2851,7 +3122,7 @@
+@@ -2843,7 +3114,7 @@
AMTAR=${AMTAR-"${am_missing_run}tar"}
@@ -5812,7 +5815,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'
-@@ -2924,13 +3195,13 @@
+@@ -2916,13 +3187,13 @@
done
rm -rf conftest.dir
@@ -5828,7 +5831,7 @@
$as_echo "$am_cv_prog_tar_ustar" >&6; }
-@@ -2938,16 +3209,16 @@
+@@ -2930,16 +3201,16 @@
@@ -5848,7 +5851,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2973,7 +3244,7 @@
+@@ -2965,7 +3236,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -5857,7 +5860,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -3001,12 +3272,12 @@
+@@ -2993,12 +3264,12 @@
fi
@@ -5872,7 +5875,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -3031,9 +3302,9 @@
+@@ -3023,9 +3294,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
@@ -5884,7 +5887,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3044,24 +3315,24 @@
+@@ -3036,24 +3307,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5914,7 +5917,7 @@
$as_echo "no" >&6; }
fi
-@@ -3071,9 +3342,9 @@
+@@ -3063,9 +3334,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
@@ -5926,7 +5929,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3084,24 +3355,24 @@
+@@ -3076,24 +3347,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5956,7 +5959,7 @@
$as_echo "no" >&6; }
fi
-@@ -3110,7 +3381,7 @@
+@@ -3102,7 +3373,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5965,7 +5968,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3124,9 +3395,9 @@
+@@ -3116,9 +3387,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
@@ -5977,7 +5980,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3137,24 +3408,24 @@
+@@ -3129,24 +3400,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6007,7 +6010,7 @@
$as_echo "no" >&6; }
fi
-@@ -3164,9 +3435,9 @@
+@@ -3156,9 +3427,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
@@ -6019,7 +6022,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3178,18 +3449,18 @@
+@@ -3170,18 +3441,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6041,7 +6044,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3208,10 +3479,10 @@
+@@ -3200,10 +3471,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -6054,7 +6057,7 @@
$as_echo "no" >&6; }
fi
-@@ -3223,9 +3494,9 @@
+@@ -3215,9 +3486,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
@@ -6066,7 +6069,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3236,24 +3507,24 @@
+@@ -3228,24 +3499,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6096,7 +6099,7 @@
$as_echo "no" >&6; }
fi
-@@ -3267,9 +3538,9 @@
+@@ -3259,9 +3530,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
@@ -6108,7 +6111,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3280,24 +3551,24 @@
+@@ -3272,24 +3543,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6138,7 +6141,7 @@
$as_echo "no" >&6; }
fi
-@@ -3310,7 +3581,7 @@
+@@ -3302,7 +3573,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6147,7 +6150,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3321,73 +3592,55 @@
+@@ -3313,73 +3584,55 @@
fi
@@ -6246,7 +6249,7 @@
$as_echo_n "checking for C compiler default output file name... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-@@ -3404,17 +3657,17 @@
+@@ -3396,17 +3649,17 @@
done
rm -f $ac_rmfiles
@@ -6269,7 +6272,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,
-@@ -3431,7 +3684,7 @@
+@@ -3423,7 +3676,7 @@
# certainly right.
break;;
*.* )
@@ -6278,7 +6281,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3450,84 +3703,75 @@
+@@ -3442,84 +3695,75 @@
else
ac_file=''
fi
@@ -6388,7 +6391,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
-@@ -3542,32 +3786,24 @@
+@@ -3534,32 +3778,24 @@
esac
done
else
@@ -6428,7 +6431,7 @@
/* end confdefs.h. */
int
-@@ -3579,17 +3815,17 @@
+@@ -3571,17 +3807,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -6451,7 +6454,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3602,31 +3838,23 @@
+@@ -3594,31 +3830,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -6490,7 +6493,7 @@
/* end confdefs.h. */
int
-@@ -3640,37 +3868,16 @@
+@@ -3632,37 +3860,16 @@
return 0;
}
_ACEOF
@@ -6531,7 +6534,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3679,20 +3886,16 @@
+@@ -3671,20 +3878,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -6555,7 +6558,7 @@
/* end confdefs.h. */
int
-@@ -3703,35 +3906,11 @@
+@@ -3695,35 +3898,11 @@
return 0;
}
_ACEOF
@@ -6594,7 +6597,7 @@
/* end confdefs.h. */
int
-@@ -3742,36 +3921,12 @@
+@@ -3734,36 +3913,12 @@
return 0;
}
_ACEOF
@@ -6635,7 +6638,7 @@
/* end confdefs.h. */
int
-@@ -3782,42 +3937,17 @@
+@@ -3774,42 +3929,17 @@
return 0;
}
_ACEOF
@@ -6680,7 +6683,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3834,18 +3964,14 @@
+@@ -3826,18 +3956,14 @@
CFLAGS=
fi
fi
@@ -6702,7 +6705,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3902,32 +4028,9 @@
+@@ -3894,32 +4020,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -6736,7 +6739,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3938,17 +4041,19 @@
+@@ -3930,17 +4033,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -6759,7 +6762,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3958,9 +4063,9 @@
+@@ -3950,9 +4055,9 @@
depcc="$CC" am_compiler_list=
@@ -6771,7 +6774,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4068,7 +4173,7 @@
+@@ -4060,7 +4165,7 @@
fi
fi
@@ -6780,7 +6783,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4084,17 +4189,13 @@
+@@ -4076,17 +4181,13 @@
@@ -6801,7 +6804,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -4119,54 +4220,27 @@
+@@ -4111,54 +4212,27 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -6864,7 +6867,7 @@
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-@@ -4179,9 +4253,9 @@
+@@ -4171,9 +4245,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
@@ -6876,7 +6879,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4192,24 +4266,24 @@
+@@ -4184,24 +4258,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6906,7 +6909,7 @@
$as_echo "no" >&6; }
fi
-@@ -4219,9 +4293,9 @@
+@@ -4211,9 +4285,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
@@ -6918,7 +6921,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -4232,24 +4306,24 @@
+@@ -4224,24 +4298,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6948,7 +6951,7 @@
$as_echo "no" >&6; }
fi
-@@ -4258,7 +4332,7 @@
+@@ -4250,7 +4324,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6957,7 +6960,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4272,9 +4346,9 @@
+@@ -4264,9 +4338,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
@@ -6969,7 +6972,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4285,24 +4359,24 @@
+@@ -4277,24 +4351,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6999,7 +7002,7 @@
$as_echo "no" >&6; }
fi
-@@ -4312,9 +4386,9 @@
+@@ -4304,9 +4378,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
@@ -7011,7 +7014,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4326,18 +4400,18 @@
+@@ -4318,18 +4392,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7033,7 +7036,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -4356,10 +4430,10 @@
+@@ -4348,10 +4422,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7046,7 +7049,7 @@
$as_echo "no" >&6; }
fi
-@@ -4371,9 +4445,9 @@
+@@ -4363,9 +4437,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
@@ -7058,7 +7061,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4384,24 +4458,24 @@
+@@ -4376,24 +4450,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7088,7 +7091,7 @@
$as_echo "no" >&6; }
fi
-@@ -4415,9 +4489,9 @@
+@@ -4407,9 +4481,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
@@ -7100,7 +7103,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -4428,24 +4502,24 @@
+@@ -4420,24 +4494,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7130,7 +7133,7 @@
$as_echo "no" >&6; }
fi
-@@ -4458,7 +4532,7 @@
+@@ -4450,7 +4524,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7139,7 +7142,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4469,62 +4543,42 @@
+@@ -4461,62 +4535,42 @@
fi
@@ -7224,7 +7227,7 @@
/* end confdefs.h. */
int
-@@ -4538,37 +4592,16 @@
+@@ -4530,37 +4584,16 @@
return 0;
}
_ACEOF
@@ -7265,7 +7268,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -4577,20 +4610,16 @@
+@@ -4569,20 +4602,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -7289,7 +7292,7 @@
/* end confdefs.h. */
int
-@@ -4601,35 +4630,11 @@
+@@ -4593,35 +4622,11 @@
return 0;
}
_ACEOF
@@ -7328,7 +7331,7 @@
/* end confdefs.h. */
int
-@@ -4640,36 +4645,12 @@
+@@ -4632,36 +4637,12 @@
return 0;
}
_ACEOF
@@ -7369,7 +7372,7 @@
/* end confdefs.h. */
int
-@@ -4680,42 +4661,17 @@
+@@ -4672,42 +4653,17 @@
return 0;
}
_ACEOF
@@ -7414,7 +7417,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -4732,18 +4688,14 @@
+@@ -4724,18 +4680,14 @@
CFLAGS=
fi
fi
@@ -7436,7 +7439,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -4800,32 +4752,9 @@
+@@ -4792,32 +4744,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -7470,7 +7473,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -4836,17 +4765,19 @@
+@@ -4828,17 +4757,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -7493,7 +7496,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -4856,9 +4787,9 @@
+@@ -4848,9 +4779,9 @@
depcc="$CC" am_compiler_list=
@@ -7505,7 +7508,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4966,7 +4897,7 @@
+@@ -4958,7 +4889,7 @@
fi
fi
@@ -7514,7 +7517,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4982,22 +4913,18 @@
+@@ -4974,22 +4905,18 @@
if test "x$CC" != xcc; then
@@ -7541,7 +7544,7 @@
/* end confdefs.h. */
int
-@@ -5013,63 +4940,63 @@
+@@ -5005,63 +4932,63 @@
# existing .o file with -o, though they will create one.
ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
rm -f conftest2.*
@@ -7630,7 +7633,7 @@
then
# cc works too.
:
-@@ -5086,15 +5013,13 @@
+@@ -5078,15 +5005,13 @@
fi
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -7649,7 +7652,7 @@
fi
-@@ -5118,14 +5043,14 @@
+@@ -5110,14 +5035,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
@@ -7666,7 +7669,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -5140,11 +5065,7 @@
+@@ -5132,11 +5057,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.
@@ -7679,7 +7682,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5153,78 +5074,34 @@
+@@ -5145,78 +5066,34 @@
#endif
Syntax error
_ACEOF
@@ -7763,7 +7766,7 @@
break
fi
-@@ -5236,7 +5113,7 @@
+@@ -5228,7 +5105,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -7772,7 +7775,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -5247,11 +5124,7 @@
+@@ -5239,11 +5116,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.
@@ -7785,7 +7788,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5260,87 +5133,40 @@
+@@ -5252,87 +5125,40 @@
#endif
Syntax error
_ACEOF
@@ -7882,7 +7885,7 @@
fi
ac_ext=c
-@@ -5350,9 +5176,9 @@
+@@ -5342,9 +5168,9 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -7894,7 +7897,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -5363,7 +5189,7 @@
+@@ -5355,7 +5181,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7903,7 +7906,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
-@@ -5383,7 +5209,7 @@
+@@ -5375,7 +5201,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
@@ -7912,7 +7915,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"
-@@ -5398,26 +5224,24 @@
+@@ -5390,26 +5216,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -7944,7 +7947,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -5431,7 +5255,7 @@
+@@ -5423,7 +5247,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7953,7 +7956,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
-@@ -5451,7 +5275,7 @@
+@@ -5443,7 +5267,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
@@ -7962,7 +7965,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"
-@@ -5466,12 +5290,10 @@
+@@ -5458,12 +5282,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -7977,7 +7980,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -5479,21 +5301,17 @@
+@@ -5471,21 +5293,17 @@
fi
fi
@@ -8003,7 +8006,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -5508,48 +5326,23 @@
+@@ -5500,48 +5318,23 @@
return 0;
}
_ACEOF
@@ -8057,7 +8060,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -5559,18 +5352,14 @@
+@@ -5551,18 +5344,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -8079,7 +8082,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -5580,14 +5369,10 @@
+@@ -5572,14 +5361,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -8096,7 +8099,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -5614,57 +5399,28 @@
+@@ -5606,57 +5391,28 @@
return 0;
}
_ACEOF
@@ -8162,7 +8165,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -5689,35 +5445,27 @@
+@@ -5681,35 +5437,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -8205,7 +8208,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -5733,28 +5481,24 @@
+@@ -5725,28 +5473,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -8239,7 +8242,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -5770,9 +5514,9 @@
+@@ -5762,9 +5506,9 @@
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -8251,7 +8254,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -5780,7 +5524,7 @@
+@@ -5772,7 +5516,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -8260,7 +8263,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -5789,7 +5533,7 @@
+@@ -5781,7 +5525,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8269,7 +8272,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
-@@ -5809,7 +5553,7 @@
+@@ -5801,7 +5545,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
@@ -8278,7 +8281,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"
-@@ -5824,19 +5568,17 @@
+@@ -5816,19 +5560,17 @@
$ac_path_SED_found && break 3
done
done
@@ -8301,7 +8304,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -5854,9 +5596,9 @@
+@@ -5846,9 +5588,9 @@
@@ -8313,7 +8316,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -5870,7 +5612,7 @@
+@@ -5862,7 +5604,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8322,7 +8325,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
-@@ -5890,7 +5632,7 @@
+@@ -5882,7 +5624,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
@@ -8331,7 +8334,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"
-@@ -5905,12 +5647,10 @@
+@@ -5897,12 +5639,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -8346,7 +8349,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -5918,7 +5658,7 @@
+@@ -5910,7 +5650,7 @@
fi
fi
@@ -8355,7 +8358,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -5944,7 +5684,7 @@
+@@ -5936,7 +5676,7 @@
# Check whether --with-gnu-ld was given.
@@ -8364,7 +8367,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -5953,7 +5693,7 @@
+@@ -5945,7 +5685,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -8373,7 +8376,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -5983,13 +5723,13 @@
+@@ -5975,13 +5715,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -8390,7 +8393,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -6020,18 +5760,16 @@
+@@ -6012,18 +5752,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -8414,7 +8417,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -6044,7 +5782,7 @@
+@@ -6036,7 +5774,7 @@
;;
esac
fi
@@ -8423,7 +8426,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -6056,9 +5794,9 @@
+@@ -6048,9 +5786,9 @@
@@ -8435,7 +8438,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -6105,7 +5843,7 @@
+@@ -6097,7 +5835,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -8444,7 +8447,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -6116,9 +5854,9 @@
+@@ -6108,9 +5846,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
@@ -8456,7 +8459,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -6129,24 +5867,24 @@
+@@ -6121,24 +5859,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8486,7 +8489,7 @@
$as_echo "no" >&6; }
fi
-@@ -6160,9 +5898,9 @@
+@@ -6152,9 +5890,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
@@ -8498,7 +8501,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -6173,24 +5911,24 @@
+@@ -6165,24 +5903,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8528,7 +8531,7 @@
$as_echo "no" >&6; }
fi
-@@ -6203,7 +5941,7 @@
+@@ -6195,7 +5933,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8537,7 +8540,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6223,44 +5961,44 @@
+@@ -6215,44 +5953,44 @@
@@ -8550,16 +8553,16 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:6233: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:5971: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:6225: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:5963: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:6236: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:5974: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:6228: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:5966: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:6239: output\"" >&5)
-+ (eval echo "\"\$as_me:5977: output\"" >&5)
+- (eval echo "\"\$as_me:6231: output\"" >&5)
++ (eval echo "\"\$as_me:5969: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -8593,7 +8596,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -6378,10 +6116,10 @@
+@@ -6370,10 +6108,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -8606,7 +8609,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -6395,7 +6133,7 @@
+@@ -6387,7 +6125,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -8615,7 +8618,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -6405,17 +6143,17 @@
+@@ -6397,17 +6135,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -8636,7 +8639,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -6450,14 +6188,14 @@
+@@ -6442,14 +6180,14 @@
@@ -8654,7 +8657,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -6486,9 +6224,9 @@
+@@ -6478,9 +6216,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
@@ -8666,7 +8669,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -6499,24 +6237,24 @@
+@@ -6491,24 +6229,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8696,7 +8699,7 @@
$as_echo "no" >&6; }
fi
-@@ -6526,9 +6264,9 @@
+@@ -6518,9 +6256,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
@@ -8708,7 +8711,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -6539,24 +6277,24 @@
+@@ -6531,24 +6269,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8738,7 +8741,7 @@
$as_echo "no" >&6; }
fi
-@@ -6565,7 +6303,7 @@
+@@ -6557,7 +6295,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8747,7 +8750,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6585,9 +6323,9 @@
+@@ -6577,9 +6315,9 @@
@@ -8759,7 +8762,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -6706,7 +6444,7 @@
+@@ -6698,7 +6436,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -8768,7 +8771,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
-@@ -6781,7 +6519,7 @@
+@@ -6773,7 +6511,7 @@
esac
fi
@@ -8777,7 +8780,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
-@@ -6801,9 +6539,9 @@
+@@ -6793,9 +6531,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
@@ -8789,7 +8792,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -6814,24 +6552,24 @@
+@@ -6806,24 +6544,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8819,7 +8822,7 @@
$as_echo "no" >&6; }
fi
-@@ -6841,9 +6579,9 @@
+@@ -6833,9 +6571,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
@@ -8831,7 +8834,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -6854,24 +6592,24 @@
+@@ -6846,24 +6584,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8861,7 +8864,7 @@
$as_echo "no" >&6; }
fi
-@@ -6880,7 +6618,7 @@
+@@ -6872,7 +6610,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8870,7 +8873,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6906,9 +6644,9 @@
+@@ -6898,9 +6636,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
@@ -8882,7 +8885,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -6919,24 +6657,24 @@
+@@ -6911,24 +6649,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8912,7 +8915,7 @@
$as_echo "no" >&6; }
fi
-@@ -6946,9 +6684,9 @@
+@@ -6938,9 +6676,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
@@ -8924,7 +8927,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -6959,24 +6697,24 @@
+@@ -6951,24 +6689,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8954,7 +8957,7 @@
$as_echo "no" >&6; }
fi
-@@ -6985,7 +6723,7 @@
+@@ -6977,7 +6715,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8963,7 +8966,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7005,9 +6743,9 @@
+@@ -6997,9 +6735,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
@@ -8975,7 +8978,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -7018,24 +6756,24 @@
+@@ -7010,24 +6748,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9005,7 +9008,7 @@
$as_echo "no" >&6; }
fi
-@@ -7045,9 +6783,9 @@
+@@ -7037,9 +6775,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
@@ -9017,7 +9020,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -7058,24 +6796,24 @@
+@@ -7050,24 +6788,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9047,7 +9050,7 @@
$as_echo "no" >&6; }
fi
-@@ -7084,7 +6822,7 @@
+@@ -7076,7 +6814,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9056,7 +9059,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7162,9 +6900,9 @@
+@@ -7154,9 +6892,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -9068,7 +9071,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -7280,18 +7018,18 @@
+@@ -7272,18 +7010,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -9093,7 +9096,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -7344,11 +7082,11 @@
+@@ -7336,11 +7074,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -9108,7 +9111,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -7382,10 +7120,10 @@
+@@ -7374,10 +7112,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
@@ -9121,7 +9124,7 @@
$as_echo "ok" >&6; }
fi
-@@ -7411,7 +7149,7 @@
+@@ -7403,7 +7141,7 @@
# Check whether --enable-libtool-lock was given.
@@ -9130,7 +9133,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -7423,11 +7161,11 @@
+@@ -7415,11 +7153,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9145,13 +9148,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -7441,12 +7179,12 @@
+@@ -7433,12 +7171,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7444 "configure"' > conftest.$ac_ext
+- echo '#line 7436 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 7182 "configure"' > conftest.$ac_ext
++ echo '#line 7174 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9162,7 +9165,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -7480,11 +7218,11 @@
+@@ -7472,11 +7210,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9177,7 +9180,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -7533,9 +7271,9 @@
+@@ -7525,9 +7263,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -9189,7 +9192,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -7544,11 +7282,7 @@
+@@ -7536,11 +7274,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -9202,7 +9205,7 @@
/* end confdefs.h. */
int
-@@ -7559,38 +7293,13 @@
+@@ -7551,38 +7285,13 @@
return 0;
}
_ACEOF
@@ -9245,7 +9248,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7598,7 +7307,7 @@
+@@ -7590,7 +7299,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -9254,7 +9257,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
-@@ -7608,11 +7317,11 @@
+@@ -7600,11 +7309,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9269,7 +9272,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -7638,9 +7347,9 @@
+@@ -7630,9 +7339,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
@@ -9281,7 +9284,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -7651,24 +7360,24 @@
+@@ -7643,24 +7352,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9311,7 +9314,7 @@
$as_echo "no" >&6; }
fi
-@@ -7678,9 +7387,9 @@
+@@ -7670,9 +7379,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
@@ -9323,7 +9326,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -7691,24 +7400,24 @@
+@@ -7683,24 +7392,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9353,7 +9356,7 @@
$as_echo "no" >&6; }
fi
-@@ -7717,7 +7426,7 @@
+@@ -7709,7 +7418,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9362,7 +9365,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7730,9 +7439,9 @@
+@@ -7722,9 +7431,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
@@ -9374,7 +9377,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -7743,24 +7452,24 @@
+@@ -7735,24 +7444,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9404,7 +9407,7 @@
$as_echo "no" >&6; }
fi
-@@ -7770,9 +7479,9 @@
+@@ -7762,9 +7471,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
@@ -9416,7 +9419,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -7783,24 +7492,24 @@
+@@ -7775,24 +7484,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9446,7 +9449,7 @@
$as_echo "no" >&6; }
fi
-@@ -7809,7 +7518,7 @@
+@@ -7801,7 +7510,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9455,7 +9458,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7822,9 +7531,9 @@
+@@ -7814,9 +7523,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
@@ -9467,7 +9470,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -7835,24 +7544,24 @@
+@@ -7827,24 +7536,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9497,7 +9500,7 @@
$as_echo "no" >&6; }
fi
-@@ -7862,9 +7571,9 @@
+@@ -7854,9 +7563,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
@@ -9509,7 +9512,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -7875,24 +7584,24 @@
+@@ -7867,24 +7576,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9539,7 +9542,7 @@
$as_echo "no" >&6; }
fi
-@@ -7901,7 +7610,7 @@
+@@ -7893,7 +7602,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9548,7 +9551,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7914,9 +7623,9 @@
+@@ -7906,9 +7615,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
@@ -9560,7 +9563,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -7927,24 +7636,24 @@
+@@ -7919,24 +7628,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9590,7 +9593,7 @@
$as_echo "no" >&6; }
fi
-@@ -7954,9 +7663,9 @@
+@@ -7946,9 +7655,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
@@ -9602,7 +9605,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -7967,24 +7676,24 @@
+@@ -7959,24 +7668,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9632,7 +9635,7 @@
$as_echo "no" >&6; }
fi
-@@ -7993,7 +7702,7 @@
+@@ -7985,7 +7694,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9641,7 +9644,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8006,9 +7715,9 @@
+@@ -7998,9 +7707,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
@@ -9653,7 +9656,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -8019,24 +7728,24 @@
+@@ -8011,24 +7720,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9683,7 +9686,7 @@
$as_echo "no" >&6; }
fi
-@@ -8046,9 +7755,9 @@
+@@ -8038,9 +7747,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
@@ -9695,7 +9698,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -8059,24 +7768,24 @@
+@@ -8051,24 +7760,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9725,7 +9728,7 @@
$as_echo "no" >&6; }
fi
-@@ -8085,7 +7794,7 @@
+@@ -8077,7 +7786,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9734,7 +9737,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8121,9 +7830,9 @@
+@@ -8113,9 +7822,9 @@
@@ -9746,7 +9749,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -8148,22 +7857,18 @@
+@@ -8140,22 +7849,18 @@
rm -f conftest.*
fi
fi
@@ -9773,7 +9776,7 @@
/* end confdefs.h. */
int
-@@ -8174,42 +7879,17 @@
+@@ -8166,42 +7871,17 @@
return 0;
}
_ACEOF
@@ -9821,7 +9824,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -8247,69 +7927,14 @@
+@@ -8239,69 +7919,14 @@
esac
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
@@ -9897,7 +9900,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -8319,62 +7944,13 @@
+@@ -8311,62 +7936,13 @@
done
@@ -9965,7 +9968,7 @@
_ACEOF
fi
-@@ -8394,7 +7970,7 @@
+@@ -8386,7 +7962,7 @@
# Check whether --enable-shared was given.
@@ -9974,7 +9977,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -8425,7 +8001,7 @@
+@@ -8417,7 +7993,7 @@
# Check whether --enable-static was given.
@@ -9983,7 +9986,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -8457,7 +8033,7 @@
+@@ -8449,7 +8025,7 @@
# Check whether --with-pic was given.
@@ -9992,7 +9995,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -8473,7 +8049,7 @@
+@@ -8465,7 +8041,7 @@
# Check whether --enable-fast-install was given.
@@ -10001,7 +10004,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -8554,9 +8130,9 @@
+@@ -8546,9 +8122,9 @@
setopt NO_GLOB_SUBST
fi
@@ -10013,7 +10016,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -8569,7 +8145,7 @@
+@@ -8561,7 +8137,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -10022,7 +10025,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -8662,9 +8238,9 @@
+@@ -8654,9 +8230,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -10034,7 +10037,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -8715,10 +8291,10 @@
+@@ -8707,10 +8283,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -10047,7 +10050,7 @@
$as_echo "no" >&6; }
fi
-@@ -8728,9 +8304,9 @@
+@@ -8720,9 +8296,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -10059,7 +10062,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -8781,10 +8357,10 @@
+@@ -8773,10 +8349,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -10072,7 +10075,7 @@
$as_echo "no" >&6; }
fi
-@@ -8865,9 +8441,9 @@
+@@ -8857,9 +8433,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -10084,21 +10087,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -8883,11 +8459,11 @@
+@@ -8875,11 +8451,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:8886: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8462: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8878: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8454: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8890: \$? = $ac_status" >&5
-+ echo "$as_me:8466: \$? = $ac_status" >&5
+- echo "$as_me:8882: \$? = $ac_status" >&5
++ echo "$as_me:8458: \$? = $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.
-@@ -8900,7 +8476,7 @@
+@@ -8892,7 +8468,7 @@
$RM conftest*
fi
@@ -10107,7 +10110,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -8920,7 +8496,7 @@
+@@ -8912,7 +8488,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -10116,7 +10119,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -9192,7 +8768,7 @@
+@@ -9184,7 +8760,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -10125,7 +10128,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -9204,9 +8780,9 @@
+@@ -9196,9 +8772,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -10137,21 +10140,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -9222,11 +8798,11 @@
+@@ -9214,11 +8790,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:9225: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8801: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9217: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8793: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9229: \$? = $ac_status" >&5
-+ echo "$as_me:8805: \$? = $ac_status" >&5
+- echo "$as_me:9221: \$? = $ac_status" >&5
++ echo "$as_me:8797: \$? = $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.
-@@ -9239,7 +8815,7 @@
+@@ -9231,7 +8807,7 @@
$RM conftest*
fi
@@ -10160,7 +10163,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -9263,9 +8839,9 @@
+@@ -9255,9 +8831,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -10172,7 +10175,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -9291,7 +8867,7 @@
+@@ -9283,7 +8859,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -10181,7 +10184,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -9306,9 +8882,9 @@
+@@ -9298,9 +8874,9 @@
@@ -10193,21 +10196,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -9327,11 +8903,11 @@
+@@ -9319,11 +8895,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:9330: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8906: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9322: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8898: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9334: \$? = $ac_status" >&5
-+ echo "$as_me:8910: \$? = $ac_status" >&5
+- echo "$as_me:9326: \$? = $ac_status" >&5
++ echo "$as_me:8902: \$? = $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
-@@ -9353,7 +8929,7 @@
+@@ -9345,7 +8921,7 @@
$RM conftest*
fi
@@ -10216,7 +10219,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -9361,9 +8937,9 @@
+@@ -9353,9 +8929,9 @@
@@ -10228,21 +10231,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -9382,11 +8958,11 @@
+@@ -9374,11 +8950,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:9385: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8961: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9377: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8953: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9389: \$? = $ac_status" >&5
-+ echo "$as_me:8965: \$? = $ac_status" >&5
+- echo "$as_me:9381: \$? = $ac_status" >&5
++ echo "$as_me:8957: \$? = $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
-@@ -9408,7 +8984,7 @@
+@@ -9400,7 +8976,7 @@
$RM conftest*
fi
@@ -10251,7 +10254,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -9417,7 +8993,7 @@
+@@ -9409,7 +8985,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
@@ -10260,7 +10263,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -9425,10 +9001,10 @@
+@@ -9417,10 +8993,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
@@ -10273,7 +10276,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -9441,7 +9017,7 @@
+@@ -9433,7 +9009,7 @@
@@ -10282,7 +10285,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -9501,6 +9077,9 @@
+@@ -9493,6 +9069,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -10292,7 +10295,7 @@
esac
ld_shlibs=yes
-@@ -9683,7 +9262,7 @@
+@@ -9675,7 +9254,7 @@
fi
;;
@@ -10301,7 +10304,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9858,6 +9437,7 @@
+@@ -9850,6 +9429,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -10309,7 +10312,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9883,11 +9463,7 @@
+@@ -9875,11 +9455,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -10322,7 +10325,7 @@
/* end confdefs.h. */
int
-@@ -9898,27 +9474,7 @@
+@@ -9890,27 +9466,7 @@
return 0;
}
_ACEOF
@@ -10351,7 +10354,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -9932,16 +9488,9 @@
+@@ -9924,16 +9480,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
@@ -10370,7 +10373,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -9954,11 +9503,7 @@
+@@ -9946,11 +9495,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -10383,7 +10386,7 @@
/* end confdefs.h. */
int
-@@ -9969,27 +9514,7 @@
+@@ -9961,27 +9506,7 @@
return 0;
}
_ACEOF
@@ -10412,7 +10415,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10003,16 +9528,9 @@
+@@ -9995,16 +9520,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
@@ -10431,7 +10434,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10224,42 +9742,16 @@
+@@ -10216,42 +9734,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -10479,7 +10482,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'
-@@ -10272,7 +9764,7 @@
+@@ -10264,7 +9756,7 @@
link_all_deplibs=yes
;;
@@ -10488,7 +10491,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10515,7 +10007,7 @@
+@@ -10507,7 +9999,7 @@
fi
fi
@@ -10497,7 +10500,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -10552,16 +10044,16 @@
+@@ -10544,16 +10036,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.
@@ -10518,7 +10521,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -10575,11 +10067,11 @@
+@@ -10567,11 +10059,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -10533,7 +10536,7 @@
then
archive_cmds_need_lc=no
else
-@@ -10590,7 +10082,7 @@
+@@ -10582,7 +10074,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -10542,7 +10545,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -10754,7 +10246,7 @@
+@@ -10746,7 +10238,7 @@
@@ -10551,7 +10554,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -11176,11 +10668,7 @@
+@@ -11168,11 +10660,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -10564,7 +10567,7 @@
/* end confdefs.h. */
int
-@@ -11191,41 +10679,13 @@
+@@ -11183,41 +10671,13 @@
return 0;
}
_ACEOF
@@ -10610,7 +10613,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -11249,6 +10709,18 @@
+@@ -11241,6 +10701,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -10629,7 +10632,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11437,7 +10909,7 @@
+@@ -11429,7 +10901,7 @@
dynamic_linker=no
;;
esac
@@ -10638,7 +10641,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -11539,7 +11011,7 @@
+@@ -11531,7 +11003,7 @@
@@ -10647,7 +10650,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -11564,7 +11036,7 @@
+@@ -11556,7 +11028,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -10656,7 +10659,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -11609,18 +11081,14 @@
+@@ -11601,18 +11073,14 @@
darwin*)
# if libdl is installed we need to link against it
@@ -10678,7 +10681,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11638,43 +11106,18 @@
+@@ -11630,43 +11098,18 @@
return 0;
}
_ACEOF
@@ -10728,7 +10731,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11687,106 +11130,18 @@
+@@ -11679,106 +11122,18 @@
;;
*)
@@ -10840,7 +10843,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11804,145 +11159,32 @@
+@@ -11796,145 +11151,32 @@
return 0;
}
_ACEOF
@@ -10997,7 +11000,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11960,57 +11202,28 @@
+@@ -11952,57 +11194,28 @@
return 0;
}
_ACEOF
@@ -11064,7 +11067,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12028,57 +11241,28 @@
+@@ -12020,57 +11233,28 @@
return 0;
}
_ACEOF
@@ -11131,7 +11134,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12096,43 +11280,18 @@
+@@ -12088,43 +11272,18 @@
return 0;
}
_ACEOF
@@ -11181,7 +11184,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -12171,9 +11330,9 @@
+@@ -12163,9 +11322,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -11193,16 +11196,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12182,7 +11341,7 @@
+@@ -12174,7 +11333,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12185 "configure"
-+#line 11344 "configure"
+-#line 12177 "configure"
++#line 11336 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12241,11 +11400,11 @@
+@@ -12233,11 +11392,11 @@
return status;
}
_LT_EOF
@@ -11217,7 +11220,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -12262,14 +11421,14 @@
+@@ -12254,14 +11413,14 @@
fi
@@ -11235,16 +11238,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12278,7 +11437,7 @@
+@@ -12270,7 +11429,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12281 "configure"
-+#line 11440 "configure"
+-#line 12273 "configure"
++#line 11432 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12337,11 +11496,11 @@
+@@ -12329,11 +11488,11 @@
return status;
}
_LT_EOF
@@ -11259,7 +11262,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -12358,7 +11517,7 @@
+@@ -12350,7 +11509,7 @@
fi
@@ -11268,7 +11271,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -12397,12 +11556,12 @@
+@@ -12389,12 +11548,12 @@
striplib=
old_striplib=
@@ -11283,7 +11286,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -12411,15 +11570,15 @@
+@@ -12403,15 +11562,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -11302,7 +11305,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -12437,12 +11596,12 @@
+@@ -12429,12 +11588,12 @@
# Report which library types will actually be built
@@ -11318,7 +11321,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -12463,14 +11622,14 @@
+@@ -12455,14 +11614,14 @@
fi
;;
esac
@@ -11336,7 +11339,7 @@
$as_echo "$enable_static" >&6; }
-@@ -12513,9 +11672,9 @@
+@@ -12505,9 +11664,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
@@ -11348,7 +11351,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -12528,14 +11687,14 @@
+@@ -12520,14 +11679,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11366,7 +11369,7 @@
IFS=$as_save_IFS
;;
-@@ -12543,10 +11702,10 @@
+@@ -12535,10 +11694,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -11379,7 +11382,7 @@
$as_echo "no" >&6; }
fi
-@@ -12556,9 +11715,9 @@
+@@ -12548,9 +11707,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
@@ -11391,7 +11394,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -12571,14 +11730,14 @@
+@@ -12563,14 +11722,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11409,7 +11412,7 @@
IFS=$as_save_IFS
;;
-@@ -12586,10 +11745,10 @@
+@@ -12578,10 +11737,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -11422,7 +11425,7 @@
$as_echo "no" >&6; }
fi
-@@ -12598,7 +11757,7 @@
+@@ -12590,7 +11749,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -11431,7 +11434,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -12611,13 +11770,13 @@
+@@ -12603,13 +11762,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -11448,7 +11451,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -12626,35 +11785,33 @@
+@@ -12618,35 +11777,33 @@
gdu_cv_version_required=0.3.2
@@ -11492,7 +11495,7 @@
withval=$with_help_dir;
else
with_help_dir='${datadir}/gnome/help'
-@@ -12665,7 +11822,7 @@
+@@ -12657,7 +11814,7 @@
# Check whether --with-omf-dir was given.
@@ -11501,7 +11504,7 @@
withval=$with_omf_dir;
else
with_omf_dir='${datadir}/omf'
-@@ -12676,7 +11833,7 @@
+@@ -12668,7 +11825,7 @@
# Check whether --with-help-formats was given.
@@ -11510,7 +11513,7 @@
withval=$with_help_formats;
else
with_help_formats=''
-@@ -12686,7 +11843,7 @@
+@@ -12678,7 +11835,7 @@
# Check whether --enable-scrollkeeper was given.
@@ -11519,7 +11522,7 @@
enableval=$enable_scrollkeeper;
else
enable_scrollkeeper=yes
-@@ -12725,16 +11882,16 @@
+@@ -12717,16 +11874,16 @@
# Internationalization support
@@ -11539,7 +11542,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -12742,35 +11899,31 @@
+@@ -12734,35 +11891,31 @@
case "$am__api_version" in
1.01234)
@@ -11581,7 +11584,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -12783,14 +11936,14 @@
+@@ -12775,14 +11928,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11599,7 +11602,7 @@
IFS=$as_save_IFS
;;
-@@ -12798,19 +11951,19 @@
+@@ -12790,19 +11943,19 @@
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -11623,7 +11626,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -12823,14 +11976,14 @@
+@@ -12815,14 +11968,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11641,7 +11644,7 @@
IFS=$as_save_IFS
;;
-@@ -12838,19 +11991,19 @@
+@@ -12830,19 +11983,19 @@
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -11665,7 +11668,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -12863,14 +12016,14 @@
+@@ -12855,14 +12008,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11683,7 +11686,7 @@
IFS=$as_save_IFS
;;
-@@ -12878,18 +12031,16 @@
+@@ -12870,18 +12023,16 @@
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -11705,7 +11708,7 @@
fi
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -13011,9 +12162,9 @@
+@@ -13003,9 +12154,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
@@ -11717,7 +11720,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -13026,14 +12177,14 @@
+@@ -13018,14 +12169,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11735,7 +11738,7 @@
IFS=$as_save_IFS
;;
-@@ -13041,19 +12192,19 @@
+@@ -13033,19 +12184,19 @@
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -11759,7 +11762,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -13066,14 +12217,14 @@
+@@ -13058,14 +12209,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11777,7 +11780,7 @@
IFS=$as_save_IFS
;;
-@@ -13081,19 +12232,19 @@
+@@ -13073,19 +12224,19 @@
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -11801,7 +11804,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -13106,14 +12257,14 @@
+@@ -13098,14 +12249,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11819,7 +11822,7 @@
IFS=$as_save_IFS
;;
-@@ -13121,19 +12272,19 @@
+@@ -13113,19 +12264,19 @@
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -11843,7 +11846,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -13146,14 +12297,14 @@
+@@ -13138,14 +12289,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11861,7 +11864,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -13162,33 +12313,29 @@
+@@ -13154,33 +12305,29 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -11901,7 +11904,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -13201,14 +12348,14 @@
+@@ -13193,14 +12340,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11919,7 +11922,7 @@
IFS=$as_save_IFS
;;
-@@ -13216,41 +12363,35 @@
+@@ -13208,41 +12355,35 @@
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -11970,7 +11973,7 @@
fi
fi
-@@ -13260,11 +12401,7 @@
+@@ -13252,11 +12393,7 @@
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -11983,7 +11986,7 @@
/* end confdefs.h. */
int
-@@ -13276,120 +12413,13 @@
+@@ -13268,120 +12405,13 @@
return 0;
}
_ACEOF
@@ -12108,7 +12111,7 @@
DATADIRNAME=share
else
DATADIRNAME=lib
-@@ -13401,10 +12431,8 @@
+@@ -13393,10 +12423,8 @@
;;
esac
fi
@@ -12121,7 +12124,7 @@
fi
-@@ -13421,151 +12449,12 @@
+@@ -13413,151 +12441,12 @@
@@ -12278,7 +12281,7 @@
_ACEOF
fi
-@@ -13573,16 +12462,12 @@
+@@ -13565,16 +12454,12 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -12298,7 +12301,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -13593,46 +12478,19 @@
+@@ -13585,46 +12470,19 @@
return 0;
}
_ACEOF
@@ -12351,7 +12354,7 @@
fi
fi
-@@ -13645,155 +12503,20 @@
+@@ -13637,155 +12495,20 @@
XGETTEXT=:
INTLLIBS=
@@ -12512,7 +12515,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -13806,54 +12529,25 @@
+@@ -13798,54 +12521,25 @@
return 0;
}
_ACEOF
@@ -12575,7 +12578,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -13866,141 +12560,26 @@
+@@ -13858,141 +12552,26 @@
return 0;
}
_ACEOF
@@ -12727,7 +12730,7 @@
_ACEOF
fi
-@@ -14015,18 +12594,14 @@
+@@ -14007,18 +12586,14 @@
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -12749,7 +12752,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14044,55 +12619,26 @@
+@@ -14036,55 +12611,26 @@
return 0;
}
_ACEOF
@@ -12814,7 +12817,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14110,55 +12656,26 @@
+@@ -14102,55 +12648,26 @@
return 0;
}
_ACEOF
@@ -12879,7 +12882,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14176,43 +12693,18 @@
+@@ -14168,43 +12685,18 @@
return 0;
}
_ACEOF
@@ -12929,7 +12932,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -14222,22 +12714,18 @@
+@@ -14214,22 +12706,18 @@
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -12957,7 +12960,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14255,55 +12743,26 @@
+@@ -14247,55 +12735,26 @@
return 0;
}
_ACEOF
@@ -13022,7 +13025,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14321,43 +12780,18 @@
+@@ -14313,43 +12772,18 @@
return 0;
}
_ACEOF
@@ -13072,7 +13075,7 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -14379,102 +12813,12 @@
+@@ -14371,102 +12805,12 @@
glib_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
@@ -13180,7 +13183,7 @@
_ACEOF
fi
-@@ -14504,15 +12848,13 @@
+@@ -14496,15 +12840,13 @@
if test "$gt_cv_have_gettext" = "yes"; then
@@ -13199,7 +13202,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -14537,140 +12879,50 @@
+@@ -14529,140 +12871,50 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -13257,16 +13260,7 @@
+ cat >conftest.foo <<_ACEOF
-#undef $ac_func
-+msgid ""
-+msgstr ""
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Project-Id-Version: test 1.0\n"
-+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
-+"Last-Translator: test <foo at bar.xx>\n"
-+"Language-Team: C <LL at li.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Transfer-Encoding: 8bit\n"
-
+-
-/* 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. */
@@ -13331,7 +13325,7 @@
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
-
-fi
-done
@@ -13350,8 +13344,17 @@
-"Language-Team: C <LL at li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
--
--_ACEOF
++msgid ""
++msgstr ""
++"Content-Type: text/plain; charset=UTF-8\n"
++"Project-Id-Version: test 1.0\n"
++"PO-Revision-Date: 2007-02-15 12:01+0100\n"
++"Last-Translator: test <foo at bar.xx>\n"
++"Language-Team: C <LL at li.org>\n"
++"MIME-Version: 1.0\n"
++"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
@@ -13368,7 +13371,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -14678,9 +12930,9 @@
+@@ -14670,9 +12922,9 @@
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -13380,7 +13383,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -14693,14 +12945,14 @@
+@@ -14685,14 +12937,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13398,7 +13401,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -14709,19 +12961,19 @@
+@@ -14701,19 +12953,19 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -13422,7 +13425,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -14746,18 +12998,14 @@
+@@ -14738,18 +12990,14 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -13444,7 +13447,7 @@
/* end confdefs.h. */
int
-@@ -14769,121 +13017,14 @@
+@@ -14761,121 +13009,14 @@
return 0;
}
_ACEOF
@@ -13570,7 +13573,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -14898,10 +13039,8 @@
+@@ -14890,10 +13031,8 @@
;;
esac
fi
@@ -13583,7 +13586,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -14915,9 +13054,7 @@
+@@ -14907,9 +13046,7 @@
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -13594,7 +13597,7 @@
fi
-@@ -14925,7 +13062,7 @@
+@@ -14917,7 +13054,7 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -13603,7 +13606,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -14958,7 +13095,7 @@
+@@ -14950,7 +13087,7 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -13612,7 +13615,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -14983,7 +13120,7 @@
+@@ -14975,7 +13112,7 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -13621,7 +13624,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -15028,7 +13165,7 @@
+@@ -15020,7 +13157,7 @@
# Check whether --enable-debug was given.
@@ -13630,7 +13633,7 @@
enableval=$enable_debug;
else
enable_debug=no
-@@ -15037,16 +13174,14 @@
+@@ -15029,16 +13166,14 @@
if test x$enable_debug = xyes ; then
@@ -13649,7 +13652,7 @@
enableval=$enable_compile_warnings;
else
enable_compile_warnings="maximum"
-@@ -15077,13 +13212,9 @@
+@@ -15069,13 +13204,9 @@
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -13665,7 +13668,7 @@
/* end confdefs.h. */
int
-@@ -15094,35 +13225,14 @@
+@@ -15086,35 +13217,14 @@
return 0;
}
_ACEOF
@@ -13704,7 +13707,7 @@
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
-@@ -15136,26 +13246,24 @@
+@@ -15128,26 +13238,24 @@
fi
;;
*)
@@ -13736,7 +13739,7 @@
$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
complCFLAGS=
if test "x$enable_iso_c" != "xno"; then
-@@ -15170,7 +13278,7 @@
+@@ -15162,7 +13270,7 @@
esac
fi
fi
@@ -13745,24 +13748,10 @@
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -15179,23 +13287,20 @@
-
-
-
-- DISABLE_DEPRECATED=""
- if test $USE_MAINTAINER_MODE = yes; then
-- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
-- for DOMAIN in $DOMAINS; do
-- DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
-- done
-+ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED"
-+ else
-+ DISABLE_DEPRECATED=""
- fi
-
-
-
--
+@@ -15182,12 +13290,12 @@
+
+
+
-{ $as_echo "$as_me:$LINENO: checking for X" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
$as_echo_n "checking for X... " >&6; }
@@ -13774,7 +13763,7 @@
withval=$with_x;
fi
-@@ -15205,10 +13310,8 @@
+@@ -15197,10 +13305,8 @@
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -13787,7 +13776,7 @@
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
-@@ -15256,21 +13359,25 @@
+@@ -15248,21 +13354,25 @@
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
@@ -13813,7 +13802,7 @@
/usr/local/include/X11R6
/usr/local/include/X11R5
/usr/local/include/X11R4
-@@ -15292,37 +13399,14 @@
+@@ -15284,37 +13394,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.
@@ -13853,7 +13842,7 @@
for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
-@@ -15330,7 +13414,6 @@
+@@ -15322,7 +13409,6 @@
fi
done
fi
@@ -13861,7 +13850,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
-@@ -15340,11 +13423,7 @@
+@@ -15332,11 +13418,7 @@
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
@@ -13874,7 +13863,7 @@
/* end confdefs.h. */
#include <X11/Xlib.h>
int
-@@ -15355,35 +13434,12 @@
+@@ -15347,35 +13429,12 @@
return 0;
}
_ACEOF
@@ -13912,7 +13901,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!
-@@ -15395,10 +13451,8 @@
+@@ -15387,10 +13446,8 @@
done
done
fi
@@ -13925,7 +13914,7 @@
fi # $ac_x_libraries = no
case $ac_x_includes,$ac_x_libraries in #(
-@@ -15419,7 +13473,7 @@
+@@ -15411,7 +13468,7 @@
fi # $with_x != no
if test "$have_x" != yes; then
@@ -13934,7 +13923,7 @@
$as_echo "$have_x" >&6; }
no_x=yes
else
-@@ -15430,16 +13484,14 @@
+@@ -15422,16 +13479,14 @@
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -13953,7 +13942,7 @@
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
else
-@@ -15452,16 +13504,12 @@
+@@ -15444,16 +13499,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 . . . .
@@ -13972,7 +13961,7 @@
/* end confdefs.h. */
int
-@@ -15472,40 +13520,13 @@
+@@ -15464,40 +13515,13 @@
return 0;
}
_ACEOF
@@ -14017,7 +14006,7 @@
/* end confdefs.h. */
int
-@@ -15516,46 +13537,19 @@
+@@ -15508,46 +13532,19 @@
return 0;
}
_ACEOF
@@ -14071,7 +14060,7 @@
ac_c_werror_flag=$ac_xsave_c_werror_flag
LIBS=$ac_xsave_LIBS
fi
-@@ -15571,11 +13565,7 @@
+@@ -15563,11 +13560,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"
@@ -14084,7 +14073,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15593,44 +13583,17 @@
+@@ -15585,44 +13578,17 @@
return 0;
}
_ACEOF
@@ -14134,7 +14123,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15648,59 +13611,30 @@
+@@ -15640,59 +13606,30 @@
return 0;
}
_ACEOF
@@ -14203,7 +14192,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15718,52 +13652,25 @@
+@@ -15710,52 +13647,25 @@
return 0;
}
_ACEOF
@@ -14264,7 +14253,7 @@
LIBS="$ac_xsave_LIBS"
# msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -15774,105 +13681,20 @@
+@@ -15766,105 +13676,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.
@@ -14309,9 +14298,7 @@
-#if defined __stub_gethostbyname || defined __stub___gethostbyname
-choke me
-#endif
-+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-
+-
-int
-main ()
-{
@@ -14347,8 +14334,8 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_gethostbyname=no
- fi
-
+-fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -14356,11 +14343,18 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-$as_echo "$ac_cv_func_gethostbyname" >&6; }
-
- if test $ac_cv_func_gethostbyname = no; then
+- if test $ac_cv_func_gethostbyname = no; then
- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
++ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
++if test "x$ac_cv_func_gethostbyname" = x""yes; then :
++
++fi
++
++ if test $ac_cv_func_gethostbyname = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
- $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
--if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
++$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -14375,7 +14369,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15890,312 +13712,31 @@
+@@ -15882,59 +13707,30 @@
return 0;
}
_ACEOF
@@ -14440,23 +14434,14 @@
-_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 gethostbyname ();
--int
--main ()
--{
--return gethostbyname ();
-- ;
-- return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -15952,43 +13748,18 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -14478,35 +14463,35 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_bsd_gethostbyname=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_bsd_gethostbyname=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_bsd_gethostbyname=no
--fi
++ ac_cv_lib_bsd_gethostbyname=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_bsd_gethostbyname" >&5
--$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
--fi
--
-- fi
-- fi
--
-- # lieder at skyler.mavd.honeywell.com says without -lsocket,
-- # socket/setsockopt and other routines are undefined under SCO ODT
-- # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
-- # on later versions), says Simon Leinen: it contains gethostby*
-- # 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.
++if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+ fi
+
+@@ -16002,105 +13773,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.
- { $as_echo "$as_me:$LINENO: checking for connect" >&5
-$as_echo_n "checking for connect... " >&6; }
-if test "${ac_cv_func_connect+set}" = set; then
@@ -14534,7 +14519,9 @@
-#endif
-
-#undef connect
--
++ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
++if test "x$ac_cv_func_connect" = x""yes; then :
+
-/* 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. */
@@ -14589,24 +14576,109 @@
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-$as_echo "$ac_cv_func_connect" >&6; }
--
-- if test $ac_cv_func_connect = no; then
+
+ if test $ac_cv_func_connect = no; then
- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
--$as_echo_n "checking for connect in -lsocket... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+ $as_echo_n "checking for connect in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
++if test "${ac_cv_lib_socket_connect+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $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.
+@@ -16118,148 +13804,38 @@
+ 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_socket_connect=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_socket_connect=no
++ ac_cv_lib_socket_connect=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_socket_connect" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
+ $as_echo "$ac_cv_lib_socket_connect" >&6; }
+-if test "x$ac_cv_lib_socket_connect" = x""yes; then
++if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+ fi
+
+ fi
+
+ # Guillermo Gomez says -lposix is necessary on A/UX.
+- { $as_echo "$as_me:$LINENO: checking for remove" >&5
+-$as_echo_n "checking for remove... " >&6; }
+-if test "${ac_cv_func_remove+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 remove to an innocuous variant, in case <limits.h> declares remove.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define remove innocuous_remove
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- 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. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef remove
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -14614,11 +14686,20 @@
-#ifdef __cplusplus
-extern "C"
-#endif
--char connect ();
+-char remove ();
+-/* 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_remove || defined __stub___remove
+-choke me
+-#endif
++ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
++if test "x$ac_cv_func_remove" = x""yes; then :
+
-int
-main ()
-{
--return connect ();
+-return remove ();
- ;
- return 0;
-}
@@ -14644,79 +14725,41 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_socket_connect=yes
+- ac_cv_func_remove=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_socket_connect=no
+- ac_cv_func_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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
--$as_echo "$ac_cv_lib_socket_connect" >&6; }
--if test "x$ac_cv_lib_socket_connect" = x""yes; then
-- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
--fi
--
-- fi
--
-- # Guillermo Gomez says -lposix is necessary on A/UX.
-- { $as_echo "$as_me:$LINENO: checking for remove" >&5
--$as_echo_n "checking for remove... " >&6; }
--if test "${ac_cv_func_remove+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+-$as_echo "$ac_cv_func_remove" >&6; }
+
+ if test $ac_cv_func_remove = no; then
+- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
+ $as_echo_n "checking for remove in -lposix... " >&6; }
+-if test "${ac_cv_lib_posix_remove+set}" = set; then
++if test "${ac_cv_lib_posix_remove+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define remove to an innocuous variant, in case <limits.h> declares remove.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define remove innocuous_remove
--
--/* System header to define __stub macros and hopefully few prototypes,
-- 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. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef remove
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
+ /* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -16203,71 +13744,54 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char remove ();
--/* 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_remove || defined __stub___remove
--choke me
--#endif
--
-+char gethostbyname ();
- int
- main ()
- {
--return remove ();
-+return gethostbyname ();
- ;
+@@ -16277,148 +13853,38 @@
return 0;
}
_ACEOF
@@ -14741,113 +14784,14 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_func_remove=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_bsd_gethostbyname=yes
+ ac_cv_lib_posix_remove=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_func_remove=no
-+ ac_cv_lib_bsd_gethostbyname=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_bsd_gethostbyname" >&5
-+$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
-+fi
-+
-+ fi
-+ fi
-+
-+ # lieder at skyler.mavd.honeywell.com says without -lsocket,
-+ # socket/setsockopt and other routines are undefined under SCO ODT
-+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
-+ # on later versions), says Simon Leinen: it contains gethostby*
-+ # 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.
-+ 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
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
--$as_echo "$ac_cv_func_remove" >&6; }
-
-- if test $ac_cv_func_remove = no; then
-- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
--$as_echo_n "checking for remove in -lposix... " >&6; }
--if test "${ac_cv_lib_posix_remove+set}" = set; then
-+ if test $ac_cv_func_connect = no; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
-+$as_echo_n "checking for connect in -lsocket... " >&6; }
-+if test "${ac_cv_lib_socket_connect+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lposix $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -16276,85 +13800,48 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char remove ();
-+char connect ();
- int
- main ()
- {
--return remove ();
-+return connect ();
- ;
- 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_posix_remove=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_socket_connect=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
- ac_cv_lib_posix_remove=no
-+ ac_cv_lib_socket_connect=no
++ ac_cv_lib_posix_remove=no
fi
-
-rm -rf conftest.dSYM
@@ -14858,42 +14802,27 @@
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"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
-+$as_echo "$ac_cv_lib_socket_connect" >&6; }
-+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
-+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
++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.
+ # 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
-+ # Guillermo Gomez says -lposix is necessary on A/UX.
-+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
-+if test "x$ac_cv_func_remove" = x""yes; then :
-+
-+fi
-+
-+ if test $ac_cv_func_remove = no; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
-+$as_echo_n "checking for remove in -lposix... " >&6; }
-+if test "${ac_cv_lib_posix_remove+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
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lposix $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shmat innocuous_shmat
@@ -14910,13 +14839,15 @@
-#endif
-
-#undef shmat
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -16362,71 +13849,47 @@
- #ifdef __cplusplus
- extern "C"
- #endif
++ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
++if test "x$ac_cv_func_shmat" = x""yes; then :
+
+-/* 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 shmat ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -14925,16 +14856,14 @@
-choke me
-#endif
-
-+char remove ();
- int
- main ()
- {
+-int
+-main ()
+-{
-return shmat ();
-+return remove ();
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -14957,34 +14886,16 @@
- $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
+-
-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; }
@@ -15008,7 +14919,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16444,43 +13907,18 @@
+@@ -16436,43 +13902,18 @@
return 0;
}
_ACEOF
@@ -15058,7 +14969,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -16496,18 +13934,14 @@
+@@ -16488,18 +13929,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
@@ -15080,7 +14991,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16525,43 +13959,18 @@
+@@ -16517,156 +13954,43 @@
return 0;
}
_ACEOF
@@ -15130,10 +15041,12 @@
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -16571,110 +13980,22 @@
-
- x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
-
+- LDFLAGS=$ac_save_LDFLAGS
+-
+-fi
+-
+-x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+-
-{ $as_echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo" >&5
-$as_echo_n "checking for XScreenSaverQueryInfo... " >&6; }
-if test "${ac_cv_func_XScreenSaverQueryInfo+set}" = set; then
@@ -15209,10 +15122,11 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ LDFLAGS=$ac_save_LDFLAGS
+
- ac_cv_func_XScreenSaverQueryInfo=no
--fi
--
+ fi
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -15220,6 +15134,8 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XScreenSaverQueryInfo" >&5
-$as_echo "$ac_cv_func_XScreenSaverQueryInfo" >&6; }
-if test "x$ac_cv_func_XScreenSaverQueryInfo" = x""yes; then
++x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
++
+ac_fn_c_check_func "$LINENO" "XScreenSaverQueryInfo" "ac_cv_func_XScreenSaverQueryInfo"
+if test "x$ac_cv_func_XScreenSaverQueryInfo" = x""yes; then :
@@ -15246,7 +15162,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16692,43 +14013,18 @@
+@@ -16684,43 +14008,18 @@
return 0;
}
_ACEOF
@@ -15296,7 +15212,7 @@
TYPING_BREAK="typing-break"
SCREENSAVER_LIBS="$X_PRE_LIBS $X_LIBS -lXss -lXext -lX11"
-@@ -16736,18 +14032,14 @@
+@@ -16728,18 +14027,14 @@
LIBS=$save_LIBS
LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lXext -lX11"
@@ -15318,20 +15234,10 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16755,53 +14047,28 @@
- builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--#endif
--char XScreenSaverQueryInfo ();
--int
--main ()
--{
--return XScreenSaverQueryInfo ();
-- ;
-- return 0;
--}
--_ACEOF
+@@ -16757,43 +14052,18 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -15353,16 +15259,6 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+#endif
-+char XScreenSaverQueryInfo ();
-+int
-+main ()
-+{
-+return XScreenSaverQueryInfo ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_Xext_XScreenSaverQueryInfo=yes
else
@@ -15388,7 +15284,7 @@
TYPING_BREAK="typing-break"
SCREENSAVER_LIBS="$X_PRE_LIBS $X_LIBS -lXext -lX11"
-@@ -16817,40 +14084,44 @@
+@@ -16809,40 +14079,44 @@
pkg_failed=no
@@ -15452,7 +15348,7 @@
fi
-@@ -16863,14 +14134,14 @@
+@@ -16855,14 +14129,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15470,7 +15366,7 @@
$as_echo "no" >&6; }
:
elif test $pkg_failed = untried; then
-@@ -16878,7 +14149,7 @@
+@@ -16870,7 +14144,7 @@
else
LIBCANBERRA_GTK_CFLAGS=$pkg_cv_LIBCANBERRA_GTK_CFLAGS
LIBCANBERRA_GTK_LIBS=$pkg_cv_LIBCANBERRA_GTK_LIBS
@@ -15479,7 +15375,7 @@
$as_echo "yes" >&6; }
CANBERRA_GTK=1
-@@ -16906,169 +14177,26 @@
+@@ -16898,169 +14172,26 @@
savecppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
@@ -15656,7 +15552,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17086,103 +14214,29 @@
+@@ -17078,103 +14209,29 @@
return 0;
}
_ACEOF
@@ -15772,7 +15668,7 @@
_ACEOF
XF86MISC_LIBS="-lXxf86misc"
fi
-@@ -17192,151 +14246,12 @@
+@@ -17184,151 +14241,12 @@
fi
@@ -15928,7 +15824,7 @@
_ACEOF
fi
-@@ -17349,40 +14264,44 @@
+@@ -17341,40 +14259,44 @@
COMMON_MODULES="gtk+-2.0 >= 2.15.0 glib-2.0 >= 2.17.4 gio-2.0 gconf-2.0 libxml-2.0 gnome-desktop-2.0 >= 2.25.1"
pkg_failed=no
@@ -15992,7 +15888,7 @@
fi
-@@ -17395,25 +14314,14 @@
+@@ -17387,25 +14309,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16021,7 +15917,7 @@
$CAPPLET_PKG_ERRORS
-@@ -17423,22 +14331,11 @@
+@@ -17415,22 +14326,11 @@
Alternatively, you may set the environment variables CAPPLET_CFLAGS
and CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -16047,7 +15943,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -17447,51 +14344,54 @@
+@@ -17439,51 +14339,54 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -16124,7 +16020,7 @@
fi
-@@ -17504,50 +14404,28 @@
+@@ -17496,25 +14399,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16153,40 +16049,33 @@
$GNOMECC_PKG_ERRORS
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
+@@ -17524,22 +14416,11 @@
+ Alternatively, you may set the environment variables GNOMECC_CFLAGS
+ and GNOMECC_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+- { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++ { { $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
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
-
-Alternatively, you may set the environment variables GNOMECC_CFLAGS
-and GNOMECC_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
--" >&2;}
-- { (exit 1); exit 1; }; }
--elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$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
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
- Alternatively, you may set the environment variables GNOMECC_CFLAGS
- and GNOMECC_LIBS to avoid the need to call pkg-config.
- 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
-+" "$LINENO" 5
-+elif test $pkg_failed = untried; then
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+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.
-@@ -17556,51 +14434,54 @@
+@@ -17548,51 +14429,54 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -16263,7 +16152,7 @@
fi
-@@ -17613,25 +14494,14 @@
+@@ -17605,25 +14489,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16292,7 +16181,7 @@
$GNOMECC_SHELL_PKG_ERRORS
-@@ -17641,22 +14511,11 @@
+@@ -17633,22 +14506,11 @@
Alternatively, you may set the environment variables GNOMECC_SHELL_CFLAGS
and GNOMECC_SHELL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -16318,7 +16207,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -17665,51 +14524,54 @@
+@@ -17657,51 +14519,54 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -16395,7 +16284,7 @@
fi
-@@ -17722,25 +14584,14 @@
+@@ -17714,25 +14579,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16424,7 +16313,7 @@
$DBUS_PKG_ERRORS
-@@ -17750,22 +14601,11 @@
+@@ -17742,22 +14596,11 @@
Alternatively, you may set the environment variables DBUS_CFLAGS
and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -16450,7 +16339,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -17774,51 +14614,54 @@
+@@ -17766,51 +14609,54 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -16527,7 +16416,7 @@
fi
-@@ -17831,25 +14674,14 @@
+@@ -17823,25 +14669,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16556,7 +16445,7 @@
$GNOME_DESKTOP_PKG_ERRORS
-@@ -17859,22 +14691,11 @@
+@@ -17851,22 +14686,11 @@
Alternatively, you may set the environment variables GNOME_DESKTOP_CFLAGS
and GNOME_DESKTOP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -16582,7 +16471,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -17883,51 +14704,54 @@
+@@ -17875,51 +14699,54 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -16659,7 +16548,7 @@
fi
-@@ -17940,25 +14764,14 @@
+@@ -17932,25 +14759,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16688,7 +16577,7 @@
$DEFAULT_APPLICATIONS_CAPPLET_PKG_ERRORS
-@@ -17968,22 +14781,11 @@
+@@ -17960,22 +14776,11 @@
Alternatively, you may set the environment variables DEFAULT_APPLICATIONS_CAPPLET_CFLAGS
and DEFAULT_APPLICATIONS_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -16714,7 +16603,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -17992,51 +14794,54 @@
+@@ -17984,51 +14789,54 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -16791,7 +16680,7 @@
fi
-@@ -18049,25 +14854,14 @@
+@@ -18041,25 +14849,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16820,7 +16709,7 @@
$METACITY_PKG_ERRORS
-@@ -18077,22 +14871,11 @@
+@@ -18069,22 +14866,11 @@
Alternatively, you may set the environment variables METACITY_CFLAGS
and METACITY_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -16846,7 +16735,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -18101,51 +14884,54 @@
+@@ -18093,51 +14879,54 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -16923,7 +16812,7 @@
fi
-@@ -18158,25 +14944,14 @@
+@@ -18150,25 +14939,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16952,7 +16841,7 @@
$TYPING_PKG_ERRORS
-@@ -18186,22 +14961,11 @@
+@@ -18178,22 +14956,11 @@
Alternatively, you may set the environment variables TYPING_CFLAGS
and TYPING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -16978,7 +16867,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -18210,51 +14974,54 @@
+@@ -18202,51 +14969,54 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -17055,7 +16944,7 @@
fi
-@@ -18267,25 +15034,14 @@
+@@ -18259,25 +15029,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -17084,7 +16973,7 @@
$GSD_DBUS_PKG_ERRORS
-@@ -18295,22 +15051,11 @@
+@@ -18287,22 +15046,11 @@
Alternatively, you may set the environment variables GSD_DBUS_CFLAGS
and GSD_DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -17110,7 +16999,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -18319,51 +15064,54 @@
+@@ -18311,51 +15059,54 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -17187,7 +17076,7 @@
fi
-@@ -18376,25 +15124,14 @@
+@@ -18368,25 +15119,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -17216,7 +17105,7 @@
$GIO_PKG_ERRORS
-@@ -18404,22 +15141,11 @@
+@@ -18396,12 +15136,11 @@
Alternatively, you may set the environment variables GIO_CFLAGS
and GIO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -17228,40 +17117,37 @@
+ { { $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.
+
+@@ -18410,79 +15149,145 @@
+ 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.
--
++See \`config.log' for more details." "$LINENO" 5; }
++else
++ GIO_CFLAGS=$pkg_cv_GIO_CFLAGS
++ GIO_LIBS=$pkg_cv_GIO_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ :
++fi
+
-Alternatively, you may set the environment variables GIO_CFLAGS
-and GIO_LIBS to avoid the need to call pkg-config.
-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.
-
-@@ -18428,12 +15154,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; }
- else
- GIO_CFLAGS=$pkg_cv_GIO_CFLAGS
- GIO_LIBS=$pkg_cv_GIO_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- :
- fi
-@@ -18445,52 +15170,129 @@
-
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for LIBSLAB" >&5
++gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-2.0`
++gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0`
++GTK_ENGINE_DIR="$gtk_lib_dir/gtk-2.0/$gtk_binary_version/engines"
++
++
++
++pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXTERNAL_LIBSLAB" >&5
+$as_echo_n "checking for EXTERNAL_LIBSLAB... " >&6; }
+
@@ -17318,23 +17204,36 @@
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$EXTERNAL_LIBSLAB_PKG_ERRORS" >&5
-+
+
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ have_libslab=no
+elif test $pkg_failed = untried; then
+ have_libslab=no
-+else
+ else
+- GIO_CFLAGS=$pkg_cv_GIO_CFLAGS
+- GIO_LIBS=$pkg_cv_GIO_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ EXTERNAL_LIBSLAB_CFLAGS=$pkg_cv_EXTERNAL_LIBSLAB_CFLAGS
+ EXTERNAL_LIBSLAB_LIBS=$pkg_cv_EXTERNAL_LIBSLAB_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
+ $as_echo "yes" >&6; }
+- :
+ have_libslab=yes
-+fi
-+
+ fi
+
+-gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-2.0`
+-gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0`
+-GTK_ENGINE_DIR="$gtk_lib_dir/gtk-2.0/$gtk_binary_version/engines"
+-
+-
+if test $have_libslab = no; then
-+
-+pkg_failed=no
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for LIBSLAB" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSLAB" >&5
$as_echo_n "checking for LIBSLAB... " >&6; }
@@ -17418,7 +17317,7 @@
fi
-@@ -18503,18 +15305,18 @@
+@@ -18495,18 +15300,18 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -17444,7 +17343,7 @@
$as_echo "no" >&6; }
have_libslab_deps=no
elif test $pkg_failed = untried; then
-@@ -18522,20 +15324,27 @@
+@@ -18514,20 +15319,27 @@
else
LIBSLAB_CFLAGS=$pkg_cv_LIBSLAB_CFLAGS
LIBSLAB_LIBS=$pkg_cv_LIBSLAB_LIBS
@@ -17479,7 +17378,7 @@
fi
if test $have_libslab_deps = yes; then
-@@ -18546,53 +15355,63 @@
+@@ -18538,53 +15350,63 @@
HAVE_LIBSLAB_DEPS_FALSE=
fi
@@ -17565,7 +17464,7 @@
fi
-@@ -18605,25 +15424,14 @@
+@@ -18597,25 +15419,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -17594,7 +17493,7 @@
$FONT_CAPPLET_PKG_ERRORS
-@@ -18633,22 +15441,11 @@
+@@ -18625,22 +15436,11 @@
Alternatively, you may set the environment variables FONT_CAPPLET_CFLAGS
and FONT_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -17620,7 +17519,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -18657,51 +15454,54 @@
+@@ -18649,51 +15449,54 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -17697,7 +17596,7 @@
fi
-@@ -18714,25 +15514,14 @@
+@@ -18706,25 +15509,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -17726,7 +17625,7 @@
$FONT_VIEWER_PKG_ERRORS
-@@ -18742,22 +15531,11 @@
+@@ -18734,22 +15526,11 @@
Alternatively, you may set the environment variables FONT_VIEWER_CFLAGS
and FONT_VIEWER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -17752,7 +17651,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -18766,52 +15544,55 @@
+@@ -18758,52 +15539,55 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -17830,7 +17729,7 @@
fi
-@@ -18824,25 +15605,14 @@
+@@ -18816,25 +15600,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -17859,7 +17758,7 @@
$AT_CAPPLET_PKG_ERRORS
-@@ -18852,22 +15622,11 @@
+@@ -18844,22 +15617,11 @@
Alternatively, you may set the environment variables AT_CAPPLET_CFLAGS
and AT_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -17885,7 +17784,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -18876,30 +15635,25 @@
+@@ -18868,30 +15630,25 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -17921,7 +17820,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18917,95 +15671,25 @@
+@@ -18909,95 +15666,25 @@
return 0;
}
_ACEOF
@@ -18027,7 +17926,7 @@
else
:
-@@ -19027,40 +15711,44 @@
+@@ -19019,40 +15706,44 @@
pkg_failed=no
@@ -18091,7 +17990,7 @@
fi
-@@ -19073,14 +15761,14 @@
+@@ -19065,25 +15756,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -18105,25 +18004,25 @@
echo "$DISPLAY_CAPPLET_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES) were not met:
+-
+-$DISPLAY_CAPPLET_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables DISPLAY_CAPPLET_CFLAGS
+-and DISPLAY_CAPPLET_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements ($COMMON_MODULES) were not met:
+ as_fn_error "Package requirements ($COMMON_MODULES) were not met:
$DISPLAY_CAPPLET_PKG_ERRORS
-@@ -19090,33 +15778,11 @@
+@@ -19093,22 +15773,11 @@
Alternatively, you may set the environment variables DISPLAY_CAPPLET_CFLAGS
and DISPLAY_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements ($COMMON_MODULES) were not met:
--
--$DISPLAY_CAPPLET_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables DISPLAY_CAPPLET_CFLAGS
--and DISPLAY_CAPPLET_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
+" "$LINENO" 5
@@ -18146,7 +18045,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -19125,12 +15791,11 @@
+@@ -19117,12 +15786,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -18161,7 +18060,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -19143,52 +15808,56 @@
+@@ -19135,52 +15803,56 @@
have_xcursor=no
pkg_failed=no
@@ -18239,7 +18138,7 @@
fi
-@@ -19201,18 +15870,18 @@
+@@ -19193,18 +15865,18 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -18263,7 +18162,7 @@
$as_echo "no" >&6; }
have_xcursor=no
elif test $pkg_failed = untried; then
-@@ -19220,13 +15889,11 @@
+@@ -19212,13 +15884,11 @@
else
XCURSOR_CFLAGS=$pkg_cv_XCURSOR_CFLAGS
XCURSOR_LIBS=$pkg_cv_XCURSOR_LIBS
@@ -18279,7 +18178,7 @@
fi
if test $have_xcursor=yes; then
-@@ -19241,7 +15908,7 @@
+@@ -19233,7 +15903,7 @@
if test x$have_xcursor = xyes; then
@@ -18288,7 +18187,7 @@
$as_echo_n "checking for XCURSOR cursor location... " >&6; }
XCURSOR_ICONDIR=$($PKG_CONFIG --variable=icondir xcursor)
if test "x$XCURSOR_ICONDIR" != x; then
-@@ -19253,7 +15920,7 @@
+@@ -19245,7 +15915,7 @@
else
XCURSOR_ICONDIR=none
fi
@@ -18297,7 +18196,7 @@
$as_echo "${XCURSOR_ICONDIR}" >&6; }
fi
-@@ -19262,40 +15929,44 @@
+@@ -19254,40 +15924,44 @@
have_xinput=no
pkg_failed=no
@@ -18361,7 +18260,7 @@
fi
-@@ -19308,14 +15979,14 @@
+@@ -19300,14 +15974,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -18379,7 +18278,7 @@
$as_echo "no" >&6; }
have_xinput=no
elif test $pkg_failed = untried; then
-@@ -19323,13 +15994,11 @@
+@@ -19315,13 +15989,11 @@
else
XINPUT_CFLAGS=$pkg_cv_XINPUT_CFLAGS
XINPUT_LIBS=$pkg_cv_XINPUT_LIBS
@@ -18395,7 +18294,7 @@
fi
if test $have_xinput=yes; then
-@@ -19347,40 +16016,44 @@
+@@ -19339,40 +16011,44 @@
pkg_failed=no
@@ -18459,7 +18358,7 @@
fi
-@@ -19393,25 +16066,14 @@
+@@ -19385,25 +16061,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -18488,7 +18387,7 @@
$LIBGNOMEKBD_PKG_ERRORS
-@@ -19421,22 +16083,11 @@
+@@ -19413,22 +16078,11 @@
Alternatively, you may set the environment variables LIBGNOMEKBD_CFLAGS
and LIBGNOMEKBD_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -18514,7 +18413,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -19445,12 +16096,11 @@
+@@ -19437,12 +16091,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -18529,7 +18428,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -19459,40 +16109,44 @@
+@@ -19451,40 +16104,44 @@
pkg_failed=no
@@ -18593,7 +18492,7 @@
fi
-@@ -19505,25 +16159,14 @@
+@@ -19497,50 +16154,28 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -18622,33 +18521,40 @@
$LIBGNOMEKBDUI_PKG_ERRORS
-@@ -19533,22 +16176,11 @@
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables LIBGNOMEKBDUI_CFLAGS
+-and LIBGNOMEKBDUI_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&2;}
+- { (exit 1); exit 1; }; }
+-elif test $pkg_failed = untried; then
+- { { $as_echo "$as_me:$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
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
Alternatively, you may set the environment variables LIBGNOMEKBDUI_CFLAGS
and LIBGNOMEKBDUI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
--" >&2;}
-- { (exit 1); exit 1; }; }
-+" "$LINENO" 5
- elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+ { { $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
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables LIBGNOMEKBDUI_CFLAGS
--and LIBGNOMEKBDUI_LIBS to avoid the need to call pkg-config.
--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
++" "$LINENO" 5
++elif test $pkg_failed = untried; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+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.
-@@ -19557,12 +16189,11 @@
+@@ -19549,12 +16184,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -18663,7 +18569,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -19570,55 +16201,59 @@
+@@ -19562,55 +16196,59 @@
@@ -18745,7 +18651,7 @@
fi
-@@ -19631,50 +16266,28 @@
+@@ -19623,25 +16261,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -18774,163 +18680,9 @@
$LIBEBOOK_PKG_ERRORS
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables LIBEBOOK_CFLAGS
--and LIBEBOOK_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&2;}
-- { (exit 1); exit 1; }; }
--elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$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
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-
+@@ -19651,22 +16278,11 @@
Alternatively, you may set the environment variables LIBEBOOK_CFLAGS
and LIBEBOOK_LIBS to avoid the need to call pkg-config.
- 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
-+" "$LINENO" 5
-+elif test $pkg_failed = untried; then
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+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.
-
-@@ -19683,17 +16296,14 @@
- 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; }
- else
- LIBEBOOK_CFLAGS=$pkg_cv_LIBEBOOK_CFLAGS
- LIBEBOOK_LIBS=$pkg_cv_LIBEBOOK_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_LIBEBOOK 1
--_ACEOF
-+$as_echo "#define HAVE_LIBEBOOK 1" >>confdefs.h
-
- fi
- fi
-@@ -19708,47 +16318,51 @@
-
-
- # Check whether --enable-hal was given.
--if test "${enable_hal+set}" = set; then
-+if test "${enable_hal+set}" = set; then :
- enableval=$enable_hal;
- fi
-
- if test "x$enable_hal" != "xno"; then
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for HAL" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HAL" >&5
- $as_echo_n "checking for HAL... " >&6; }
-
--if test -n "$HAL_CFLAGS"; then
-- pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$HAL_CFLAGS"; then
-+ pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32\""; } >&5
- ($PKG_CONFIG --exists --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32") 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_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$HAL_LIBS"; then
-- pkg_cv_HAL_LIBS="$HAL_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$HAL_LIBS"; then
-+ pkg_cv_HAL_LIBS="$HAL_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32\""; } >&5
- ($PKG_CONFIG --exists --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32") 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_HAL_LIBS=`$PKG_CONFIG --libs "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -19761,25 +16375,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32" 2>&1`
-+ HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32"`
- else
-- HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32" 2>&1`
-+ HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$HAL_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32) were not met:
--
--$HAL_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables HAL_CFLAGS
--and HAL_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements (hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32) were not met:
-+ as_fn_error "Package requirements (hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32) were not met:
-
- $HAL_PKG_ERRORS
-
-@@ -19789,22 +16392,11 @@
- Alternatively, you may set the environment variables HAL_CFLAGS
- and HAL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
@@ -18943,8 +18695,8 @@
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
--Alternatively, you may set the environment variables HAL_CFLAGS
--and HAL_LIBS to avoid the need to call pkg-config.
+-Alternatively, you may set the environment variables LIBEBOOK_CFLAGS
+-and LIBEBOOK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -18954,7 +18706,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -19813,17 +16405,14 @@
+@@ -19675,17 +16291,14 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -18962,20 +18714,20 @@
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
else
- HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
- HAL_LIBS=$pkg_cv_HAL_LIBS
+ LIBEBOOK_CFLAGS=$pkg_cv_LIBEBOOK_CFLAGS
+ LIBEBOOK_LIBS=$pkg_cv_LIBEBOOK_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 USE_HAL 1
+-#define HAVE_LIBEBOOK 1
-_ACEOF
-+$as_echo "#define USE_HAL 1" >>confdefs.h
-
- fi
-
-@@ -19833,9 +16422,9 @@
++$as_echo "#define HAVE_LIBEBOOK 1" >>confdefs.h
+
+ fi
+ fi
+@@ -19702,9 +16315,9 @@
# Extract the first word of "glib-genmarshal", so it can be a program name with args.
set dummy glib-genmarshal; ac_word=$2
@@ -18987,7 +18739,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -19848,14 +16437,14 @@
+@@ -19717,14 +16330,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19005,7 +18757,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GLIB_GENMARSHAL" && ac_cv_path_GLIB_GENMARSHAL="no"
-@@ -19864,19 +16453,17 @@
+@@ -19733,19 +16346,17 @@
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -19028,7 +18780,7 @@
fi
-@@ -19884,9 +16471,9 @@
+@@ -19753,9 +16364,9 @@
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -19040,7 +18792,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -19899,14 +16486,14 @@
+@@ -19768,14 +16379,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19058,7 +18810,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-@@ -19915,19 +16502,17 @@
+@@ -19784,19 +16395,17 @@
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -19081,7 +18833,7 @@
fi
-@@ -19939,13 +16524,13 @@
+@@ -19808,13 +16417,13 @@
# Check whether --with-gconf-source was given.
@@ -19097,7 +18849,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -19954,22 +16539,20 @@
+@@ -19823,22 +16432,20 @@
# Check whether --with-gconf-schema-file-dir was given.
@@ -19124,7 +18876,7 @@
esac
fi
-@@ -20002,9 +16585,9 @@
+@@ -19871,9 +16478,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
@@ -19136,7 +18888,7 @@
$as_echo_n "(cached) " >&6
else
case $UPDATE_MIME_DATABASE in
-@@ -20017,14 +16600,14 @@
+@@ -19886,14 +16493,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19154,7 +18906,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_UPDATE_MIME_DATABASE" && ac_cv_path_UPDATE_MIME_DATABASE="no"
-@@ -20033,17 +16616,17 @@
+@@ -19902,17 +16509,17 @@
fi
UPDATE_MIME_DATABASE=$ac_cv_path_UPDATE_MIME_DATABASE
if test -n "$UPDATE_MIME_DATABASE"; then
@@ -19175,7 +18927,7 @@
enableval=$enable_update_mimedb;
else
enable_update_mimedb=yes
-@@ -20089,13 +16672,13 @@
+@@ -19958,13 +16565,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -19191,7 +18943,7 @@
esac ;;
esac
done
-@@ -20103,8 +16686,8 @@
+@@ -19972,8 +16579,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -19202,7 +18954,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -20127,11 +16710,11 @@
+@@ -19996,11 +16603,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" &&
@@ -19216,7 +18968,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -20151,8 +16734,8 @@
+@@ -20020,8 +16627,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.
@@ -19227,7 +18979,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -20168,129 +16751,86 @@
+@@ -20037,129 +16644,86 @@
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -19397,7 +19149,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -20300,17 +16840,18 @@
+@@ -20169,17 +16733,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -19423,7 +19175,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -20318,23 +16859,15 @@
+@@ -20187,23 +16752,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -19452,7 +19204,7 @@
as_nl='
'
export as_nl
-@@ -20342,7 +16875,13 @@
+@@ -20211,7 +16768,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
@@ -19467,7 +19219,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -20353,7 +16892,7 @@
+@@ -20222,7 +16785,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -19476,7 +19228,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -20376,13 +16915,6 @@
+@@ -20245,13 +16808,6 @@
}
fi
@@ -19490,7 +19242,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -20392,15 +16924,15 @@
+@@ -20261,15 +16817,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -19509,7 +19261,7 @@
IFS=$as_save_IFS
;;
-@@ -20412,12 +16944,16 @@
+@@ -20281,12 +16837,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -19530,7 +19282,7 @@
done
PS1='$ '
PS2='> '
-@@ -20429,7 +16965,89 @@
+@@ -20298,7 +16858,89 @@
LANGUAGE=C
export LANGUAGE
@@ -19621,7 +19373,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -20443,8 +17061,12 @@
+@@ -20312,8 +16954,12 @@
as_basename=false
fi
@@ -19635,7 +19387,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -20464,76 +17086,25 @@
+@@ -20333,76 +16979,25 @@
}
s/.*/./; q'`
@@ -19723,7 +19475,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -20562,8 +17133,56 @@
+@@ -20431,8 +17026,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -19781,7 +19533,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -20582,10 +17201,10 @@
+@@ -20451,10 +17094,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -19794,7 +19546,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -20600,13 +17219,19 @@
+@@ -20469,13 +17112,19 @@
exec 6>&1
@@ -19810,13 +19562,13 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by gnome-control-center $as_me 2.28.0, which was
+ This file was extended by gnome-control-center $as_me 2.28.1, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -20638,10 +17263,11 @@
+@@ -20507,10 +17156,11 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -19831,7 +19583,7 @@
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
-@@ -20663,16 +17289,16 @@
+@@ -20532,16 +17182,16 @@
Configuration commands:
$config_commands
@@ -19841,7 +19593,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
- gnome-control-center config.status 2.28.0
+ gnome-control-center config.status 2.28.1
-configured by $0, generated by GNU Autoconf 2.63,
+configured by $0, generated by GNU Autoconf 2.64,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -19851,7 +19603,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -20715,20 +17341,19 @@
+@@ -20584,20 +17234,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -19876,7 +19628,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -20736,11 +17361,10 @@
+@@ -20605,11 +17254,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -19891,7 +19643,7 @@
ac_need_defaults=false ;;
esac
-@@ -21094,9 +17718,7 @@
+@@ -20963,9 +17611,7 @@
"typing-break/Makefile") CONFIG_FILES="$CONFIG_FILES typing-break/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -19902,7 +19654,7 @@
esac
done
-@@ -21123,7 +17745,7 @@
+@@ -20992,7 +17638,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -19911,7 +19663,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -21134,11 +17756,7 @@
+@@ -21003,11 +17649,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -19924,7 +19676,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -21146,10 +17764,16 @@
+@@ -21015,10 +17657,16 @@
if test -n "$CONFIG_FILES"; then
@@ -19943,7 +19695,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -21163,24 +17787,18 @@
+@@ -21032,24 +17680,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -19971,7 +19723,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -21269,9 +17887,7 @@
+@@ -21138,9 +17780,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -19982,7 +19734,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -21312,9 +17928,7 @@
+@@ -21181,9 +17821,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -19993,7 +19745,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -21399,9 +18013,7 @@
+@@ -21268,9 +17906,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -20004,7 +19756,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -21414,9 +18026,7 @@
+@@ -21283,9 +17919,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -20015,7 +19767,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -21444,12 +18054,10 @@
+@@ -21313,12 +17947,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -20030,7 +19782,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -21460,7 +18068,7 @@
+@@ -21329,7 +17961,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -20039,7 +19791,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -21473,9 +18081,7 @@
+@@ -21342,9 +17974,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -20050,7 +19802,7 @@
esac
;;
esac
-@@ -21503,47 +18109,7 @@
+@@ -21372,47 +18002,7 @@
q
}
s/.*/./; q'`
@@ -20099,7 +19851,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -21600,7 +18166,6 @@
+@@ -21469,7 +18059,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=
@@ -20107,7 +19859,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -21610,12 +18175,11 @@
+@@ -21479,12 +18068,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -20122,7 +19874,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
-@@ -21625,7 +18189,7 @@
+@@ -21494,7 +18082,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -20131,7 +19883,7 @@
esac
_ACEOF
-@@ -21654,14 +18218,12 @@
+@@ -21523,14 +18111,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -20148,7 +19900,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;}
-@@ -21671,9 +18233,7 @@
+@@ -21540,9 +18126,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -20159,7 +19911,7 @@
;;
:H)
#
-@@ -21684,25 +18244,19 @@
+@@ -21553,25 +18137,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -20189,7 +19941,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -21740,7 +18294,7 @@
+@@ -21609,7 +18187,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -20198,7 +19950,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -21835,47 +18389,7 @@
+@@ -21704,47 +18282,7 @@
q
}
s/.*/./; q'`
@@ -20247,7 +19999,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -22522,9 +19036,7 @@
+@@ -22391,9 +18929,7 @@
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -20258,7 +20010,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -22547,15 +19059,12 @@
+@@ -22416,15 +18952,12 @@
done # for ac_tag
@@ -20276,7 +20028,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -22576,10 +19085,10 @@
+@@ -22445,10 +18978,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.
@@ -20300,7 +20052,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -196,6 +198,7 @@
+@@ -194,6 +196,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20319,7 +20071,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -237,6 +239,7 @@
+@@ -235,6 +237,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20327,7 +20079,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -320,7 +323,7 @@
+@@ -318,7 +321,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -20459,7 +20211,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -252,6 +255,7 @@
+@@ -250,6 +253,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20467,7 +20219,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -336,7 +340,7 @@
+@@ -334,7 +338,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = po libwindow-settings capplets font-viewer help \
@@ -20500,7 +20252,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -221,6 +226,7 @@
+@@ -219,6 +224,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20508,7 +20260,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -304,9 +310,13 @@
+@@ -302,9 +308,13 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -20523,7 +20275,7 @@
$(GNOMECC_SHELL_CFLAGS)
gnome_control_center_SOURCES = \
-@@ -314,7 +324,7 @@
+@@ -312,7 +322,7 @@
gnome_control_center_LDADD = \
$(GNOMECC_SHELL_LIBS) \
@@ -20543,7 +20295,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -231,6 +233,7 @@
+@@ -229,6 +231,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20948,7 +20700,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -228,6 +230,7 @@
+@@ -226,6 +228,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21052,7 +20804,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -195,6 +197,7 @@
+@@ -193,6 +195,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21071,7 +20823,7 @@
FGREP = @FGREP@
FONT_CAPPLET_CFLAGS = @FONT_CAPPLET_CFLAGS@
FONT_CAPPLET_LIBS = @FONT_CAPPLET_LIBS@
-@@ -237,6 +239,7 @@
+@@ -235,6 +237,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
Modified: desktop/unstable/control-center/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/rules?rev=22043&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/rules [utf-8] (original)
+++ desktop/unstable/control-center/debian/rules [utf-8] Thu Oct 22 03:43:50 2009
@@ -7,7 +7,6 @@
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
-include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
GNOME_MODULE := gnome-control-center
More information about the pkg-gnome-commits
mailing list