r16388 - in /desktop/unstable/gnome-applets/debian: changelog control control.in patches/98_autoreconf.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Mon Jun 30 11:04:11 UTC 2008
Author: slomo
Date: Mon Jun 30 11:04:11 2008
New Revision: 16388
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16388
Log:
* New upstream bugfix release:
+ debian/patches/98_autoreconf.patch:
- Regenerated for the new version.
* debian/control.in:
+ Updated Standards-Version to 3.8.0, no additional changes needed.
Modified:
desktop/unstable/gnome-applets/debian/changelog
desktop/unstable/gnome-applets/debian/control
desktop/unstable/gnome-applets/debian/control.in
desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch
Modified: desktop/unstable/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/changelog?rev=16388&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/changelog (original)
+++ desktop/unstable/gnome-applets/debian/changelog Mon Jun 30 11:04:11 2008
@@ -1,8 +1,16 @@
-gnome-applets (2.22.2-2) UNRELEASED; urgency=low
-
+gnome-applets (2.22.3-1) unstable; urgency=low
+
+ [ Josselin Mouette ]
* Brown-paper bag re-enabling of liboobs support. Closes: #485740.
- -- Josselin Mouette <joss at debian.org> Mon, 30 Jun 2008 11:02:20 +0200
+ [ Sebastian Dröge ]
+ * New upstream bugfix release:
+ + debian/patches/98_autoreconf.patch:
+ - Regenerated for the new version.
+ * debian/control.in:
+ + Updated Standards-Version to 3.8.0, no additional changes needed.
+
+ -- Sebastian Dröge <slomo at debian.org> Mon, 30 Jun 2008 12:50:57 +0200
gnome-applets (2.22.2-1) unstable; urgency=low
Modified: desktop/unstable/gnome-applets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control?rev=16388&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control (original)
+++ desktop/unstable/gnome-applets/debian/control Mon Jun 30 11:04:11 2008
@@ -2,8 +2,8 @@
Section: gnome
Priority: optional
Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
-Standards-Version: 3.7.3
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
+Standards-Version: 3.8.0
Build-Depends: cdbs (>= 0.4.41),
autotools-dev,
debhelper (>= 5.0.13),
Modified: desktop/unstable/gnome-applets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control.in?rev=16388&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control.in (original)
+++ desktop/unstable/gnome-applets/debian/control.in Mon Jun 30 11:04:11 2008
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
Uploaders: @GNOME_TEAM@
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Build-Depends: cdbs (>= 0.4.41),
autotools-dev,
debhelper (>= 5.0.13),
Modified: desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch?rev=16388&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch (original)
+++ desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch Mon Jun 30 11:04:11 2008
@@ -1,6 +1,6 @@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/accessx-status/docs/Makefile.in gnome-applets-2.22.2/accessx-status/docs/Makefile.in
---- gnome-applets-2.22.2.old/accessx-status/docs/Makefile.in 2008-05-28 04:59:04.000000000 +0200
-+++ gnome-applets-2.22.2/accessx-status/docs/Makefile.in 2008-06-02 14:54:03.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/accessx-status/docs/Makefile.in gnome-applets-2.22.3/accessx-status/docs/Makefile.in
+--- gnome-applets-2.22.3.old/accessx-status/docs/Makefile.in 2008-06-30 11:29:36.000000000 +0200
++++ gnome-applets-2.22.3/accessx-status/docs/Makefile.in 2008-06-30 12:57:41.000000000 +0200
@@ -62,7 +62,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -35,9 +35,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/accessx-status/Makefile.in gnome-applets-2.22.2/accessx-status/Makefile.in
---- gnome-applets-2.22.2.old/accessx-status/Makefile.in 2008-05-28 04:59:04.000000000 +0200
-+++ gnome-applets-2.22.2/accessx-status/Makefile.in 2008-06-02 14:54:03.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/accessx-status/Makefile.in gnome-applets-2.22.3/accessx-status/Makefile.in
+--- gnome-applets-2.22.3.old/accessx-status/Makefile.in 2008-06-30 11:29:36.000000000 +0200
++++ gnome-applets-2.22.3/accessx-status/Makefile.in 2008-06-30 12:57:41.000000000 +0200
@@ -41,7 +41,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -72,9 +72,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = docs pixmaps
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/accessx-status/pixmaps/Makefile.in gnome-applets-2.22.2/accessx-status/pixmaps/Makefile.in
---- gnome-applets-2.22.2.old/accessx-status/pixmaps/Makefile.in 2008-05-28 04:59:04.000000000 +0200
-+++ gnome-applets-2.22.2/accessx-status/pixmaps/Makefile.in 2008-06-02 14:54:03.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/accessx-status/pixmaps/Makefile.in gnome-applets-2.22.3/accessx-status/pixmaps/Makefile.in
+--- gnome-applets-2.22.3.old/accessx-status/pixmaps/Makefile.in 2008-06-30 11:29:36.000000000 +0200
++++ gnome-applets-2.22.3/accessx-status/pixmaps/Makefile.in 2008-06-30 12:57:42.000000000 +0200
@@ -38,7 +38,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -109,9 +109,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
accessx_status_iconsdir = $(iconsdir)/hicolor/48x48/apps
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/aclocal.m4 gnome-applets-2.22.2/aclocal.m4
---- gnome-applets-2.22.2.old/aclocal.m4 2008-05-28 04:59:01.000000000 +0200
-+++ gnome-applets-2.22.2/aclocal.m4 2008-06-02 14:53:57.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/aclocal.m4 gnome-applets-2.22.3/aclocal.m4
+--- gnome-applets-2.22.3.old/aclocal.m4 2008-06-30 11:29:33.000000000 +0200
++++ gnome-applets-2.22.3/aclocal.m4 2008-06-30 12:57:24.000000000 +0200
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -137,9 +137,9 @@
m4_include([m4/intltool.m4])
m4_include([m4/python.m4])
-m4_include([m4/system-tools-backends.m4])
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/battstat/apmlib/Makefile.in gnome-applets-2.22.2/battstat/apmlib/Makefile.in
---- gnome-applets-2.22.2.old/battstat/apmlib/Makefile.in 2008-05-28 04:59:04.000000000 +0200
-+++ gnome-applets-2.22.2/battstat/apmlib/Makefile.in 2008-06-02 14:54:04.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/battstat/apmlib/Makefile.in gnome-applets-2.22.3/battstat/apmlib/Makefile.in
+--- gnome-applets-2.22.3.old/battstat/apmlib/Makefile.in 2008-06-30 11:29:36.000000000 +0200
++++ gnome-applets-2.22.3/battstat/apmlib/Makefile.in 2008-06-30 12:57:45.000000000 +0200
@@ -44,7 +44,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -174,9 +174,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
INCLUDES = \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/battstat/docs/Makefile.in gnome-applets-2.22.2/battstat/docs/Makefile.in
---- gnome-applets-2.22.2.old/battstat/docs/Makefile.in 2008-05-28 04:59:04.000000000 +0200
-+++ gnome-applets-2.22.2/battstat/docs/Makefile.in 2008-06-02 14:54:04.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/battstat/docs/Makefile.in gnome-applets-2.22.3/battstat/docs/Makefile.in
+--- gnome-applets-2.22.3.old/battstat/docs/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/battstat/docs/Makefile.in 2008-06-30 12:57:45.000000000 +0200
@@ -62,7 +62,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -211,9 +211,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/battstat/Makefile.in gnome-applets-2.22.2/battstat/Makefile.in
---- gnome-applets-2.22.2.old/battstat/Makefile.in 2008-05-28 04:59:04.000000000 +0200
-+++ gnome-applets-2.22.2/battstat/Makefile.in 2008-06-02 14:54:03.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/battstat/Makefile.in gnome-applets-2.22.3/battstat/Makefile.in
+--- gnome-applets-2.22.3.old/battstat/Makefile.in 2008-06-30 11:29:36.000000000 +0200
++++ gnome-applets-2.22.3/battstat/Makefile.in 2008-06-30 12:57:44.000000000 +0200
@@ -40,7 +40,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -248,9 +248,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
glade_DATA = battstat_applet.glade
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/battstat/sounds/Makefile.in gnome-applets-2.22.2/battstat/sounds/Makefile.in
---- gnome-applets-2.22.2.old/battstat/sounds/Makefile.in 2008-05-28 04:59:04.000000000 +0200
-+++ gnome-applets-2.22.2/battstat/sounds/Makefile.in 2008-06-02 14:54:04.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/battstat/sounds/Makefile.in gnome-applets-2.22.3/battstat/sounds/Makefile.in
+--- gnome-applets-2.22.3.old/battstat/sounds/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/battstat/sounds/Makefile.in 2008-06-30 12:57:46.000000000 +0200
@@ -38,7 +38,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -285,9 +285,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
soundlistdir = $(sysconfdir)/sound/events
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/charpick/help/Makefile.in gnome-applets-2.22.2/charpick/help/Makefile.in
---- gnome-applets-2.22.2.old/charpick/help/Makefile.in 2008-05-28 04:59:05.000000000 +0200
-+++ gnome-applets-2.22.2/charpick/help/Makefile.in 2008-06-02 14:54:04.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/charpick/help/Makefile.in gnome-applets-2.22.3/charpick/help/Makefile.in
+--- gnome-applets-2.22.3.old/charpick/help/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/charpick/help/Makefile.in 2008-06-30 12:57:48.000000000 +0200
@@ -62,7 +62,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -322,9 +322,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/charpick/Makefile.in gnome-applets-2.22.2/charpick/Makefile.in
---- gnome-applets-2.22.2.old/charpick/Makefile.in 2008-05-28 04:59:05.000000000 +0200
-+++ gnome-applets-2.22.2/charpick/Makefile.in 2008-06-02 14:54:04.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/charpick/Makefile.in gnome-applets-2.22.3/charpick/Makefile.in
+--- gnome-applets-2.22.3.old/charpick/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/charpick/Makefile.in 2008-06-30 12:57:47.000000000 +0200
@@ -40,7 +40,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -359,9 +359,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = help
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/config.h.in gnome-applets-2.22.2/config.h.in
---- gnome-applets-2.22.2.old/config.h.in 2008-05-28 04:59:04.000000000 +0200
-+++ gnome-applets-2.22.2/config.h.in 2008-06-02 14:54:02.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/config.h.in gnome-applets-2.22.3/config.h.in
+--- gnome-applets-2.22.3.old/config.h.in 2008-06-30 11:29:36.000000000 +0200
++++ gnome-applets-2.22.3/config.h.in 2008-06-30 12:57:35.000000000 +0200
@@ -135,15 +135,9 @@
/* install prefix */
#undef PREFIX
@@ -378,14 +378,14 @@
/* sysconfdir */
#undef SYSCONFDIR
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/configure gnome-applets-2.22.2/configure
---- gnome-applets-2.22.2.old/configure 2008-05-28 04:59:03.000000000 +0200
-+++ gnome-applets-2.22.2/configure 2008-06-02 14:54:01.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/configure gnome-applets-2.22.3/configure
+--- gnome-applets-2.22.3.old/configure 2008-06-30 11:29:35.000000000 +0200
++++ gnome-applets-2.22.3/configure 2008-06-30 12:57:33.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.61 for gnome-applets 2.22.2.
-+# Generated by GNU Autoconf 2.62 for gnome-applets 2.22.2.
+-# Generated by GNU Autoconf 2.61 for gnome-applets 2.22.3.
++# Generated by GNU Autoconf 2.62 for gnome-applets 2.22.3.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -634,6 +634,26 @@
mkdir_p
AWK
SET_MAKE
+@@ -828,6 +851,9 @@
+ MAINTAINER_MODE_TRUE
+ MAINTAINER_MODE_FALSE
+ MAINT
++INTLTOOL_UPDATE
++INTLTOOL_MERGE
++INTLTOOL_EXTRACT
+ INTLTOOL_DESKTOP_RULE
+ INTLTOOL_DIRECTORY_RULE
+ INTLTOOL_KEYS_RULE
+@@ -850,9 +876,6 @@
+ XGETTEXT
+ MSGMERGE
+ MSGFMT
+-INTLTOOL_EXTRACT
+-INTLTOOL_MERGE
+-INTLTOOL_UPDATE
+ INTLTOOL_PERL
+ ALL_LINGUAS
+ CC
@@ -1029,8 +1052,7 @@
HAVE_XKB
APPLET_ACCESSX_TRUE
@@ -1040,7 +1060,7 @@
@@ -1904,10 +2017,10 @@
if $ac_init_version; then
cat <<\_ACEOF
- gnome-applets configure 2.22.2
+ gnome-applets configure 2.22.3
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.62
@@ -1053,7 +1073,7 @@
@@ -1918,7 +2031,7 @@
running configure, to aid debugging if configure makes a mistake.
- It was created by gnome-applets $as_me 2.22.2, which was
+ It was created by gnome-applets $as_me 2.22.3, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+generated by GNU Autoconf 2.62. Invocation command line was
@@ -2438,7 +2458,7 @@
{ (exit 1); exit 1; }; }
;;
*)
-@@ -3910,18 +4060,18 @@
+@@ -3910,18 +4060,144 @@
esac
if test -n "0.35.0"; then
@@ -2448,8 +2468,10 @@
+$as_echo_n "checking for intltool >= 0.35.0... " >&6; }
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
- INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
+- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
+- INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
++ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
++ INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
-echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
@@ -2460,10 +2482,136 @@
-echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}
+ { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5
+$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++# Extract the first word of "intltool-update", so it can be a program name with args.
++set dummy intltool-update; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
++ $as_echo_n "(cached) " >&6
++else
++ case $INTLTOOL_UPDATE in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
++if test -n "$INTLTOOL_UPDATE"; then
++ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
++$as_echo "$INTLTOOL_UPDATE" >&6; }
++else
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++# Extract the first word of "intltool-merge", so it can be a program name with args.
++set dummy intltool-merge; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
++ $as_echo_n "(cached) " >&6
++else
++ case $INTLTOOL_MERGE in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
++if test -n "$INTLTOOL_MERGE"; then
++ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
++$as_echo "$INTLTOOL_MERGE" >&6; }
++else
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++# Extract the first word of "intltool-extract", so it can be a program name with args.
++set dummy intltool-extract; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
++ $as_echo_n "(cached) " >&6
++else
++ case $INTLTOOL_EXTRACT in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
++if test -n "$INTLTOOL_EXTRACT"; then
++ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
++$as_echo "$INTLTOOL_EXTRACT" >&6; }
++else
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
++ { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
++$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
{ (exit 1); exit 1; }; }
fi
-@@ -3968,10 +4118,10 @@
+@@ -3968,10 +4244,10 @@
# 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
@@ -2477,7 +2625,7 @@
else
case $XGETTEXT in
[\\/]* | ?:[\\/]*)
-@@ -3986,7 +4136,7 @@
+@@ -3986,7 +4262,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
@@ -2486,7 +2634,7 @@
break 2
fi
done
-@@ -3998,20 +4148,20 @@
+@@ -3998,20 +4274,20 @@
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -2514,7 +2662,7 @@
else
case $MSGMERGE in
[\\/]* | ?:[\\/]*)
-@@ -4026,7 +4176,7 @@
+@@ -4026,7 +4302,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
@@ -2523,7 +2671,7 @@
break 2
fi
done
-@@ -4038,20 +4188,20 @@
+@@ -4038,20 +4314,20 @@
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -2551,7 +2699,7 @@
else
case $MSGFMT in
[\\/]* | ?:[\\/]*)
-@@ -4066,7 +4216,7 @@
+@@ -4066,7 +4342,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
@@ -2560,7 +2708,7 @@
break 2
fi
done
-@@ -4078,25 +4228,25 @@
+@@ -4078,42 +4354,34 @@
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -2594,8 +2742,14 @@
{ (exit 1); exit 1; }; }
fi
-@@ -4110,10 +4260,10 @@
-
+-# Use the tools built into the package, not the ones that are installed.
+-INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
+-
+-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
+-
+-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
+-
+-
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -2608,7 +2762,7 @@
else
case $INTLTOOL_PERL in
[\\/]* | ?:[\\/]*)
-@@ -4128,7 +4278,7 @@
+@@ -4128,7 +4396,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
@@ -2617,7 +2771,7 @@
break 2
fi
done
-@@ -4140,33 +4290,33 @@
+@@ -4140,33 +4408,33 @@
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -2665,7 +2819,7 @@
{ (exit 1); exit 1; }; }
fi
fi
-@@ -4199,29 +4349,32 @@
+@@ -4199,29 +4467,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2706,7 +2860,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -4274,31 +4427,35 @@
+@@ -4274,31 +4545,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2749,7 +2903,7 @@
if test $ac_cv_func_bind_textdomain_codeset = yes; then
DATADIRNAME=share
else
-@@ -4312,6 +4469,7 @@
+@@ -4312,6 +4587,7 @@
esac
fi
@@ -2757,7 +2911,17 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -4330,10 +4488,10 @@
+@@ -4320,20 +4596,16 @@
+
+
+
+-ac_config_commands="$ac_config_commands intltool"
+-
+-
+-
+
+
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
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
@@ -2771,7 +2935,7 @@
else
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
-@@ -4348,7 +4506,7 @@
+@@ -4348,7 +4620,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
@@ -2780,7 +2944,7 @@
break 2
fi
done
-@@ -4360,11 +4518,11 @@
+@@ -4360,11 +4632,11 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -2796,7 +2960,7 @@
fi
-@@ -4373,10 +4531,10 @@
+@@ -4373,10 +4645,10 @@
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
@@ -2810,7 +2974,7 @@
else
case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
-@@ -4391,7 +4549,7 @@
+@@ -4391,7 +4663,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
@@ -2819,7 +2983,7 @@
break 2
fi
done
-@@ -4403,11 +4561,11 @@
+@@ -4403,11 +4675,11 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -2835,7 +2999,7 @@
fi
if test "x$ac_pt_PKG_CONFIG" = x; then
-@@ -4415,10 +4573,10 @@
+@@ -4415,10 +4687,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2848,7 +3012,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -4432,14 +4590,14 @@
+@@ -4432,14 +4704,14 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.19
@@ -2869,7 +3033,7 @@
PKG_CONFIG=""
fi
-@@ -4453,10 +4611,10 @@
+@@ -4453,10 +4725,10 @@
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
@@ -2883,7 +3047,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4469,7 +4627,7 @@
+@@ -4469,7 +4741,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
@@ -2892,7 +3056,7 @@
break 2
fi
done
-@@ -4480,11 +4638,11 @@
+@@ -4480,11 +4752,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2908,7 +3072,7 @@
fi
-@@ -4493,10 +4651,10 @@
+@@ -4493,10 +4765,10 @@
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
@@ -2922,7 +3086,7 @@
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -4509,7 +4667,7 @@
+@@ -4509,7 +4781,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
@@ -2931,7 +3095,7 @@
break 2
fi
done
-@@ -4520,11 +4678,11 @@
+@@ -4520,11 +4792,11 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -2947,7 +3111,7 @@
fi
if test "x$ac_ct_CC" = x; then
-@@ -4532,10 +4690,10 @@
+@@ -4532,10 +4804,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2960,7 +3124,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -4550,10 +4708,10 @@
+@@ -4550,10 +4822,10 @@
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
@@ -2974,7 +3138,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4566,7 +4724,7 @@
+@@ -4566,7 +4838,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
@@ -2983,7 +3147,7 @@
break 2
fi
done
-@@ -4577,11 +4735,11 @@
+@@ -4577,11 +4849,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2999,7 +3163,7 @@
fi
-@@ -4590,10 +4748,10 @@
+@@ -4590,10 +4862,10 @@
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
@@ -3013,7 +3177,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4611,7 +4769,7 @@
+@@ -4611,7 +4883,7 @@
continue
fi
ac_cv_prog_CC="cc"
@@ -3022,7 +3186,7 @@
break 2
fi
done
-@@ -4634,11 +4792,11 @@
+@@ -4634,11 +4906,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -3038,7 +3202,7 @@
fi
-@@ -4649,10 +4807,10 @@
+@@ -4649,10 +4921,10 @@
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
@@ -3052,7 +3216,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4665,7 +4823,7 @@
+@@ -4665,7 +4937,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
@@ -3061,7 +3225,7 @@
break 2
fi
done
-@@ -4676,11 +4834,11 @@
+@@ -4676,11 +4948,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -3077,7 +3241,7 @@
fi
-@@ -4693,10 +4851,10 @@
+@@ -4693,10 +4965,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -3091,7 +3255,7 @@
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -4709,7 +4867,7 @@
+@@ -4709,7 +4981,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
@@ -3100,7 +3264,7 @@
break 2
fi
done
-@@ -4720,11 +4878,11 @@
+@@ -4720,11 +4992,11 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -3116,7 +3280,7 @@
fi
-@@ -4736,10 +4894,10 @@
+@@ -4736,10 +5008,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3129,7 +3293,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -4751,50 +4909,54 @@
+@@ -4751,50 +5023,54 @@
fi
@@ -3197,7 +3361,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -4820,20 +4982,21 @@
+@@ -4820,20 +5096,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3222,7 +3386,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
-@@ -4843,15 +5006,19 @@
+@@ -4843,15 +5120,19 @@
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -3248,7 +3412,7 @@
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
-@@ -4878,20 +5045,21 @@
+@@ -4878,20 +5159,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3273,7 +3437,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
CFLAGS=""
-@@ -4916,20 +5084,21 @@
+@@ -4916,20 +5198,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3298,7 +3462,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -4955,20 +5124,21 @@
+@@ -4955,20 +5238,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3323,7 +3487,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -4983,8 +5153,8 @@
+@@ -4983,8 +5267,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
@@ -3334,7 +3498,7 @@
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
-@@ -5000,10 +5170,10 @@
+@@ -5000,10 +5284,10 @@
CFLAGS=
fi
fi
@@ -3348,7 +3512,7 @@
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-@@ -5074,20 +5244,21 @@
+@@ -5074,20 +5358,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3373,7 +3537,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -5103,15 +5274,15 @@
+@@ -5103,15 +5388,15 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -3395,7 +3559,7 @@
esac
-@@ -5123,10 +5294,10 @@
+@@ -5123,10 +5408,10 @@
depcc="$CC" am_compiler_list=
@@ -3409,7 +3573,7 @@
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
-@@ -5214,8 +5385,8 @@
+@@ -5214,8 +5499,8 @@
fi
fi
@@ -3420,7 +3584,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
if
-@@ -5229,10 +5400,10 @@
+@@ -5229,10 +5514,10 @@
fi
@@ -3434,7 +3598,7 @@
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
-@@ -5270,26 +5441,30 @@
+@@ -5270,26 +5555,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3470,7 +3634,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_strerror+set}" = set; then
-@@ -5304,8 +5479,8 @@
+@@ -5304,8 +5593,8 @@
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
@@ -3481,7 +3645,7 @@
ac_res=$ac_cv_search_strerror
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -5317,15 +5492,15 @@
+@@ -5317,15 +5606,15 @@
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
@@ -3500,7 +3664,7 @@
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -5357,20 +5532,21 @@
+@@ -5357,20 +5646,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3525,7 +3689,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
-@@ -5394,13 +5570,14 @@
+@@ -5394,13 +5684,14 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3542,7 +3706,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -5408,7 +5585,7 @@
+@@ -5408,7 +5699,7 @@
# Broken: success on invalid input.
continue
else
@@ -3551,7 +3715,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
-@@ -5433,8 +5610,8 @@
+@@ -5433,8 +5724,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -3562,7 +3726,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -5462,20 +5639,21 @@
+@@ -5462,20 +5753,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3587,7 +3751,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
-@@ -5499,13 +5677,14 @@
+@@ -5499,13 +5791,14 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3604,7 +3768,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -5513,7 +5692,7 @@
+@@ -5513,7 +5806,7 @@
# Broken: success on invalid input.
continue
else
@@ -3613,7 +3777,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
-@@ -5529,9 +5708,9 @@
+@@ -5529,9 +5822,9 @@
if $ac_preproc_ok; then
:
else
@@ -3625,21 +3789,21 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
-@@ -5543,42 +5722,37 @@
+@@ -5543,42 +5836,37 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
--if test "${ac_cv_path_GREP+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
++$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+ if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
- if test "${ac_cv_path_GREP+set}" = set; then
+-if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
@@ -3680,7 +3844,7 @@
"$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
ac_count=`expr $ac_count + 1`
-@@ -5593,74 +5767,60 @@
+@@ -5593,74 +5881,60 @@
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
@@ -3775,7 +3939,7 @@
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
-@@ -5675,40 +5835,31 @@
+@@ -5675,40 +5949,31 @@
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
@@ -3827,7 +3991,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -5735,20 +5886,21 @@
+@@ -5735,20 +6000,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3852,7 +4016,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_stdc=no
-@@ -5840,37 +5992,40 @@
+@@ -5840,37 +6106,40 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3901,7 +4065,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -5953,34 +6108,34 @@
+@@ -5953,34 +6222,34 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -3949,7 +4113,7 @@
{ (exit 1); exit 1; }; };;
esac
build=$ac_cv_build
-@@ -5997,27 +6152,27 @@
+@@ -5997,27 +6266,27 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -3986,7 +4150,7 @@
{ (exit 1); exit 1; }; };;
esac
host=$ac_cv_host
-@@ -6034,10 +6189,10 @@
+@@ -6034,10 +6303,10 @@
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -4000,7 +4164,7 @@
else
# Loop through the user's path and test for sed and gsed.
# Then use that list of sed's as ones to test for truncation.
-@@ -6090,8 +6245,8 @@
+@@ -6090,8 +6359,8 @@
SED=$lt_cv_path_SED
@@ -4011,7 +4175,7 @@
# Check whether --with-gnu-ld was given.
-@@ -6104,8 +6259,8 @@
+@@ -6104,8 +6373,8 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -4022,7 +4186,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -6134,14 +6289,14 @@
+@@ -6134,14 +6403,14 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -4042,7 +4206,7 @@
else
if test -z "$LD"; then
lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -6171,19 +6326,19 @@
+@@ -6171,19 +6440,19 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -4071,7 +4235,7 @@
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
-@@ -6195,20 +6350,20 @@
+@@ -6195,20 +6464,20 @@
;;
esac
fi
@@ -4099,7 +4263,7 @@
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
"" | " "*) ;;
-@@ -6225,10 +6380,10 @@
+@@ -6225,10 +6494,10 @@
;;
esac
@@ -4113,7 +4277,7 @@
else
if test -n "$NM"; then
# Let the user override the test.
-@@ -6274,25 +6429,25 @@
+@@ -6274,25 +6543,25 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi
fi
@@ -4150,7 +4314,7 @@
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
-@@ -6475,8 +6630,8 @@
+@@ -6475,8 +6744,8 @@
esac
fi
@@ -4161,7 +4325,7 @@
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -6509,7 +6664,7 @@
+@@ -6509,7 +6778,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4170,12 +4334,12 @@
(exit $ac_status); }; then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
-@@ -6524,11 +6679,11 @@
+@@ -6524,11 +6793,11 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6527 "configure"' > conftest.$ac_ext
-+ echo '#line 6682 "configure"' > conftest.$ac_ext
++ echo '#line 6796 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4184,7 +4348,7 @@
(exit $ac_status); }; then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
-@@ -6566,7 +6721,7 @@
+@@ -6566,7 +6835,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4193,7 +4357,7 @@
(exit $ac_status); }; then
case `/usr/bin/file conftest.o` in
*32-bit*)
-@@ -6616,10 +6771,10 @@
+@@ -6616,10 +6885,10 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -4207,7 +4371,7 @@
else
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -6648,26 +6803,30 @@
+@@ -6648,26 +6917,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4243,7 +4407,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
-@@ -6677,8 +6836,8 @@
+@@ -6677,8 +6950,8 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -4254,7 +4418,7 @@
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
CFLAGS="$SAVE_CFLAGS"
-@@ -6690,7 +6849,7 @@
+@@ -6690,7 +6963,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4263,7 +4427,7 @@
(exit $ac_status); }; then
case `/usr/bin/file conftest.o` in
*64-bit*)
-@@ -6727,11 +6886,11 @@
+@@ -6727,11 +7000,11 @@
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
do
@@ -4279,7 +4443,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6749,20 +6908,21 @@
+@@ -6749,20 +7022,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4304,7 +4468,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
-@@ -6770,12 +6930,14 @@
+@@ -6770,12 +7044,14 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -4324,7 +4488,7 @@
_ACEOF
fi
-@@ -6786,20 +6948,21 @@
+@@ -6786,20 +7062,21 @@
for ac_header in dlfcn.h
do
@@ -4355,7 +4519,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -6815,32 +6978,33 @@
+@@ -6815,32 +7092,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4396,7 +4560,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -6854,69 +7018,72 @@
+@@ -6854,69 +7132,72 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4498,7 +4662,7 @@
_ACEOF
fi
-@@ -6937,10 +7104,10 @@
+@@ -6937,10 +7218,10 @@
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
@@ -4512,7 +4676,7 @@
else
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
-@@ -6953,7 +7120,7 @@
+@@ -6953,7 +7234,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
@@ -4521,7 +4685,7 @@
break 2
fi
done
-@@ -6964,11 +7131,11 @@
+@@ -6964,11 +7245,11 @@
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
@@ -4537,7 +4701,7 @@
fi
-@@ -6981,10 +7148,10 @@
+@@ -6981,10 +7262,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -4551,7 +4715,7 @@
else
if test -n "$ac_ct_CXX"; then
ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-@@ -6997,7 +7164,7 @@
+@@ -6997,7 +7278,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
@@ -4560,7 +4724,7 @@
break 2
fi
done
-@@ -7008,11 +7175,11 @@
+@@ -7008,11 +7289,11 @@
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
@@ -4576,7 +4740,7 @@
fi
-@@ -7024,10 +7191,10 @@
+@@ -7024,10 +7305,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4589,7 +4753,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -7039,43 +7206,47 @@
+@@ -7039,43 +7320,47 @@
fi
fi
# Provide some information about the compiler.
@@ -4648,7 +4812,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -7101,20 +7272,21 @@
+@@ -7101,20 +7386,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4673,7 +4837,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
-@@ -7124,15 +7296,19 @@
+@@ -7124,15 +7410,19 @@
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
@@ -4699,7 +4863,7 @@
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
ac_cxx_werror_flag=yes
-@@ -7159,20 +7335,21 @@
+@@ -7159,20 +7449,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4724,7 +4888,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
CXXFLAGS=""
-@@ -7197,20 +7374,21 @@
+@@ -7197,20 +7488,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4749,7 +4913,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-@@ -7236,20 +7414,21 @@
+@@ -7236,20 +7528,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4774,7 +4938,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -7264,8 +7443,8 @@
+@@ -7264,8 +7557,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
fi
@@ -4785,7 +4949,7 @@
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
-@@ -7289,10 +7468,10 @@
+@@ -7289,10 +7582,10 @@
depcc="$CXX" am_compiler_list=
@@ -4799,7 +4963,7 @@
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
-@@ -7380,8 +7559,8 @@
+@@ -7380,8 +7673,8 @@
fi
fi
@@ -4810,7 +4974,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
if
-@@ -7405,11 +7584,11 @@
+@@ -7405,11 +7698,11 @@
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
@@ -4825,7 +4989,7 @@
else
# Double quotes because CXXCPP needs to be expanded
for CXXCPP in "$CXX -E" "/lib/cpp"
-@@ -7441,20 +7620,21 @@
+@@ -7441,20 +7734,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4850,7 +5014,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
-@@ -7478,13 +7658,14 @@
+@@ -7478,13 +7772,14 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4867,7 +5031,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
-@@ -7492,7 +7673,7 @@
+@@ -7492,7 +7787,7 @@
# Broken: success on invalid input.
continue
else
@@ -4876,7 +5040,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
-@@ -7517,8 +7698,8 @@
+@@ -7517,8 +7812,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -4887,7 +5051,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -7546,20 +7727,21 @@
+@@ -7546,20 +7841,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4912,7 +5076,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
-@@ -7583,13 +7765,14 @@
+@@ -7583,13 +7879,14 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4929,7 +5093,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
-@@ -7597,7 +7780,7 @@
+@@ -7597,7 +7894,7 @@
# Broken: success on invalid input.
continue
else
@@ -4938,7 +5102,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
-@@ -7613,9 +7796,9 @@
+@@ -7613,9 +7910,9 @@
if $ac_preproc_ok; then
:
else
@@ -4950,7 +5114,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
-@@ -7638,10 +7821,10 @@
+@@ -7638,10 +7935,10 @@
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
@@ -4964,7 +5128,7 @@
else
if test -n "$F77"; then
ac_cv_prog_F77="$F77" # Let the user override the test.
-@@ -7654,7 +7837,7 @@
+@@ -7654,7 +7951,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
@@ -4973,7 +5137,7 @@
break 2
fi
done
-@@ -7665,11 +7848,11 @@
+@@ -7665,11 +7962,11 @@
fi
F77=$ac_cv_prog_F77
if test -n "$F77"; then
@@ -4989,7 +5153,7 @@
fi
-@@ -7682,10 +7865,10 @@
+@@ -7682,10 +7979,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -5003,7 +5167,7 @@
else
if test -n "$ac_ct_F77"; then
ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-@@ -7698,7 +7881,7 @@
+@@ -7698,7 +7995,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_F77="$ac_prog"
@@ -5012,7 +5176,7 @@
break 2
fi
done
-@@ -7709,11 +7892,11 @@
+@@ -7709,11 +8006,11 @@
fi
ac_ct_F77=$ac_cv_prog_ac_ct_F77
if test -n "$ac_ct_F77"; then
@@ -5028,7 +5192,7 @@
fi
-@@ -7725,10 +7908,10 @@
+@@ -7725,10 +8022,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5041,7 +5205,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -7739,37 +7922,41 @@
+@@ -7739,37 +8036,41 @@
# Provide some information about the compiler.
@@ -5091,7 +5255,7 @@
(exit $ac_status); }
rm -f a.out
-@@ -7777,10 +7964,10 @@
+@@ -7777,10 +8078,10 @@
# input file. (Note that this only needs to work for GNU compilers.)
ac_save_ext=$ac_ext
ac_ext=F
@@ -5105,7 +5269,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
program main
-@@ -7796,20 +7983,21 @@
+@@ -7796,20 +8097,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5130,7 +5294,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
-@@ -7819,16 +8007,16 @@
+@@ -7819,16 +8121,16 @@
ac_cv_f77_compiler_gnu=$ac_compiler_gnu
fi
@@ -5152,7 +5316,7 @@
else
FFLAGS=-g
cat >conftest.$ac_ext <<_ACEOF
-@@ -7842,20 +8030,21 @@
+@@ -7842,20 +8144,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5177,7 +5341,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_prog_f77_g=no
-@@ -7864,8 +8053,8 @@
+@@ -7864,8 +8167,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -5188,7 +5352,7 @@
if test "$ac_test_FFLAGS" = set; then
FFLAGS=$ac_save_FFLAGS
elif test $ac_cv_prog_f77_g = yes; then
-@@ -7882,7 +8071,11 @@
+@@ -7882,7 +8185,11 @@
fi
fi
@@ -5201,7 +5365,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7893,10 +8086,10 @@
+@@ -7893,10 +8200,10 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
@@ -5215,7 +5379,7 @@
else
i=0
teststring="ABCD"
-@@ -8005,11 +8198,11 @@
+@@ -8005,11 +8312,11 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -5231,7 +5395,7 @@
fi
-@@ -8017,10 +8210,10 @@
+@@ -8017,10 +8324,10 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -5245,7 +5409,7 @@
else
# These are sane defaults that work on at least a few old systems.
-@@ -8125,14 +8318,14 @@
+@@ -8125,14 +8432,14 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5262,7 +5426,7 @@
(exit $ac_status); } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
-@@ -8187,7 +8380,7 @@
+@@ -8187,7 +8494,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
@@ -5271,7 +5435,7 @@
(exit $ac_status); } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
-@@ -8222,17 +8415,17 @@
+@@ -8222,17 +8529,17 @@
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
@@ -5296,7 +5460,7 @@
else
rm -f .libs 2>/dev/null
mkdir .libs 2>/dev/null
-@@ -8244,8 +8437,8 @@
+@@ -8244,8 +8551,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -5307,7 +5471,7 @@
objdir=$lt_cv_objdir
-@@ -8296,10 +8489,10 @@
+@@ -8296,10 +8603,10 @@
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
@@ -5321,7 +5485,7 @@
else
if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
-@@ -8312,7 +8505,7 @@
+@@ -8312,7 +8619,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
@@ -5330,7 +5494,7 @@
break 2
fi
done
-@@ -8323,11 +8516,11 @@
+@@ -8323,11 +8630,11 @@
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
@@ -5346,7 +5510,7 @@
fi
-@@ -8336,10 +8529,10 @@
+@@ -8336,10 +8643,10 @@
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
@@ -5360,7 +5524,7 @@
else
if test -n "$ac_ct_AR"; then
ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-@@ -8352,7 +8545,7 @@
+@@ -8352,7 +8659,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AR="ar"
@@ -5369,7 +5533,7 @@
break 2
fi
done
-@@ -8363,11 +8556,11 @@
+@@ -8363,11 +8670,11 @@
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
if test -n "$ac_ct_AR"; then
@@ -5385,7 +5549,7 @@
fi
if test "x$ac_ct_AR" = x; then
-@@ -8375,10 +8568,10 @@
+@@ -8375,10 +8682,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5398,7 +5562,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -8392,10 +8585,10 @@
+@@ -8392,10 +8699,10 @@
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
@@ -5412,7 +5576,7 @@
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-@@ -8408,7 +8601,7 @@
+@@ -8408,7 +8715,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
@@ -5421,7 +5585,7 @@
break 2
fi
done
-@@ -8419,11 +8612,11 @@
+@@ -8419,11 +8726,11 @@
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
@@ -5437,7 +5601,7 @@
fi
-@@ -8432,10 +8625,10 @@
+@@ -8432,10 +8739,10 @@
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
@@ -5451,7 +5615,7 @@
else
if test -n "$ac_ct_RANLIB"; then
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-@@ -8448,7 +8641,7 @@
+@@ -8448,7 +8755,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
@@ -5460,7 +5624,7 @@
break 2
fi
done
-@@ -8459,11 +8652,11 @@
+@@ -8459,11 +8766,11 @@
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
@@ -5476,7 +5640,7 @@
fi
if test "x$ac_ct_RANLIB" = x; then
-@@ -8471,10 +8664,10 @@
+@@ -8471,10 +8778,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5489,7 +5653,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -8488,10 +8681,10 @@
+@@ -8488,10 +8795,10 @@
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
@@ -5503,7 +5667,7 @@
else
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -8504,7 +8697,7 @@
+@@ -8504,7 +8811,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
@@ -5512,7 +5676,7 @@
break 2
fi
done
-@@ -8515,11 +8708,11 @@
+@@ -8515,11 +8822,11 @@
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
@@ -5528,7 +5692,7 @@
fi
-@@ -8528,10 +8721,10 @@
+@@ -8528,10 +8835,10 @@
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
@@ -5542,7 +5706,7 @@
else
if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-@@ -8544,7 +8737,7 @@
+@@ -8544,7 +8851,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
@@ -5551,7 +5715,7 @@
break 2
fi
done
-@@ -8555,11 +8748,11 @@
+@@ -8555,11 +8862,11 @@
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
@@ -5567,7 +5731,7 @@
fi
if test "x$ac_ct_STRIP" = x; then
-@@ -8567,10 +8760,10 @@
+@@ -8567,10 +8874,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5580,7 +5744,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -8635,10 +8828,10 @@
+@@ -8635,10 +8942,10 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -5594,7 +5758,7 @@
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
-@@ -8688,19 +8881,19 @@
+@@ -8688,19 +8995,19 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -5621,7 +5785,7 @@
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
-@@ -8750,11 +8943,11 @@
+@@ -8750,11 +9057,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -5637,7 +5801,7 @@
fi
else
-@@ -8772,10 +8965,10 @@
+@@ -8772,10 +9079,10 @@
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
@@ -5651,7 +5815,7 @@
else
if test -n "$DSYMUTIL"; then
ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-@@ -8788,7 +8981,7 @@
+@@ -8788,7 +9095,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
@@ -5660,7 +5824,7 @@
break 2
fi
done
-@@ -8799,11 +8992,11 @@
+@@ -8799,11 +9106,11 @@
fi
DSYMUTIL=$ac_cv_prog_DSYMUTIL
if test -n "$DSYMUTIL"; then
@@ -5676,7 +5840,7 @@
fi
-@@ -8812,10 +9005,10 @@
+@@ -8812,10 +9119,10 @@
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
@@ -5690,7 +5854,7 @@
else
if test -n "$ac_ct_DSYMUTIL"; then
ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-@@ -8828,7 +9021,7 @@
+@@ -8828,7 +9135,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
@@ -5699,7 +5863,7 @@
break 2
fi
done
-@@ -8839,11 +9032,11 @@
+@@ -8839,11 +9146,11 @@
fi
ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
if test -n "$ac_ct_DSYMUTIL"; then
@@ -5715,7 +5879,7 @@
fi
if test "x$ac_ct_DSYMUTIL" = x; then
-@@ -8851,10 +9044,10 @@
+@@ -8851,10 +9158,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5728,7 +5892,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -8868,10 +9061,10 @@
+@@ -8868,10 +9175,10 @@
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
@@ -5742,7 +5906,7 @@
else
if test -n "$NMEDIT"; then
ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-@@ -8884,7 +9077,7 @@
+@@ -8884,7 +9191,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
@@ -5751,7 +5915,7 @@
break 2
fi
done
-@@ -8895,11 +9088,11 @@
+@@ -8895,11 +9202,11 @@
fi
NMEDIT=$ac_cv_prog_NMEDIT
if test -n "$NMEDIT"; then
@@ -5767,7 +5931,7 @@
fi
-@@ -8908,10 +9101,10 @@
+@@ -8908,10 +9215,10 @@
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
@@ -5781,7 +5945,7 @@
else
if test -n "$ac_ct_NMEDIT"; then
ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-@@ -8924,7 +9117,7 @@
+@@ -8924,7 +9231,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
@@ -5790,7 +5954,7 @@
break 2
fi
done
-@@ -8935,11 +9128,11 @@
+@@ -8935,11 +9242,11 @@
fi
ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
if test -n "$ac_ct_NMEDIT"; then
@@ -5806,7 +5970,7 @@
fi
if test "x$ac_ct_NMEDIT" = x; then
-@@ -8947,10 +9140,10 @@
+@@ -8947,10 +9254,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5819,7 +5983,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -8962,10 +9155,10 @@
+@@ -8962,10 +9269,10 @@
fi
@@ -5833,7 +5997,7 @@
else
lt_cv_apple_cc_single_mod=no
if test -z "${LT_MULTI_MODULE}"; then
-@@ -8983,12 +9176,12 @@
+@@ -8983,12 +9290,12 @@
rm conftest.c
fi
fi
@@ -5851,7 +6015,7 @@
else
lt_cv_ld_exported_symbols_list=no
save_LDFLAGS=$LDFLAGS
-@@ -9015,33 +9208,37 @@
+@@ -9015,33 +9322,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5896,7 +6060,7 @@
case $host_os in
rhapsody* | darwin1.[0123])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -9153,10 +9350,10 @@
+@@ -9153,10 +9464,10 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -5910,21 +6074,21 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
-@@ -9171,11 +9368,11 @@
+@@ -9171,11 +9482,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:9174: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9371: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9485: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9178: \$? = $ac_status" >&5
-+ echo "$as_me:9375: \$? = $ac_status" >&5
++ echo "$as_me:9489: \$? = $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.
-@@ -9188,8 +9385,8 @@
+@@ -9188,8 +9499,8 @@
$rm conftest*
fi
@@ -5935,7 +6099,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -9203,8 +9400,8 @@
+@@ -9203,8 +9514,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -5946,7 +6110,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9435,18 +9632,18 @@
+@@ -9435,18 +9746,18 @@
esac
fi
@@ -5970,21 +6134,21 @@
else
lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
-@@ -9461,11 +9658,11 @@
+@@ -9461,11 +9772,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:9464: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9661: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9775: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9468: \$? = $ac_status" >&5
-+ echo "$as_me:9665: \$? = $ac_status" >&5
++ echo "$as_me:9779: \$? = $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.
-@@ -9478,8 +9675,8 @@
+@@ -9478,8 +9789,8 @@
$rm conftest*
fi
@@ -5995,7 +6159,7 @@
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9506,10 +9703,10 @@
+@@ -9506,10 +9817,10 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -6009,7 +6173,7 @@
else
lt_cv_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
-@@ -9534,8 +9731,8 @@
+@@ -9534,8 +9845,8 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -6020,7 +6184,7 @@
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
:
-@@ -9544,10 +9741,10 @@
+@@ -9544,10 +9855,10 @@
fi
@@ -6034,21 +6198,21 @@
else
lt_cv_prog_compiler_c_o=no
$rm -r conftest 2>/dev/null
-@@ -9565,11 +9762,11 @@
+@@ -9565,11 +9876,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:9568: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9765: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9879: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9572: \$? = $ac_status" >&5
-+ echo "$as_me:9769: \$? = $ac_status" >&5
++ echo "$as_me:9883: \$? = $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
-@@ -9591,34 +9788,34 @@
+@@ -9591,34 +9902,34 @@
$rm conftest*
fi
@@ -6093,7 +6257,7 @@
runpath_var=
allow_undefined_flag=
-@@ -10049,18 +10246,21 @@
+@@ -10049,18 +10360,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6119,7 +6283,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10075,12 +10275,13 @@
+@@ -10075,12 +10389,13 @@
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -6134,7 +6298,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10115,18 +10316,21 @@
+@@ -10115,18 +10430,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6160,7 +6324,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10141,12 +10345,13 @@
+@@ -10141,12 +10459,13 @@
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -6175,7 +6339,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10598,8 +10803,8 @@
+@@ -10598,8 +10917,8 @@
esac
fi
@@ -6186,7 +6350,7 @@
test "$ld_shlibs" = no && can_build_shared=no
#
-@@ -10619,15 +10824,15 @@
+@@ -10619,15 +10938,15 @@
# 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.
@@ -6205,7 +6369,7 @@
(exit $ac_status); } 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -10645,7 +10850,7 @@
+@@ -10645,7 +10964,7 @@
if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
(eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
@@ -6214,7 +6378,7 @@
(exit $ac_status); }
then
archive_cmds_need_lc=no
-@@ -10657,16 +10862,16 @@
+@@ -10657,16 +10976,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -6235,7 +6399,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -11279,19 +11484,19 @@
+@@ -11279,19 +11598,19 @@
dynamic_linker=no
;;
esac
@@ -6259,7 +6423,7 @@
else
lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
-@@ -11303,8 +11508,8 @@
+@@ -11303,8 +11622,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -6270,7 +6434,7 @@
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
test -n "$runpath_var" || \
-@@ -11328,8 +11533,8 @@
+@@ -11328,8 +11647,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -6281,7 +6445,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11342,13 +11547,13 @@
+@@ -11342,13 +11661,13 @@
striplib=
old_striplib=
@@ -6299,7 +6463,7 @@
else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
-@@ -11356,16 +11561,16 @@
+@@ -11356,16 +11675,16 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -6322,7 +6486,7 @@
;;
esac
fi
-@@ -11397,10 +11602,10 @@
+@@ -11397,10 +11716,10 @@
darwin*)
# if libdl is installed we need to link against it
@@ -6336,7 +6500,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-@@ -11432,32 +11637,36 @@
+@@ -11432,32 +11751,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6380,7 +6544,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11471,10 +11680,10 @@
+@@ -11471,10 +11794,10 @@
;;
*)
@@ -6394,7 +6558,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -11527,38 +11736,42 @@
+@@ -11527,38 +11850,42 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6447,7 +6611,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
-@@ -11590,39 +11803,43 @@
+@@ -11590,39 +11917,43 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6501,7 +6665,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -11675,38 +11892,42 @@
+@@ -11675,38 +12006,42 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6554,7 +6718,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-@@ -11738,39 +11959,43 @@
+@@ -11738,39 +12073,43 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6608,7 +6772,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsvld $LIBS"
-@@ -11802,39 +12027,43 @@
+@@ -11802,39 +12141,43 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6662,7 +6826,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
-@@ -11866,32 +12095,36 @@
+@@ -11866,32 +12209,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6706,7 +6870,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -11931,10 +12164,10 @@
+@@ -11931,10 +12278,10 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -6720,16 +6884,16 @@
else
if test "$cross_compiling" = yes; then :
lt_cv_dlopen_self=cross
-@@ -11942,7 +12175,7 @@
+@@ -11942,7 +12289,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11945 "configure"
-+#line 12178 "configure"
++#line 12292 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12008,7 +12241,7 @@
+@@ -12008,7 +12355,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
@@ -6738,7 +6902,7 @@
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
-@@ -12026,15 +12259,15 @@
+@@ -12026,15 +12373,15 @@
fi
@@ -6759,16 +6923,16 @@
else
if test "$cross_compiling" = yes; then :
lt_cv_dlopen_self_static=cross
-@@ -12042,7 +12275,7 @@
+@@ -12042,7 +12389,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12045 "configure"
-+#line 12278 "configure"
++#line 12392 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12108,7 +12341,7 @@
+@@ -12108,7 +12455,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
@@ -6777,7 +6941,7 @@
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
-@@ -12126,8 +12359,8 @@
+@@ -12126,8 +12473,8 @@
fi
@@ -6788,7 +6952,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -12149,13 +12382,13 @@
+@@ -12149,13 +12496,13 @@
# Report which library types will actually be built
@@ -6808,7 +6972,7 @@
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
-@@ -12175,15 +12408,15 @@
+@@ -12175,15 +12522,15 @@
fi
;;
esac
@@ -6830,7 +6994,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12276,8 +12509,8 @@
+@@ -12276,8 +12623,8 @@
cfgfile="${ofile}T"
trap "$rm \"$cfgfile\"; exit 1" 1 2 15
$rm -f "$cfgfile"
@@ -6841,7 +7005,7 @@
cat <<__EOF__ >> "$cfgfile"
#! $SHELL
-@@ -12689,18 +12922,18 @@
+@@ -12689,18 +13036,18 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
@@ -6866,7 +7030,7 @@
fi
fi
if test -z "$LTCFLAGS"; then
-@@ -12717,16 +12950,16 @@
+@@ -12717,16 +13064,16 @@
# Check whether tagname contains only valid characters
case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
"") ;;
@@ -6887,7 +7051,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -12869,8 +13102,8 @@
+@@ -12869,8 +13216,8 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -6898,7 +7062,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12899,14 +13132,14 @@
+@@ -12899,14 +13246,14 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -6918,7 +7082,7 @@
else
if test -z "$LD"; then
lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -12936,19 +13169,19 @@
+@@ -12936,19 +13283,19 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -6947,7 +7111,7 @@
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
-@@ -12960,8 +13193,8 @@
+@@ -12960,8 +13307,8 @@
;;
esac
fi
@@ -6958,7 +7122,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -13011,8 +13244,8 @@
+@@ -13011,8 +13358,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -6969,7 +7133,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -13129,18 +13362,21 @@
+@@ -13129,18 +13476,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6995,7 +7159,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -13155,12 +13391,13 @@
+@@ -13155,12 +13505,13 @@
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -7010,7 +7174,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13196,18 +13433,21 @@
+@@ -13196,18 +13547,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7036,7 +7200,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -13222,12 +13462,13 @@
+@@ -13222,12 +13576,13 @@
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -7051,7 +7215,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13957,8 +14198,8 @@
+@@ -13957,8 +14312,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -7062,7 +7226,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13977,7 +14218,7 @@
+@@ -13977,7 +14332,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7071,7 +7235,7 @@
(exit $ac_status); }; then
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
-@@ -14133,8 +14374,8 @@
+@@ -14133,8 +14488,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -7082,7 +7246,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -14417,18 +14658,18 @@
+@@ -14417,18 +14772,18 @@
esac
fi
@@ -7106,21 +7270,21 @@
else
lt_cv_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
-@@ -14443,11 +14684,11 @@
+@@ -14443,11 +14798,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:14446: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14687: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14801: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14450: \$? = $ac_status" >&5
-+ echo "$as_me:14691: \$? = $ac_status" >&5
++ echo "$as_me:14805: \$? = $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.
-@@ -14460,8 +14701,8 @@
+@@ -14460,8 +14815,8 @@
$rm conftest*
fi
@@ -7131,7 +7295,7 @@
if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14488,10 +14729,10 @@
+@@ -14488,10 +14843,10 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
@@ -7145,7 +7309,7 @@
else
lt_cv_prog_compiler_static_works_CXX=no
save_LDFLAGS="$LDFLAGS"
-@@ -14516,8 +14757,8 @@
+@@ -14516,8 +14871,8 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -7156,7 +7320,7 @@
if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
:
-@@ -14526,10 +14767,10 @@
+@@ -14526,10 +14881,10 @@
fi
@@ -7170,21 +7334,21 @@
else
lt_cv_prog_compiler_c_o_CXX=no
$rm -r conftest 2>/dev/null
-@@ -14547,11 +14788,11 @@
+@@ -14547,11 +14902,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:14550: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14791: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14905: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14554: \$? = $ac_status" >&5
-+ echo "$as_me:14795: \$? = $ac_status" >&5
++ echo "$as_me:14909: \$? = $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
-@@ -14573,34 +14814,34 @@
+@@ -14573,34 +14928,34 @@
$rm conftest*
fi
@@ -7229,7 +7393,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14628,8 +14869,8 @@
+@@ -14628,8 +14983,8 @@
esac
exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
@@ -7240,7 +7404,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
#
-@@ -14649,15 +14890,15 @@
+@@ -14649,15 +15004,15 @@
# 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.
@@ -7259,7 +7423,7 @@
(exit $ac_status); } 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -14675,7 +14916,7 @@
+@@ -14675,7 +15030,7 @@
if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
(eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
@@ -7268,7 +7432,7 @@
(exit $ac_status); }
then
archive_cmds_need_lc_CXX=no
-@@ -14687,16 +14928,16 @@
+@@ -14687,16 +15042,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -7289,7 +7453,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -15257,19 +15498,19 @@
+@@ -15257,19 +15612,19 @@
dynamic_linker=no
;;
esac
@@ -7313,7 +7477,7 @@
else
lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
-@@ -15281,8 +15522,8 @@
+@@ -15281,8 +15636,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -7324,7 +7488,7 @@
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
test -n "$runpath_var_CXX" || \
-@@ -15306,8 +15547,8 @@
+@@ -15306,8 +15661,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -7335,7 +7499,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -15845,13 +16086,13 @@
+@@ -15845,13 +16200,13 @@
cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
@@ -7355,7 +7519,7 @@
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
-@@ -15870,15 +16111,15 @@
+@@ -15870,15 +16225,15 @@
fi
;;
esac
@@ -7377,7 +7541,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -15887,8 +16128,8 @@
+@@ -15887,8 +16242,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -7388,7 +7552,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16119,18 +16360,18 @@
+@@ -16119,18 +16474,18 @@
esac
fi
@@ -7412,21 +7576,21 @@
else
lt_cv_prog_compiler_pic_works_F77=no
ac_outfile=conftest.$ac_objext
-@@ -16145,11 +16386,11 @@
+@@ -16145,11 +16500,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:16148: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16389: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16503: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16152: \$? = $ac_status" >&5
-+ echo "$as_me:16393: \$? = $ac_status" >&5
++ echo "$as_me:16507: \$? = $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.
-@@ -16162,8 +16403,8 @@
+@@ -16162,8 +16517,8 @@
$rm conftest*
fi
@@ -7437,7 +7601,7 @@
if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16190,10 +16431,10 @@
+@@ -16190,10 +16545,10 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
@@ -7451,7 +7615,7 @@
else
lt_cv_prog_compiler_static_works_F77=no
save_LDFLAGS="$LDFLAGS"
-@@ -16218,8 +16459,8 @@
+@@ -16218,8 +16573,8 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -7462,7 +7626,7 @@
if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
:
-@@ -16228,10 +16469,10 @@
+@@ -16228,10 +16583,10 @@
fi
@@ -7476,21 +7640,21 @@
else
lt_cv_prog_compiler_c_o_F77=no
$rm -r conftest 2>/dev/null
-@@ -16249,11 +16490,11 @@
+@@ -16249,11 +16604,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:16252: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16493: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16607: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16256: \$? = $ac_status" >&5
-+ echo "$as_me:16497: \$? = $ac_status" >&5
++ echo "$as_me:16611: \$? = $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
-@@ -16275,34 +16516,34 @@
+@@ -16275,34 +16630,34 @@
$rm conftest*
fi
@@ -7535,7 +7699,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16723,18 +16964,21 @@
+@@ -16723,18 +17078,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7561,7 +7725,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -16749,12 +16993,13 @@
+@@ -16749,12 +17107,13 @@
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -7576,7 +7740,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16779,18 +17024,21 @@
+@@ -16779,18 +17138,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7602,7 +7766,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -16805,12 +17053,13 @@
+@@ -16805,12 +17167,13 @@
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -7617,7 +7781,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -17262,8 +17511,8 @@
+@@ -17262,8 +17625,8 @@
esac
fi
@@ -7628,7 +7792,7 @@
test "$ld_shlibs_F77" = no && can_build_shared=no
#
-@@ -17283,15 +17532,15 @@
+@@ -17283,15 +17646,15 @@
# 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.
@@ -7647,7 +7811,7 @@
(exit $ac_status); } 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -17309,7 +17558,7 @@
+@@ -17309,7 +17672,7 @@
if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
(eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
@@ -7656,7 +7820,7 @@
(exit $ac_status); }
then
archive_cmds_need_lc_F77=no
-@@ -17321,16 +17570,16 @@
+@@ -17321,16 +17684,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -7677,7 +7841,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -17891,19 +18140,19 @@
+@@ -17891,19 +18254,19 @@
dynamic_linker=no
;;
esac
@@ -7701,7 +7865,7 @@
else
lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
-@@ -17915,8 +18164,8 @@
+@@ -17915,8 +18278,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -7712,7 +7876,7 @@
hardcode_action_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
test -n "$runpath_var_F77" || \
-@@ -17940,8 +18189,8 @@
+@@ -17940,8 +18303,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -7723,7 +7887,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -18451,10 +18700,10 @@
+@@ -18451,10 +18814,10 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -7737,21 +7901,21 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
-@@ -18469,11 +18718,11 @@
+@@ -18469,11 +18832,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:18472: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18721: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18835: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18476: \$? = $ac_status" >&5
-+ echo "$as_me:18725: \$? = $ac_status" >&5
++ echo "$as_me:18839: \$? = $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.
-@@ -18486,8 +18735,8 @@
+@@ -18486,8 +18849,8 @@
$rm conftest*
fi
@@ -7762,7 +7926,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -18501,8 +18750,8 @@
+@@ -18501,8 +18864,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -7773,7 +7937,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18733,18 +18982,18 @@
+@@ -18733,18 +19096,18 @@
esac
fi
@@ -7797,21 +7961,21 @@
else
lt_cv_prog_compiler_pic_works_GCJ=no
ac_outfile=conftest.$ac_objext
-@@ -18759,11 +19008,11 @@
+@@ -18759,11 +19122,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:18762: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19011: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19125: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18766: \$? = $ac_status" >&5
-+ echo "$as_me:19015: \$? = $ac_status" >&5
++ echo "$as_me:19129: \$? = $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.
-@@ -18776,8 +19025,8 @@
+@@ -18776,8 +19139,8 @@
$rm conftest*
fi
@@ -7822,7 +7986,7 @@
if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18804,10 +19053,10 @@
+@@ -18804,10 +19167,10 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
@@ -7836,7 +8000,7 @@
else
lt_cv_prog_compiler_static_works_GCJ=no
save_LDFLAGS="$LDFLAGS"
-@@ -18832,8 +19081,8 @@
+@@ -18832,8 +19195,8 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -7847,7 +8011,7 @@
if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
:
-@@ -18842,10 +19091,10 @@
+@@ -18842,10 +19205,10 @@
fi
@@ -7861,21 +8025,21 @@
else
lt_cv_prog_compiler_c_o_GCJ=no
$rm -r conftest 2>/dev/null
-@@ -18863,11 +19112,11 @@
+@@ -18863,11 +19226,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:18866: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19115: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19229: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18870: \$? = $ac_status" >&5
-+ echo "$as_me:19119: \$? = $ac_status" >&5
++ echo "$as_me:19233: \$? = $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
-@@ -18889,34 +19138,34 @@
+@@ -18889,34 +19252,34 @@
$rm conftest*
fi
@@ -7920,7 +8084,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -19347,18 +19596,21 @@
+@@ -19347,18 +19710,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7946,7 +8110,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -19373,12 +19625,13 @@
+@@ -19373,12 +19739,13 @@
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -7961,7 +8125,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19413,18 +19666,21 @@
+@@ -19413,18 +19780,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7987,7 +8151,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -19439,12 +19695,13 @@
+@@ -19439,12 +19809,13 @@
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -8002,7 +8166,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19896,8 +20153,8 @@
+@@ -19896,8 +20267,8 @@
esac
fi
@@ -8013,7 +8177,7 @@
test "$ld_shlibs_GCJ" = no && can_build_shared=no
#
-@@ -19917,15 +20174,15 @@
+@@ -19917,15 +20288,15 @@
# 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.
@@ -8032,7 +8196,7 @@
(exit $ac_status); } 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -19943,7 +20200,7 @@
+@@ -19943,7 +20314,7 @@
if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
(eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
@@ -8041,7 +8205,7 @@
(exit $ac_status); }
then
archive_cmds_need_lc_GCJ=no
-@@ -19955,16 +20212,16 @@
+@@ -19955,16 +20326,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -8062,7 +8226,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -20525,19 +20782,19 @@
+@@ -20525,19 +20896,19 @@
dynamic_linker=no
;;
esac
@@ -8086,7 +8250,7 @@
else
lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
-@@ -20549,8 +20806,8 @@
+@@ -20549,8 +20920,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -8097,7 +8261,7 @@
hardcode_action_GCJ=
if test -n "$hardcode_libdir_flag_spec_GCJ" || \
test -n "$runpath_var_GCJ" || \
-@@ -20574,8 +20831,8 @@
+@@ -20574,8 +20945,8 @@
# directories.
hardcode_action_GCJ=unsupported
fi
@@ -8108,7 +8272,7 @@
if test "$hardcode_action_GCJ" = relink; then
# Fast installation is not supported
-@@ -21498,8 +21755,8 @@
+@@ -21498,8 +21869,8 @@
;;
*)
@@ -8119,7 +8283,7 @@
{ (exit 1); exit 1; }; }
;;
esac
-@@ -21518,8 +21775,8 @@
+@@ -21518,8 +21889,8 @@
chmod +x "$ofile"
else
rm -f "${ofile}T"
@@ -8130,7 +8294,7 @@
{ (exit 1); exit 1; }; }
fi
fi
-@@ -21553,8 +21810,8 @@
+@@ -21553,8 +21924,8 @@
@@ -8141,7 +8305,7 @@
# Check whether --with-x was given.
-@@ -21568,11 +21825,11 @@
+@@ -21568,11 +21939,11 @@
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -8156,7 +8320,7 @@
else
# One or both of the vars are not set, and there is no cached value.
ac_x_includes=no ac_x_libraries=no
-@@ -21593,7 +21850,7 @@
+@@ -21593,7 +21964,7 @@
eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
done
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
@@ -8165,7 +8329,7 @@
if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
test -f "$ac_im_libdir/libX11.$ac_extension"; then
ac_im_usrlibdir=$ac_im_libdir; break
-@@ -21668,13 +21925,14 @@
+@@ -21668,13 +22039,14 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8182,7 +8346,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -21682,7 +21940,7 @@
+@@ -21682,7 +22054,7 @@
# We can compile using X headers with no special include directory.
ac_x_includes=
else
@@ -8191,7 +8355,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
-@@ -21723,30 +21981,33 @@
+@@ -21723,30 +22095,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8232,7 +8396,7 @@
if test -r "$ac_dir/libX11.$ac_extension"; then
ac_x_libraries=$ac_dir
break 2
-@@ -21755,6 +22016,7 @@
+@@ -21755,6 +22130,7 @@
done
fi
@@ -8240,7 +8404,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
-@@ -21777,8 +22039,8 @@
+@@ -21777,8 +22153,8 @@
fi # $with_x != no
if test "$have_x" != yes; then
@@ -8251,7 +8415,7 @@
no_x=yes
else
# If each of the values was on the command line, it overrides each guess.
-@@ -21788,8 +22050,8 @@
+@@ -21788,8 +22164,8 @@
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -8262,7 +8426,7 @@
fi
if test "$no_x" = yes; then
-@@ -21810,8 +22072,8 @@
+@@ -21810,8 +22186,8 @@
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 . . . .
@@ -8273,7 +8437,7 @@
ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
ac_xsave_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
-@@ -21836,23 +22098,26 @@
+@@ -21836,23 +22212,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8307,7 +8471,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
LIBS="$ac_xsave_LIBS -R $x_libraries"
-@@ -21877,33 +22142,38 @@
+@@ -21877,33 +22256,38 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8355,7 +8519,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_c_werror_flag=$ac_xsave_c_werror_flag
-@@ -21949,27 +22219,30 @@
+@@ -21949,27 +22333,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8394,7 +8558,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet $LIBS"
-@@ -22001,41 +22274,45 @@
+@@ -22001,41 +22388,45 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8450,7 +8614,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet_stub $LIBS"
-@@ -22067,32 +22344,36 @@
+@@ -22067,32 +22458,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8494,7 +8658,7 @@
if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
fi
-@@ -22100,6 +22381,7 @@
+@@ -22100,6 +22495,7 @@
fi
fi
@@ -8502,7 +8666,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
-@@ -22112,10 +22394,10 @@
+@@ -22112,10 +22508,10 @@
# 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.
@@ -8516,7 +8680,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -22168,37 +22450,41 @@
+@@ -22168,37 +22564,41 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8568,7 +8732,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnsl $LIBS"
-@@ -22230,41 +22516,45 @@
+@@ -22230,41 +22630,45 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8624,7 +8788,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbsd $LIBS"
-@@ -22296,32 +22586,36 @@
+@@ -22296,32 +22700,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8668,7 +8832,7 @@
if test $ac_cv_lib_bsd_gethostbyname = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
-@@ -22336,10 +22630,10 @@
+@@ -22336,10 +22744,10 @@
# 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.
@@ -8682,7 +8846,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -22392,37 +22686,41 @@
+@@ -22392,37 +22800,41 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8734,7 +8898,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-@@ -22454,32 +22752,36 @@
+@@ -22454,32 +22866,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8778,7 +8942,7 @@
if test $ac_cv_lib_socket_connect = yes; then
X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
fi
-@@ -22487,10 +22789,10 @@
+@@ -22487,10 +22903,10 @@
fi
# Guillermo Gomez says -lposix is necessary on A/UX.
@@ -8792,7 +8956,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -22543,37 +22845,41 @@
+@@ -22543,37 +22959,41 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8844,7 +9008,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lposix $LIBS"
-@@ -22605,32 +22911,36 @@
+@@ -22605,32 +23025,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8888,7 +9052,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -22638,10 +22948,10 @@
+@@ -22638,10 +23062,10 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -8902,7 +9066,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -22694,37 +23004,41 @@
+@@ -22694,37 +23118,41 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8954,7 +9118,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lipc $LIBS"
-@@ -22756,32 +23070,36 @@
+@@ -22756,32 +23184,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8998,7 +9162,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -22798,10 +23116,10 @@
+@@ -22798,10 +23230,10 @@
# 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
@@ -9012,7 +9176,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-@@ -22833,32 +23151,36 @@
+@@ -22833,32 +23265,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9056,7 +9220,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -22873,8 +23195,8 @@
+@@ -22873,8 +23309,8 @@
if test -n "$PYTHON"; then
# If the user set $PYTHON, use it and don't search something else.
@@ -9067,7 +9231,7 @@
prog="import sys, string
# split strings by '.' and convert to numeric. Append some zeros
# because we need at least 4 digits for the hex conversion.
-@@ -22887,11 +23209,11 @@
+@@ -22887,11 +23323,11 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -9083,7 +9247,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -22899,10 +23221,10 @@
+@@ -22899,10 +23335,10 @@
else
# Otherwise, try each interpreter until we find one that satisfies
# VERSION.
@@ -9097,7 +9261,7 @@
else
for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
-@@ -22924,18 +23246,18 @@
+@@ -22924,18 +23360,18 @@
done
fi
@@ -9121,7 +9285,7 @@
else
case $PYTHON in
[\\/]* | ?:[\\/]*)
-@@ -22950,7 +23272,7 @@
+@@ -22950,7 +23386,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
@@ -9130,7 +9294,7 @@
break 2
fi
done
-@@ -22962,11 +23284,11 @@
+@@ -22962,11 +23398,11 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -9146,7 +9310,7 @@
fi
-@@ -22976,21 +23298,21 @@
+@@ -22976,21 +23412,21 @@
if test "$PYTHON" = :; then
@@ -9175,7 +9339,7 @@
PYTHON_VERSION=$am_cv_python_version
-@@ -23001,30 +23323,30 @@
+@@ -23001,30 +23437,30 @@
@@ -9216,7 +9380,7 @@
pythondir=$am_cv_python_pythondir
-@@ -23032,16 +23354,16 @@
+@@ -23032,16 +23468,16 @@
pkgpythondir=\${pythondir}/$PACKAGE
@@ -9238,7 +9402,7 @@
pyexecdir=$am_cv_python_pyexecdir
-@@ -23054,8 +23376,8 @@
+@@ -23054,8 +23490,8 @@
@@ -9249,7 +9413,7 @@
py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-@@ -23078,26 +23400,27 @@
+@@ -23078,26 +23514,27 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9284,7 +9448,7 @@
HAVE_PYHDRS="no"
fi
-@@ -23142,8 +23465,8 @@
+@@ -23142,8 +23579,8 @@
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -9295,7 +9459,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23165,20 +23488,21 @@
+@@ -23165,20 +23602,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9320,7 +9484,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
has_option=no
-@@ -23186,8 +23510,8 @@
+@@ -23186,8 +23624,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$SAVE_CFLAGS"
@@ -9331,7 +9495,7 @@
if test $has_option = yes; then
warning_flags="$warning_flags $option"
fi
-@@ -23200,16 +23524,16 @@
+@@ -23200,16 +23638,16 @@
fi
;;
*)
@@ -9354,7 +9518,7 @@
# Check whether --enable-iso-c was given.
if test "${enable_iso_c+set}" = set; then
-@@ -23219,8 +23543,8 @@
+@@ -23219,8 +23657,8 @@
fi
@@ -9365,7 +9529,7 @@
complCFLAGS=
if test "x$enable_iso_c" != "xno"; then
if test "x$GCC" = "xyes"; then
-@@ -23234,8 +23558,8 @@
+@@ -23234,8 +23672,8 @@
esac
fi
fi
@@ -9376,7 +9540,7 @@
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -23245,20 +23569,21 @@
+@@ -23245,20 +23683,21 @@
for ac_header in pty.h values.h
do
@@ -9407,7 +9571,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23274,32 +23599,33 @@
+@@ -23274,32 +23713,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9448,7 +9612,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23313,69 +23639,72 @@
+@@ -23313,69 +23753,72 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9550,7 +9714,7 @@
_ACEOF
fi
-@@ -23392,11 +23721,11 @@
+@@ -23392,11 +23835,11 @@
fi
@@ -9566,7 +9730,7 @@
CFLAGS="\
-Wall \
-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
-@@ -23408,8 +23737,8 @@
+@@ -23408,8 +23851,8 @@
for option in -Wno-strict-aliasing -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -9577,7 +9741,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23431,20 +23760,21 @@
+@@ -23431,20 +23874,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9602,7 +9766,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
has_option=no
-@@ -23454,32 +23784,32 @@
+@@ -23454,32 +23898,32 @@
if test $has_option = no; then
CFLAGS="$SAVE_CFLAGS"
fi
@@ -9643,7 +9807,7 @@
(exit $ac_status); }; then
pkg_cv_GIT_CFLAGS=`$PKG_CONFIG --cflags "gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED" 2>/dev/null`
else
-@@ -23494,10 +23824,10 @@
+@@ -23494,10 +23938,10 @@
pkg_cv_GIT_LIBS="$GIT_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -9656,7 +9820,7 @@
(exit $ac_status); }; then
pkg_cv_GIT_LIBS=`$PKG_CONFIG --libs "gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED" 2>/dev/null`
else
-@@ -23525,7 +23855,7 @@
+@@ -23525,7 +23969,7 @@
# Put the nasty error message in config.log where it belongs
echo "$GIT_PKG_ERRORS" >&5
@@ -9665,7 +9829,7 @@
$GIT_PKG_ERRORS
-@@ -23536,7 +23866,7 @@
+@@ -23536,7 +23980,7 @@
and GIT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -9674,7 +9838,7 @@
$GIT_PKG_ERRORS
-@@ -23549,7 +23879,7 @@
+@@ -23549,7 +23993,7 @@
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -9683,7 +9847,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23559,7 +23889,7 @@
+@@ -23559,7 +24003,7 @@
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -9692,7 +9856,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23573,25 +23903,25 @@
+@@ -23573,25 +24017,25 @@
else
GIT_CFLAGS=$pkg_cv_GIT_CFLAGS
GIT_LIBS=$pkg_cv_GIT_LIBS
@@ -9724,7 +9888,7 @@
(exit $ac_status); }; then
pkg_cv_GAILUTIL_CFLAGS=`$PKG_CONFIG --cflags "gail >= $LIBGAIL_REQUIRED" 2>/dev/null`
else
-@@ -23606,10 +23936,10 @@
+@@ -23606,10 +24050,10 @@
pkg_cv_GAILUTIL_LIBS="$GAILUTIL_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -9737,7 +9901,7 @@
(exit $ac_status); }; then
pkg_cv_GAILUTIL_LIBS=`$PKG_CONFIG --libs "gail >= $LIBGAIL_REQUIRED" 2>/dev/null`
else
-@@ -23637,7 +23967,7 @@
+@@ -23637,7 +24081,7 @@
# Put the nasty error message in config.log where it belongs
echo "$GAILUTIL_PKG_ERRORS" >&5
@@ -9746,7 +9910,7 @@
$GAILUTIL_PKG_ERRORS
-@@ -23648,7 +23978,7 @@
+@@ -23648,7 +24092,7 @@
and GAILUTIL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -9755,7 +9919,7 @@
$GAILUTIL_PKG_ERRORS
-@@ -23661,7 +23991,7 @@
+@@ -23661,7 +24105,7 @@
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -9764,7 +9928,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23671,7 +24001,7 @@
+@@ -23671,7 +24115,7 @@
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -9773,7 +9937,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23685,8 +24015,8 @@
+@@ -23685,8 +24129,8 @@
else
GAILUTIL_CFLAGS=$pkg_cv_GAILUTIL_CFLAGS
GAILUTIL_LIBS=$pkg_cv_GAILUTIL_LIBS
@@ -9784,7 +9948,7 @@
:
fi
-@@ -23694,18 +24024,18 @@
+@@ -23694,18 +24138,18 @@
pkg_failed=no
@@ -9807,7 +9971,7 @@
(exit $ac_status); }; then
pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= $GIO_REQUIRED" 2>/dev/null`
else
-@@ -23720,10 +24050,10 @@
+@@ -23720,10 +24164,10 @@
pkg_cv_GIO_LIBS="$GIO_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -9820,7 +9984,7 @@
(exit $ac_status); }; then
pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= $GIO_REQUIRED" 2>/dev/null`
else
-@@ -23751,7 +24081,7 @@
+@@ -23751,7 +24195,7 @@
# Put the nasty error message in config.log where it belongs
echo "$GIO_PKG_ERRORS" >&5
@@ -9829,7 +9993,7 @@
$GIO_PKG_ERRORS
-@@ -23762,7 +24092,7 @@
+@@ -23762,7 +24206,7 @@
and GIO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -9838,7 +10002,7 @@
$GIO_PKG_ERRORS
-@@ -23775,7 +24105,7 @@
+@@ -23775,7 +24219,7 @@
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -9847,7 +10011,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23785,7 +24115,7 @@
+@@ -23785,7 +24229,7 @@
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -9856,7 +10020,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23799,8 +24129,8 @@
+@@ -23799,8 +24243,8 @@
else
GIO_CFLAGS=$pkg_cv_GIO_CFLAGS
GIO_LIBS=$pkg_cv_GIO_LIBS
@@ -9867,7 +10031,7 @@
:
fi
-@@ -23808,18 +24138,18 @@
+@@ -23808,18 +24252,18 @@
pkg_failed=no
@@ -9890,7 +10054,7 @@
(exit $ac_status); }; then
pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null`
else
-@@ -23834,10 +24164,10 @@
+@@ -23834,10 +24278,10 @@
pkg_cv_GTK_LIBS="$GTK_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -9903,7 +10067,7 @@
(exit $ac_status); }; then
pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null`
else
-@@ -23865,7 +24195,7 @@
+@@ -23865,7 +24309,7 @@
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
@@ -9912,7 +10076,7 @@
$GTK_PKG_ERRORS
-@@ -23876,7 +24206,7 @@
+@@ -23876,7 +24320,7 @@
and GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -9921,7 +10085,7 @@
$GTK_PKG_ERRORS
-@@ -23889,7 +24219,7 @@
+@@ -23889,7 +24333,7 @@
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -9930,7 +10094,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23899,7 +24229,7 @@
+@@ -23899,7 +24343,7 @@
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -9939,7 +10103,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23913,8 +24243,8 @@
+@@ -23913,8 +24357,8 @@
else
GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
GTK_LIBS=$pkg_cv_GTK_LIBS
@@ -9950,7 +10114,7 @@
:
fi
-@@ -23922,18 +24252,18 @@
+@@ -23922,18 +24366,18 @@
pkg_failed=no
@@ -9973,7 +10137,7 @@
(exit $ac_status); }; then
pkg_cv_GNOME_APPLETS_CFLAGS=`$PKG_CONFIG --cflags "libpanelapplet-2.0 >= $LIBPANEL_REQUIRED" 2>/dev/null`
else
-@@ -23948,10 +24278,10 @@
+@@ -23948,10 +24392,10 @@
pkg_cv_GNOME_APPLETS_LIBS="$GNOME_APPLETS_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -9986,7 +10150,7 @@
(exit $ac_status); }; then
pkg_cv_GNOME_APPLETS_LIBS=`$PKG_CONFIG --libs "libpanelapplet-2.0 >= $LIBPANEL_REQUIRED" 2>/dev/null`
else
-@@ -23979,7 +24309,7 @@
+@@ -23979,7 +24423,7 @@
# Put the nasty error message in config.log where it belongs
echo "$GNOME_APPLETS_PKG_ERRORS" >&5
@@ -9995,7 +10159,7 @@
$GNOME_APPLETS_PKG_ERRORS
-@@ -23990,7 +24320,7 @@
+@@ -23990,7 +24434,7 @@
and GNOME_APPLETS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -10004,7 +10168,7 @@
$GNOME_APPLETS_PKG_ERRORS
-@@ -24003,7 +24333,7 @@
+@@ -24003,7 +24447,7 @@
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -10013,7 +10177,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -24013,7 +24343,7 @@
+@@ -24013,7 +24457,7 @@
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -10022,7 +10186,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -24027,8 +24357,8 @@
+@@ -24027,8 +24471,8 @@
else
GNOME_APPLETS_CFLAGS=$pkg_cv_GNOME_APPLETS_CFLAGS
GNOME_APPLETS_LIBS=$pkg_cv_GNOME_APPLETS_LIBS
@@ -10033,7 +10197,7 @@
:
fi
-@@ -24036,18 +24366,18 @@
+@@ -24036,18 +24480,18 @@
pkg_failed=no
@@ -10056,7 +10220,7 @@
(exit $ac_status); }; then
pkg_cv_GNOME_LIBS2_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED" 2>/dev/null`
else
-@@ -24062,10 +24392,10 @@
+@@ -24062,10 +24506,10 @@
pkg_cv_GNOME_LIBS2_LIBS="$GNOME_LIBS2_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -10069,7 +10233,7 @@
(exit $ac_status); }; then
pkg_cv_GNOME_LIBS2_LIBS=`$PKG_CONFIG --libs "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED" 2>/dev/null`
else
-@@ -24093,7 +24423,7 @@
+@@ -24093,7 +24537,7 @@
# Put the nasty error message in config.log where it belongs
echo "$GNOME_LIBS2_PKG_ERRORS" >&5
@@ -10078,7 +10242,7 @@
$GNOME_LIBS2_PKG_ERRORS
-@@ -24104,7 +24434,7 @@
+@@ -24104,7 +24548,7 @@
and GNOME_LIBS2_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -10087,7 +10251,7 @@
$GNOME_LIBS2_PKG_ERRORS
-@@ -24117,7 +24447,7 @@
+@@ -24117,7 +24561,7 @@
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -10096,7 +10260,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -24127,7 +24457,7 @@
+@@ -24127,7 +24571,7 @@
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -10105,7 +10269,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -24141,8 +24471,8 @@
+@@ -24141,8 +24585,8 @@
else
GNOME_LIBS2_CFLAGS=$pkg_cv_GNOME_LIBS2_CFLAGS
GNOME_LIBS2_LIBS=$pkg_cv_GNOME_LIBS2_LIBS
@@ -10116,7 +10280,7 @@
:
fi
-@@ -24150,18 +24480,18 @@
+@@ -24150,18 +24594,18 @@
pkg_failed=no
@@ -10139,7 +10303,7 @@
(exit $ac_status); }; then
pkg_cv_GNOMEDESKTOP_CFLAGS=`$PKG_CONFIG --cflags "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null`
else
-@@ -24176,10 +24506,10 @@
+@@ -24176,10 +24620,10 @@
pkg_cv_GNOMEDESKTOP_LIBS="$GNOMEDESKTOP_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -10152,7 +10316,7 @@
(exit $ac_status); }; then
pkg_cv_GNOMEDESKTOP_LIBS=`$PKG_CONFIG --libs "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null`
else
-@@ -24207,7 +24537,7 @@
+@@ -24207,7 +24651,7 @@
# Put the nasty error message in config.log where it belongs
echo "$GNOMEDESKTOP_PKG_ERRORS" >&5
@@ -10161,7 +10325,7 @@
$GNOMEDESKTOP_PKG_ERRORS
-@@ -24218,7 +24548,7 @@
+@@ -24218,7 +24662,7 @@
and GNOMEDESKTOP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -10170,7 +10334,7 @@
$GNOMEDESKTOP_PKG_ERRORS
-@@ -24231,7 +24561,7 @@
+@@ -24231,7 +24675,7 @@
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -10179,7 +10343,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -24241,7 +24571,7 @@
+@@ -24241,7 +24685,7 @@
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -10188,7 +10352,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -24255,8 +24585,8 @@
+@@ -24255,8 +24699,8 @@
else
GNOMEDESKTOP_CFLAGS=$pkg_cv_GNOMEDESKTOP_CFLAGS
GNOMEDESKTOP_LIBS=$pkg_cv_GNOMEDESKTOP_LIBS
@@ -10199,7 +10363,7 @@
:
fi
-@@ -24265,18 +24595,18 @@
+@@ -24265,18 +24709,18 @@
build_gnome_vfs_applets=false
pkg_failed=no
@@ -10222,7 +10386,7 @@
(exit $ac_status); }; then
pkg_cv_GNOME_VFS_APPLETS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED" 2>/dev/null`
else
-@@ -24291,10 +24621,10 @@
+@@ -24291,10 +24735,10 @@
pkg_cv_GNOME_VFS_APPLETS_LIBS="$GNOME_VFS_APPLETS_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -10235,7 +10399,7 @@
(exit $ac_status); }; then
pkg_cv_GNOME_VFS_APPLETS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED" 2>/dev/null`
else
-@@ -24322,7 +24652,7 @@
+@@ -24322,7 +24766,7 @@
# Put the nasty error message in config.log where it belongs
echo "$GNOME_VFS_APPLETS_PKG_ERRORS" >&5
@@ -10244,7 +10408,7 @@
$GNOME_VFS_APPLETS_PKG_ERRORS
-@@ -24333,7 +24663,7 @@
+@@ -24333,7 +24777,7 @@
and GNOME_VFS_APPLETS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -10253,7 +10417,7 @@
$GNOME_VFS_APPLETS_PKG_ERRORS
-@@ -24346,7 +24676,7 @@
+@@ -24346,7 +24790,7 @@
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -10262,7 +10426,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -24356,7 +24686,7 @@
+@@ -24356,7 +24800,7 @@
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -10271,7 +10435,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -24370,8 +24700,8 @@
+@@ -24370,8 +24814,8 @@
else
GNOME_VFS_APPLETS_CFLAGS=$pkg_cv_GNOME_VFS_APPLETS_CFLAGS
GNOME_VFS_APPLETS_LIBS=$pkg_cv_GNOME_VFS_APPLETS_LIBS
@@ -10282,7 +10446,7 @@
build_gnome_vfs_applets=true
fi
-@@ -24387,18 +24717,18 @@
+@@ -24387,18 +24831,18 @@
pkg_failed=no
@@ -10305,7 +10469,7 @@
(exit $ac_status); }; then
pkg_cv_LIBGLADE_CFLAGS=`$PKG_CONFIG --cflags "libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null`
else
-@@ -24413,10 +24743,10 @@
+@@ -24413,10 +24857,10 @@
pkg_cv_LIBGLADE_LIBS="$LIBGLADE_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -10318,7 +10482,7 @@
(exit $ac_status); }; then
pkg_cv_LIBGLADE_LIBS=`$PKG_CONFIG --libs "libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null`
else
-@@ -24444,7 +24774,7 @@
+@@ -24444,7 +24888,7 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBGLADE_PKG_ERRORS" >&5
@@ -10327,7 +10491,7 @@
$LIBGLADE_PKG_ERRORS
-@@ -24455,7 +24785,7 @@
+@@ -24455,7 +24899,7 @@
and LIBGLADE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -10336,7 +10500,7 @@
$LIBGLADE_PKG_ERRORS
-@@ -24468,7 +24798,7 @@
+@@ -24468,7 +24912,7 @@
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -10345,7 +10509,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -24478,7 +24808,7 @@
+@@ -24478,7 +24922,7 @@
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -10354,7 +10518,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -24492,8 +24822,8 @@
+@@ -24492,8 +24936,8 @@
else
LIBGLADE_CFLAGS=$pkg_cv_LIBGLADE_CFLAGS
LIBGLADE_LIBS=$pkg_cv_LIBGLADE_LIBS
@@ -10365,7 +10529,7 @@
:
fi
-@@ -24502,18 +24832,18 @@
+@@ -24502,18 +24946,18 @@
build_gtop_applets=false
pkg_failed=no
@@ -10388,7 +10552,7 @@
(exit $ac_status); }; then
pkg_cv_GTOP_APPLETS_CFLAGS=`$PKG_CONFIG --cflags "libgtop-2.0 >= $LIBGTOP_REQUIRED" 2>/dev/null`
else
-@@ -24528,10 +24858,10 @@
+@@ -24528,10 +24972,10 @@
pkg_cv_GTOP_APPLETS_LIBS="$GTOP_APPLETS_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -10401,7 +10565,7 @@
(exit $ac_status); }; then
pkg_cv_GTOP_APPLETS_LIBS=`$PKG_CONFIG --libs "libgtop-2.0 >= $LIBGTOP_REQUIRED" 2>/dev/null`
else
-@@ -24559,18 +24889,18 @@
+@@ -24559,18 +25003,18 @@
# Put the nasty error message in config.log where it belongs
echo "$GTOP_APPLETS_PKG_ERRORS" >&5
@@ -10428,7 +10592,7 @@
build_gtop_applets=true
fi
-@@ -24586,18 +24916,18 @@
+@@ -24586,18 +25030,18 @@
pkg_failed=no
@@ -10451,7 +10615,7 @@
(exit $ac_status); }; then
pkg_cv_LIBGNOMEKBDUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomekbdui >= 2.21.4.1" 2>/dev/null`
else
-@@ -24612,10 +24942,10 @@
+@@ -24612,10 +25056,10 @@
pkg_cv_LIBGNOMEKBDUI_LIBS="$LIBGNOMEKBDUI_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -10464,7 +10628,7 @@
(exit $ac_status); }; then
pkg_cv_LIBGNOMEKBDUI_LIBS=`$PKG_CONFIG --libs "libgnomekbdui >= 2.21.4.1" 2>/dev/null`
else
-@@ -24643,16 +24973,16 @@
+@@ -24643,16 +25087,16 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBGNOMEKBDUI_PKG_ERRORS" >&5
@@ -10485,7 +10649,7 @@
HAVE_LIBGNOMEKBD=yes
fi
-@@ -24661,8 +24991,8 @@
+@@ -24661,8 +25105,8 @@
if test "x$HAVE_LIBGNOMEKBD" = "xno"; then
BUILD_KEYBOARD_APPLET=no
@@ -10496,7 +10660,7 @@
else
BUILD_KEYBOARD_APPLET=yes
fi
-@@ -24678,18 +25008,18 @@
+@@ -24678,18 +25122,18 @@
pkg_failed=no
@@ -10519,7 +10683,7 @@
(exit $ac_status); }; then
pkg_cv_GNOME_SETTINGS_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "gnome-settings-daemon" 2>/dev/null`
else
-@@ -24704,10 +25034,10 @@
+@@ -24704,10 +25148,10 @@
pkg_cv_GNOME_SETTINGS_DAEMON_LIBS="$GNOME_SETTINGS_DAEMON_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -10532,7 +10696,7 @@
(exit $ac_status); }; then
pkg_cv_GNOME_SETTINGS_DAEMON_LIBS=`$PKG_CONFIG --libs "gnome-settings-daemon" 2>/dev/null`
else
-@@ -24735,22 +25065,22 @@
+@@ -24735,22 +25179,22 @@
# Put the nasty error message in config.log where it belongs
echo "$GNOME_SETTINGS_DAEMON_PKG_ERRORS" >&5
@@ -10561,7 +10725,7 @@
fi
-@@ -24758,18 +25088,18 @@
+@@ -24758,18 +25202,18 @@
pkg_failed=no
@@ -10584,7 +10748,7 @@
(exit $ac_status); }; then
pkg_cv_LIBWNCK_CFLAGS=`$PKG_CONFIG --cflags "libwnck-1.0 >= $LIBWNCK_REQUIRED" 2>/dev/null`
else
-@@ -24784,10 +25114,10 @@
+@@ -24784,10 +25228,10 @@
pkg_cv_LIBWNCK_LIBS="$LIBWNCK_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -10597,7 +10761,7 @@
(exit $ac_status); }; then
pkg_cv_LIBWNCK_LIBS=`$PKG_CONFIG --libs "libwnck-1.0 >= $LIBWNCK_REQUIRED" 2>/dev/null`
else
-@@ -24815,20 +25145,20 @@
+@@ -24815,20 +25259,20 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBWNCK_PKG_ERRORS" >&5
@@ -10626,7 +10790,7 @@
:
fi
-@@ -24839,18 +25169,18 @@
+@@ -24839,18 +25283,18 @@
LIBNOTIFY_LIBS=
pkg_failed=no
@@ -10649,7 +10813,7 @@
(exit $ac_status); }; then
pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null`
else
-@@ -24865,10 +25195,10 @@
+@@ -24865,10 +25309,10 @@
pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -10662,7 +10826,7 @@
(exit $ac_status); }; then
pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null`
else
-@@ -24896,16 +25226,16 @@
+@@ -24896,16 +25340,16 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBNOTIFY_PKG_ERRORS" >&5
@@ -10683,7 +10847,7 @@
HAVE_LIBNOTIFY="yes"
fi
-@@ -24922,18 +25252,18 @@
+@@ -24922,18 +25366,18 @@
pkg_failed=no
@@ -10706,7 +10870,7 @@
(exit $ac_status); }; then
pkg_cv_CPUFREQ_SELECTOR_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
else
-@@ -24948,10 +25278,10 @@
+@@ -24948,10 +25392,10 @@
pkg_cv_CPUFREQ_SELECTOR_LIBS="$CPUFREQ_SELECTOR_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -10719,7 +10883,7 @@
(exit $ac_status); }; then
pkg_cv_CPUFREQ_SELECTOR_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
else
-@@ -24979,7 +25309,7 @@
+@@ -24979,7 +25423,7 @@
# Put the nasty error message in config.log where it belongs
echo "$CPUFREQ_SELECTOR_PKG_ERRORS" >&5
@@ -10728,7 +10892,7 @@
$CPUFREQ_SELECTOR_PKG_ERRORS
-@@ -24990,7 +25320,7 @@
+@@ -24990,7 +25434,7 @@
and CPUFREQ_SELECTOR_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -10737,7 +10901,7 @@
$CPUFREQ_SELECTOR_PKG_ERRORS
-@@ -25003,7 +25333,7 @@
+@@ -25003,7 +25447,7 @@
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -10746,7 +10910,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -25013,7 +25343,7 @@
+@@ -25013,7 +25457,7 @@
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -10755,7 +10919,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -25027,8 +25357,8 @@
+@@ -25027,8 +25471,8 @@
else
CPUFREQ_SELECTOR_CFLAGS=$pkg_cv_CPUFREQ_SELECTOR_CFLAGS
CPUFREQ_SELECTOR_LIBS=$pkg_cv_CPUFREQ_SELECTOR_LIBS
@@ -10766,7 +10930,7 @@
:
fi
-@@ -25037,18 +25367,18 @@
+@@ -25037,18 +25481,18 @@
if test "x$BUILD_KEYBOARD_APPLET" = "xyes"; then
pkg_failed=no
@@ -10789,7 +10953,7 @@
(exit $ac_status); }; then
pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
else
-@@ -25063,10 +25393,10 @@
+@@ -25063,10 +25507,10 @@
pkg_cv_DBUS_LIBS="$DBUS_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -10802,7 +10966,7 @@
(exit $ac_status); }; then
pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
else
-@@ -25094,22 +25424,22 @@
+@@ -25094,22 +25538,22 @@
# Put the nasty error message in config.log where it belongs
echo "$DBUS_PKG_ERRORS" >&5
@@ -10831,7 +10995,7 @@
{ (exit 1); exit 1; }; }
fi
fi
-@@ -25129,18 +25459,18 @@
+@@ -25129,18 +25573,18 @@
if test "x$with_hal" != xno; then
pkg_failed=no
@@ -10854,7 +11018,7 @@
(exit $ac_status); }; then
pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
else
-@@ -25155,10 +25485,10 @@
+@@ -25155,10 +25599,10 @@
pkg_cv_HAL_LIBS="$HAL_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -10867,7 +11031,7 @@
(exit $ac_status); }; then
pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
else
-@@ -25186,16 +25516,16 @@
+@@ -25186,16 +25630,16 @@
# Put the nasty error message in config.log where it belongs
echo "$HAL_PKG_ERRORS" >&5
@@ -10888,7 +11052,7 @@
HAVE_HAL="yes"
fi
-@@ -25207,8 +25537,8 @@
+@@ -25207,8 +25651,8 @@
fi
else
@@ -10899,7 +11063,7 @@
fi
-@@ -25218,18 +25548,18 @@
+@@ -25218,18 +25662,18 @@
GUCHARMAP_LIBS=
pkg_failed=no
@@ -10922,7 +11086,7 @@
(exit $ac_status); }; then
pkg_cv_GUCHARMAP_CFLAGS=`$PKG_CONFIG --cflags "gucharmap >= 1.4.0" 2>/dev/null`
else
-@@ -25244,10 +25574,10 @@
+@@ -25244,10 +25688,10 @@
pkg_cv_GUCHARMAP_LIBS="$GUCHARMAP_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -10935,7 +11099,7 @@
(exit $ac_status); }; then
pkg_cv_GUCHARMAP_LIBS=`$PKG_CONFIG --libs "gucharmap >= 1.4.0" 2>/dev/null`
else
-@@ -25275,16 +25605,16 @@
+@@ -25275,16 +25719,16 @@
# Put the nasty error message in config.log where it belongs
echo "$GUCHARMAP_PKG_ERRORS" >&5
@@ -10956,7 +11120,7 @@
HAVE_GUCHARMAP="yes"
fi
-@@ -25295,8 +25625,8 @@
+@@ -25295,8 +25739,8 @@
_ACEOF
else
@@ -10967,7 +11131,7 @@
fi
-@@ -25305,22 +25635,22 @@
+@@ -25305,22 +25749,22 @@
PYGTK_LIBS=
pkg_failed=no
@@ -10994,7 +11158,7 @@
(exit $ac_status); }; then
pkg_cv_PYGTK_CFLAGS=`$PKG_CONFIG --cflags "pygtk-2.0 >= $PYGTK_REQUIRED
pygobject-2.0 >= $PYGOBJECT_REQUIRED
-@@ -25337,14 +25667,14 @@
+@@ -25337,14 +25781,14 @@
pkg_cv_PYGTK_LIBS="$PYGTK_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -11011,7 +11175,7 @@
(exit $ac_status); }; then
pkg_cv_PYGTK_LIBS=`$PKG_CONFIG --libs "pygtk-2.0 >= $PYGTK_REQUIRED
pygobject-2.0 >= $PYGOBJECT_REQUIRED
-@@ -25378,16 +25708,16 @@
+@@ -25378,16 +25822,16 @@
# Put the nasty error message in config.log where it belongs
echo "$PYGTK_PKG_ERRORS" >&5
@@ -11032,7 +11196,7 @@
HAVE_PYGTK="yes"
fi
-@@ -25395,18 +25725,18 @@
+@@ -25395,18 +25839,18 @@
pkg_failed=no
@@ -11055,7 +11219,7 @@
(exit $ac_status); }; then
pkg_cv_LIBGWEATHER_CFLAGS=`$PKG_CONFIG --cflags "gweather >= $GWEATHER_REQUIRED" 2>/dev/null`
else
-@@ -25421,10 +25751,10 @@
+@@ -25421,10 +25865,10 @@
pkg_cv_LIBGWEATHER_LIBS="$LIBGWEATHER_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -11068,7 +11232,7 @@
(exit $ac_status); }; then
pkg_cv_LIBGWEATHER_LIBS=`$PKG_CONFIG --libs "gweather >= $GWEATHER_REQUIRED" 2>/dev/null`
else
-@@ -25452,7 +25782,7 @@
+@@ -25452,7 +25896,7 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBGWEATHER_PKG_ERRORS" >&5
@@ -11077,7 +11241,7 @@
$LIBGWEATHER_PKG_ERRORS
-@@ -25463,7 +25793,7 @@
+@@ -25463,7 +25907,7 @@
and LIBGWEATHER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -11086,7 +11250,7 @@
$LIBGWEATHER_PKG_ERRORS
-@@ -25476,7 +25806,7 @@
+@@ -25476,7 +25920,7 @@
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -11095,7 +11259,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -25486,7 +25816,7 @@
+@@ -25486,7 +25930,7 @@
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -11104,7 +11268,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -25500,8 +25830,8 @@
+@@ -25500,8 +25944,8 @@
else
LIBGWEATHER_CFLAGS=$pkg_cv_LIBGWEATHER_CFLAGS
LIBGWEATHER_LIBS=$pkg_cv_LIBGWEATHER_LIBS
@@ -11115,7 +11279,7 @@
:
fi
-@@ -25510,10 +25840,10 @@
+@@ -25510,10 +25954,10 @@
# Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args.
set dummy gdk-pixbuf-csource; ac_word=$2
@@ -11129,7 +11293,7 @@
else
case $GDK_PIXBUF_CSOURCE in
[\\/]* | ?:[\\/]*)
-@@ -25528,7 +25858,7 @@
+@@ -25528,7 +25972,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext"
@@ -11138,7 +11302,7 @@
break 2
fi
done
-@@ -25541,28 +25871,28 @@
+@@ -25541,28 +25985,28 @@
fi
GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE
if test -n "$GDK_PIXBUF_CSOURCE"; then
@@ -11176,7 +11340,7 @@
else
case $GLIB_GENMARSHAL in
[\\/]* | ?:[\\/]*)
-@@ -25577,7 +25907,7 @@
+@@ -25577,7 +26021,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
@@ -11185,7 +11349,7 @@
break 2
fi
done
-@@ -25589,21 +25919,21 @@
+@@ -25589,21 +26033,21 @@
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -11214,7 +11378,7 @@
else
case $GCONFTOOL in
[\\/]* | ?:[\\/]*)
-@@ -25618,7 +25948,7 @@
+@@ -25618,7 +26062,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
@@ -11223,7 +11387,7 @@
break 2
fi
done
-@@ -25631,26 +25961,26 @@
+@@ -25631,26 +26075,26 @@
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -11259,7 +11423,7 @@
else
case $XSLTPROC in
[\\/]* | ?:[\\/]*)
-@@ -25665,7 +25995,7 @@
+@@ -25665,7 +26109,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
@@ -11268,7 +11432,7 @@
break 2
fi
done
-@@ -25678,26 +26008,26 @@
+@@ -25678,26 +26122,26 @@
fi
XSLTPROC=$ac_cv_path_XSLTPROC
if test -n "$XSLTPROC"; then
@@ -11304,7 +11468,7 @@
else
case $SCROLLKEEPER_CONFIG in
[\\/]* | ?:[\\/]*)
-@@ -25712,7 +26042,7 @@
+@@ -25712,7 +26156,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_SCROLLKEEPER_CONFIG="$as_dir/$ac_word$ac_exec_ext"
@@ -11313,7 +11477,7 @@
break 2
fi
done
-@@ -25725,27 +26055,27 @@
+@@ -25725,27 +26169,27 @@
fi
SCROLLKEEPER_CONFIG=$ac_cv_path_SCROLLKEEPER_CONFIG
if test -n "$SCROLLKEEPER_CONFIG"; then
@@ -11350,7 +11514,7 @@
else
case $JW in
[\\/]* | ?:[\\/]*)
-@@ -25760,7 +26090,7 @@
+@@ -25760,7 +26204,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_JW="$as_dir/$ac_word$ac_exec_ext"
@@ -11359,7 +11523,7 @@
break 2
fi
done
-@@ -25773,11 +26103,11 @@
+@@ -25773,11 +26217,11 @@
fi
JW=$ac_cv_path_JW
if test -n "$JW"; then
@@ -11375,7 +11539,7 @@
fi
-@@ -25811,8 +26141,8 @@
+@@ -25811,8 +26255,8 @@
@@ -11386,7 +11550,7 @@
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-@@ -25826,15 +26156,15 @@
+@@ -25826,15 +26270,15 @@
@@ -11406,7 +11570,7 @@
{ (exit 1); exit 1; }; } ;;
esac
fi
-@@ -25874,20 +26204,21 @@
+@@ -25874,20 +26318,21 @@
for ac_header in locale.h
do
@@ -11437,7 +11601,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25903,32 +26234,33 @@
+@@ -25903,32 +26348,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11478,7 +11642,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25942,69 +26274,72 @@
+@@ -25942,69 +26388,72 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11580,7 +11744,7 @@
_ACEOF
fi
-@@ -26012,10 +26347,10 @@
+@@ -26012,10 +26461,10 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -11594,7 +11758,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26038,31 +26373,35 @@
+@@ -26038,31 +26487,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11637,7 +11801,7 @@
if test $am_cv_val_LC_MESSAGES = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -26081,17 +26420,17 @@
+@@ -26081,17 +26534,17 @@
INTLLIBS=
if test "${ac_cv_header_libintl_h+set}" = set; then
@@ -11662,7 +11826,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26107,32 +26446,33 @@
+@@ -26107,32 +26560,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11703,7 +11867,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26146,63 +26486,64 @@
+@@ -26146,63 +26600,64 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11794,7 +11958,7 @@
fi
if test $ac_cv_header_libintl_h = yes; then
-@@ -26212,10 +26553,10 @@
+@@ -26212,10 +26667,10 @@
#
# First check in libc
#
@@ -11808,7 +11972,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26240,38 +26581,42 @@
+@@ -26240,38 +26695,42 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11861,7 +12025,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26296,43 +26641,47 @@
+@@ -26296,43 +26755,47 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11920,7 +12084,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26385,35 +26734,41 @@
+@@ -26385,35 +26848,41 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11972,7 +12136,7 @@
_ACEOF
fi
-@@ -26428,10 +26783,10 @@
+@@ -26428,10 +26897,10 @@
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -11986,7 +12150,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-@@ -26463,37 +26818,41 @@
+@@ -26463,37 +26932,41 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12038,7 +12202,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-@@ -26525,37 +26884,41 @@
+@@ -26525,37 +26998,41 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12090,7 +12254,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-@@ -26587,32 +26950,36 @@
+@@ -26587,32 +27064,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12134,7 +12298,7 @@
if test $ac_cv_lib_intl_dgettext = yes; then
gt_cv_func_dgettext_libintl=yes
fi
-@@ -26623,14 +26990,14 @@
+@@ -26623,14 +27104,14 @@
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -12156,7 +12320,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl -liconv $LIBS"
-@@ -26662,37 +27029,41 @@
+@@ -26662,37 +27143,41 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12208,7 +12372,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl -liconv $LIBS"
-@@ -26724,32 +27095,36 @@
+@@ -26724,32 +27209,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12252,7 +12416,7 @@
if test $ac_cv_lib_intl_dcgettext = yes; then
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
-@@ -26775,11 +27150,11 @@
+@@ -26775,11 +27264,11 @@
for ac_func in bind_textdomain_codeset
do
@@ -12268,7 +12432,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26832,35 +27207,41 @@
+@@ -26832,35 +27321,41 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12320,7 +12484,7 @@
_ACEOF
fi
-@@ -26896,10 +27277,10 @@
+@@ -26896,10 +27391,10 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -12334,7 +12498,7 @@
else
case "$MSGFMT" in
/*)
-@@ -26923,11 +27304,11 @@
+@@ -26923,11 +27418,11 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -12350,7 +12514,7 @@
fi
if test "$MSGFMT" != "no"; then
glib_save_LIBS="$LIBS"
-@@ -26935,11 +27316,11 @@
+@@ -26935,11 +27430,11 @@
for ac_func in dcgettext
do
@@ -12366,7 +12530,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26992,43 +27373,49 @@
+@@ -26992,43 +27487,49 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12428,7 +12592,7 @@
cat >conftest.foo <<_ACEOF
msgid ""
-@@ -27042,25 +27429,25 @@
+@@ -27042,25 +27543,25 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -12463,7 +12627,7 @@
else
case $GMSGFMT in
[\\/]* | ?:[\\/]*)
-@@ -27075,7 +27462,7 @@
+@@ -27075,7 +27576,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
@@ -12472,7 +12636,7 @@
break 2
fi
done
-@@ -27088,20 +27475,20 @@
+@@ -27088,20 +27589,20 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -12500,7 +12664,7 @@
else
case "$XGETTEXT" in
/*)
-@@ -27125,11 +27512,11 @@
+@@ -27125,11 +27626,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -12516,7 +12680,7 @@
fi
cat >conftest.$ac_ext <<_ACEOF
-@@ -27154,30 +27541,33 @@
+@@ -27154,30 +27655,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12558,7 +12722,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27230,31 +27620,35 @@
+@@ -27230,31 +27734,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12601,7 +12765,7 @@
if test $ac_cv_func_bind_textdomain_codeset = yes; then
CATOBJEXT=.gmo
DATADIRNAME=share
-@@ -27271,6 +27665,7 @@
+@@ -27271,6 +27779,7 @@
esac
fi
@@ -12609,7 +12773,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
-@@ -27296,8 +27691,8 @@
+@@ -27296,8 +27805,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -12620,7 +12784,7 @@
XGETTEXT=":"
fi
fi
-@@ -27329,8 +27724,8 @@
+@@ -27329,8 +27838,8 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -12631,7 +12795,7 @@
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
useit=no
-@@ -27354,8 +27749,8 @@
+@@ -27354,8 +27863,8 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -12642,7 +12806,7 @@
fi
if test -n "$LINGUAS"; then
-@@ -27395,10 +27790,10 @@
+@@ -27395,10 +27904,10 @@
gdu_cv_version_required=0.3.2
if test -n "$PKG_CONFIG" && \
@@ -12655,7 +12819,7 @@
(exit $ac_status); }; then
gdu_cv_have_gdu=yes
else
-@@ -27408,8 +27803,8 @@
+@@ -27408,8 +27917,8 @@
if test "$gdu_cv_have_gdu" = "yes"; then
:
else
@@ -12666,7 +12830,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -27527,20 +27922,21 @@
+@@ -27527,20 +28036,21 @@
for ac_header in err.h sys/sysctl.h
do
@@ -12697,7 +12861,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27556,32 +27952,33 @@
+@@ -27556,32 +28066,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12738,7 +12902,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27595,69 +27992,72 @@
+@@ -27595,69 +28106,72 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12840,7 +13004,7 @@
_ACEOF
fi
-@@ -27667,10 +28067,10 @@
+@@ -27667,10 +28181,10 @@
case "${host}" in
powerpc-*-linux*)
NEED_LIBAPM=yes
@@ -12854,7 +13018,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lapm $LIBS"
-@@ -27702,32 +28102,36 @@
+@@ -27702,32 +28216,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12898,7 +13062,7 @@
if test $ac_cv_lib_apm_apm_read = yes; then
HAVE_LIBAPM=yes
else
-@@ -27738,10 +28142,10 @@
+@@ -27738,10 +28256,10 @@
# list of supported OS cores that use libapm
*-*-linux*)
NEED_LIBAPM=yes
@@ -12912,7 +13076,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lapm $LIBS"
-@@ -27773,32 +28177,36 @@
+@@ -27773,32 +28291,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12956,7 +13120,7 @@
if test $ac_cv_lib_apm_apm_read = yes; then
HAVE_LIBAPM=yes
else
-@@ -27817,17 +28225,17 @@
+@@ -27817,17 +28339,17 @@
savecppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $ACPIINC"
if test "${ac_cv_header_dev_acpica_acpiio_h+set}" = set; then
@@ -12981,7 +13145,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27843,32 +28251,33 @@
+@@ -27843,32 +28365,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13022,7 +13186,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27882,63 +28291,64 @@
+@@ -27882,63 +28405,64 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13113,7 +13277,7 @@
fi
if test $ac_cv_header_dev_acpica_acpiio_h = yes; then
-@@ -28028,13 +28438,13 @@
+@@ -28028,13 +28552,13 @@
withval=$with_gstreamer; case "${withval}" in
0.8) GST_MAJORMINOR=0.8 ;;
0.10) GST_MAJORMINOR=0.10 ;;
@@ -13129,7 +13293,7 @@
*** Bad value ${withval} for --with-gstreamer
*** Please use one of the following:
*** --with-gstreamer=0.8
-@@ -28056,18 +28466,18 @@
+@@ -28056,18 +28580,18 @@
MIXER_LIBS=
pkg_failed=no
@@ -13152,7 +13316,7 @@
(exit $ac_status); }; then
pkg_cv_MIXER_CFLAGS=`$PKG_CONFIG --cflags "$GST10_PKGS" 2>/dev/null`
else
-@@ -28082,10 +28492,10 @@
+@@ -28082,10 +28606,10 @@
pkg_cv_MIXER_LIBS="$MIXER_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -13165,7 +13329,7 @@
(exit $ac_status); }; then
pkg_cv_MIXER_LIBS=`$PKG_CONFIG --libs "$GST10_PKGS" 2>/dev/null`
else
-@@ -28113,16 +28523,16 @@
+@@ -28113,16 +28637,16 @@
# Put the nasty error message in config.log where it belongs
echo "$MIXER_PKG_ERRORS" >&5
@@ -13186,7 +13350,7 @@
HAVE_GST_VER=0.10
fi
fi
-@@ -28133,18 +28543,18 @@
+@@ -28133,18 +28657,18 @@
MIXER_LIBS=
pkg_failed=no
@@ -13209,7 +13373,7 @@
(exit $ac_status); }; then
pkg_cv_MIXER_CFLAGS=`$PKG_CONFIG --cflags "$GST8_PKGS" 2>/dev/null`
else
-@@ -28159,10 +28569,10 @@
+@@ -28159,10 +28683,10 @@
pkg_cv_MIXER_LIBS="$MIXER_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -13222,7 +13386,7 @@
(exit $ac_status); }; then
pkg_cv_MIXER_LIBS=`$PKG_CONFIG --libs "$GST8_PKGS" 2>/dev/null`
else
-@@ -28190,16 +28600,16 @@
+@@ -28190,16 +28714,16 @@
# Put the nasty error message in config.log where it belongs
echo "$MIXER_PKG_ERRORS" >&5
@@ -13243,7 +13407,7 @@
HAVE_GST_VER=0.8
fi
fi
-@@ -28207,19 +28617,19 @@
+@@ -28207,19 +28731,19 @@
case $HAVE_GST_VER in
0.8|0.10)
HAVE_GST="yes"
@@ -13271,7 +13435,7 @@
{ (exit 1); exit 1; }; }
;;
esac
-@@ -28257,17 +28667,17 @@
+@@ -28257,17 +28781,17 @@
savecppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
if test "${ac_cv_header_X11_extensions_XKB_h+set}" = set; then
@@ -13296,7 +13460,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28283,32 +28693,33 @@
+@@ -28283,32 +28807,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13337,7 +13501,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28322,63 +28733,64 @@
+@@ -28322,63 +28847,64 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13428,7 +13592,7 @@
fi
if test $ac_cv_header_X11_extensions_XKB_h = yes; then
-@@ -28399,211 +28811,97 @@
+@@ -28399,211 +28925,97 @@
fi
if test "x$APPLET_ACCESSX" = "xtrue"; then
@@ -13470,7 +13634,9 @@
-done
-done
-IFS=$as_save_IFS
--
++MODEMLIGHTS_LIBS=
++MODEMLIGHTS_CFLAGS=
+
- ;;
-esac
-fi
@@ -13482,9 +13648,10 @@
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-+MODEMLIGHTS_LIBS=
-+MODEMLIGHTS_CFLAGS=
-
+
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for MODEMLIGHTS" >&5
++$as_echo_n "checking for MODEMLIGHTS... " >&6; }
-{ echo "$as_me:$LINENO: checking for forkpty in -lutil" >&5
-echo $ECHO_N "checking for forkpty in -lutil... $ECHO_C" >&6; }
@@ -13499,10 +13666,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+pkg_failed=no
-+{ $as_echo "$as_me:$LINENO: checking for MODEMLIGHTS" >&5
-+$as_echo_n "checking for MODEMLIGHTS... " >&6; }
-
+-
-/* 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. */
@@ -13704,7 +13868,7 @@
if test "x$BUILD_MODEM_LIGHTS" = "xyes"; then
APPLET_MODEMLIGHTS_TRUE=
APPLET_MODEMLIGHTS_FALSE='#'
-@@ -28639,17 +28937,17 @@
+@@ -28639,17 +29051,17 @@
if test "${ac_cv_header_cpufreq_h+set}" = set; then
@@ -13729,7 +13893,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28665,32 +28963,33 @@
+@@ -28665,32 +29077,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13770,7 +13934,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28704,63 +29003,64 @@
+@@ -28704,63 +29117,64 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13861,7 +14025,7 @@
fi
if test $ac_cv_header_cpufreq_h = yes; then
-@@ -28797,8 +29097,8 @@
+@@ -28797,8 +29211,8 @@
build_cpufreq_applet=yes
;;
*)
@@ -13872,7 +14036,7 @@
build_cpufreq_applet=no
;;
esac
-@@ -28833,10 +29133,10 @@
+@@ -28833,10 +29247,10 @@
if test "x$HAVE_PYGTK" = "xyes" -a "x$HAVE_PYHDRS" = "xyes"; then
py_mod_var=`echo gnomeapplet'_' | sed 'y%./+-%__p_%'`
@@ -13886,7 +14050,7 @@
else
prog="
-@@ -28859,12 +29159,12 @@
+@@ -28859,12 +29273,12 @@
py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
if test "x$py_val" != xno; then
@@ -13903,7 +14067,7 @@
BUILD_INVEST_APPLET="no"
fi
-@@ -28881,8 +29181,8 @@
+@@ -28881,8 +29295,8 @@
fi
@@ -13914,7 +14078,7 @@
# Check whether --enable-ipv6 was given.
if test "${enable_ipv6+set}" = set; then
enableval=$enable_ipv6;
-@@ -28917,20 +29217,21 @@
+@@ -28917,20 +29331,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13939,7 +14103,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
have_ipv6=no
-@@ -28938,8 +29239,8 @@
+@@ -28938,8 +29353,8 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -13950,7 +14114,7 @@
if test $have_ipv6 = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -28950,10 +29251,10 @@
+@@ -28950,10 +29365,10 @@
fi
have_getaddrinfo=no
@@ -13964,7 +14128,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -29006,31 +29307,35 @@
+@@ -29006,31 +29421,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14007,7 +14171,7 @@
if test $ac_cv_func_getaddrinfo = yes; then
have_getaddrinfo=yes
fi
-@@ -29038,11 +29343,11 @@
+@@ -29038,11 +29457,11 @@
if test $have_getaddrinfo != yes; then
# getaddrinfo is not in the default libraries. See if it's in some other.
for lib in bsd socket inet; do
@@ -14023,7 +14187,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-l$lib $LIBS"
-@@ -29074,34 +29379,40 @@
+@@ -29074,34 +29493,40 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14073,7 +14237,7 @@
LIBS="$LIBS -l$lib";have_getaddrinfo=yes; break
fi
-@@ -29115,10 +29426,10 @@
+@@ -29115,10 +29540,10 @@
fi
@@ -14087,7 +14251,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -29144,20 +29455,21 @@
+@@ -29144,20 +29569,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14112,7 +14276,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -29184,20 +29496,21 @@
+@@ -29184,20 +29610,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14137,7 +14301,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_member_struct_tm_tm_gmtoff=no
-@@ -29208,8 +29521,8 @@
+@@ -29208,8 +29635,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -14148,7 +14312,7 @@
if test $ac_cv_member_struct_tm_tm_gmtoff = yes; then
struct_tm_tm_gmtoff=true
else
-@@ -29225,10 +29538,10 @@
+@@ -29225,10 +29652,10 @@
;;
*)
@@ -14162,7 +14326,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -29257,20 +29570,21 @@
+@@ -29257,20 +29684,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14187,7 +14351,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_decl_timezone=no
-@@ -29278,8 +29592,8 @@
+@@ -29278,8 +29706,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -14198,7 +14362,7 @@
if test $ac_cv_have_decl_timezone = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -29291,8 +29605,8 @@
+@@ -29291,8 +29719,8 @@
;;
esac
@@ -14209,7 +14373,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29317,30 +29631,34 @@
+@@ -29317,30 +29745,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14251,7 +14415,7 @@
if test "$gtk_ok" = "yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -29574,11 +29892,12 @@
+@@ -29574,11 +30006,12 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -14266,7 +14430,7 @@
*) $as_unset $ac_var ;;
esac ;;
esac
-@@ -29611,12 +29930,12 @@
+@@ -29611,12 +30044,12 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -14283,7 +14447,7 @@
fi
fi
rm -f confcache
-@@ -29632,7 +29951,7 @@
+@@ -29632,7 +30065,7 @@
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -14292,7 +14456,7 @@
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-@@ -29644,23 +29963,23 @@
+@@ -29644,23 +30077,23 @@
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -14322,7 +14486,7 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-@@ -29669,187 +29988,188 @@
+@@ -29669,187 +30102,188 @@
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
@@ -14564,7 +14728,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -29862,7 +30182,7 @@
+@@ -29862,7 +30296,7 @@
SHELL=\${CONFIG_SHELL-$SHELL}
_ACEOF
@@ -14573,7 +14737,7 @@
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
-@@ -29872,7 +30192,7 @@
+@@ -29872,7 +30306,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -14582,7 +14746,7 @@
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-@@ -29894,17 +30214,45 @@
+@@ -29894,17 +30328,45 @@
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
@@ -14637,7 +14801,7 @@
fi
# Support unset when possible.
-@@ -29920,8 +30268,6 @@
+@@ -29920,8 +30382,6 @@
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
@@ -14646,7 +14810,7 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-@@ -29944,7 +30290,7 @@
+@@ -29944,7 +30404,7 @@
as_myself=$0
fi
if test ! -f "$as_myself"; then
@@ -14655,7 +14819,7 @@
{ (exit 1); exit 1; }
fi
-@@ -29957,17 +30303,10 @@
+@@ -29957,17 +30417,10 @@
PS4='+ '
# NLS nuisances.
@@ -14677,7 +14841,7 @@
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -29989,7 +30328,7 @@
+@@ -29989,7 +30442,7 @@
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
@@ -14686,7 +14850,7 @@
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
-@@ -30040,7 +30379,7 @@
+@@ -30040,7 +30493,7 @@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
@@ -14695,7 +14859,7 @@
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
-@@ -30068,7 +30407,6 @@
+@@ -30068,7 +30521,6 @@
*)
ECHO_N='-n';;
esac
@@ -14703,7 +14867,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -30081,19 +30419,22 @@
+@@ -30081,19 +30533,22 @@
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
@@ -14737,7 +14901,7 @@
else
as_ln_s='cp -p'
fi
-@@ -30118,10 +30459,10 @@
+@@ -30118,10 +30573,10 @@
as_test_x='
eval sh -c '\''
if test -d "$1"; then
@@ -14750,16 +14914,16 @@
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
-@@ -30144,7 +30485,7 @@
+@@ -30144,7 +30599,7 @@
# values after options handling.
ac_log="
- This file was extended by gnome-applets $as_me 2.22.2, which was
+ This file was extended by gnome-applets $as_me 2.22.3, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+generated by GNU Autoconf 2.62. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -30157,7 +30498,7 @@
+@@ -30157,7 +30612,7 @@
_ACEOF
@@ -14768,7 +14932,7 @@
# Files that config.status was made for.
config_files="$ac_config_files"
config_headers="$ac_config_headers"
-@@ -30165,7 +30506,7 @@
+@@ -30165,7 +30620,7 @@
_ACEOF
@@ -14777,7 +14941,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -30178,9 +30519,9 @@
+@@ -30178,9 +30633,9 @@
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE]
@@ -14789,14 +14953,14 @@
Configuration files:
$config_files
-@@ -30194,13 +30535,13 @@
+@@ -30194,13 +30649,13 @@
Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
- gnome-applets config.status 2.22.2
+ gnome-applets config.status 2.22.3
-configured by $0, generated by GNU Autoconf 2.61,
- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.62,
@@ -14807,7 +14971,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -30208,11 +30549,12 @@
+@@ -30208,11 +30663,12 @@
srcdir='$srcdir'
INSTALL='$INSTALL'
MKDIR_P='$MKDIR_P'
@@ -14823,7 +14987,7 @@
ac_need_defaults=:
while test $# != 0
do
-@@ -30234,30 +30576,36 @@
+@@ -30234,30 +30690,36 @@
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
@@ -14866,7 +15030,7 @@
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; } ;;
-@@ -30276,27 +30624,29 @@
+@@ -30276,39 +30738,38 @@
fi
_ACEOF
@@ -14903,7 +15067,11 @@
#
# INIT-COMMANDS
#
-@@ -30308,7 +30658,7 @@
+ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+-INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
+-prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
+-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'
+
_ACEOF
@@ -14912,7 +15080,15 @@
# Handling of arguments.
for ac_config_target in $ac_config_targets
-@@ -30371,8 +30721,8 @@
+@@ -30316,7 +30777,6 @@
+ case $ac_config_target in
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+- "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
+ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+ "gnome-applets.spec") CONFIG_FILES="$CONFIG_FILES gnome-applets.spec" ;;
+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+@@ -30371,8 +30831,8 @@
"null_applet/Makefile") CONFIG_FILES="$CONFIG_FILES null_applet/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -14923,7 +15099,7 @@
{ (exit 1); exit 1; }; };;
esac
done
-@@ -30413,483 +30763,143 @@
+@@ -30413,483 +30873,143 @@
(umask 077 && mkdir "$tmp")
} ||
{
@@ -15514,7 +15690,7 @@
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
-@@ -30905,19 +30915,133 @@
+@@ -30905,19 +31025,133 @@
}'
fi
@@ -15633,9 +15809,9 @@
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+ { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
++
-for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
-+
+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
+shift
+for ac_tag
@@ -15652,7 +15828,7 @@
{ (exit 1); exit 1; }; };;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-@@ -30946,26 +31070,38 @@
+@@ -30946,26 +31180,38 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -15699,7 +15875,7 @@
esac
;;
esac
-@@ -30975,7 +31111,7 @@
+@@ -30975,7 +31221,7 @@
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
@@ -15708,7 +15884,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -31001,7 +31137,7 @@
+@@ -31001,7 +31247,7 @@
as_dirs=
while :; do
case $as_dir in #(
@@ -15717,7 +15893,7 @@
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
-@@ -31010,7 +31146,7 @@
+@@ -31010,7 +31256,7 @@
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
@@ -15726,7 +15902,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -31031,17 +31167,17 @@
+@@ -31031,17 +31277,17 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -15748,7 +15924,7 @@
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -31086,12 +31222,13 @@
+@@ -31086,12 +31332,13 @@
esac
_ACEOF
@@ -15764,7 +15940,7 @@
p
q
}
-@@ -31100,13 +31237,14 @@
+@@ -31100,13 +31347,14 @@
/@infodir@/p
/@localedir@/p
/@mandir@/p
@@ -15783,7 +15959,7 @@
ac_datarootdir_hack='
s&@datadir@&$datadir&g
s&@docdir@&$docdir&g
-@@ -31120,15 +31258,16 @@
+@@ -31120,15 +31368,16 @@
# Neutralize VPATH when `$srcdir' = `.'.
# Shell code in configure.ac might set extrasub.
# FIXME: do we really want to maintain this feature?
@@ -15804,7 +15980,7 @@
s&@srcdir@&$ac_srcdir&;t t
s&@abs_srcdir@&$ac_abs_srcdir&;t t
s&@top_srcdir@&$ac_top_srcdir&;t t
-@@ -31139,121 +31278,60 @@
+@@ -31139,121 +31388,60 @@
s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
@@ -15961,7 +16137,7 @@
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
-@@ -31268,7 +31346,7 @@
+@@ -31268,7 +31456,7 @@
X"$_am_arg" : 'X\(//\)[^/]' \| \
X"$_am_arg" : 'X\(//\)$' \| \
X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
@@ -15970,7 +16146,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -31288,8 +31366,8 @@
+@@ -31288,8 +31476,8 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -15981,7 +16157,7 @@
;;
esac
-@@ -31311,7 +31389,7 @@
+@@ -31311,7 +31499,7 @@
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
@@ -15990,7 +16166,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -31355,7 +31433,7 @@
+@@ -31355,7 +31543,7 @@
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
X"$file" : 'X\(/\)' \| . 2>/dev/null ||
@@ -15999,7 +16175,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -31381,7 +31459,7 @@
+@@ -31381,7 +31569,7 @@
as_dirs=
while :; do
case $as_dir in #(
@@ -16008,7 +16184,7 @@
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
-@@ -31390,7 +31468,7 @@
+@@ -31390,7 +31578,7 @@
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
@@ -16017,7 +16193,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -31411,8 +31489,8 @@
+@@ -31411,31 +31599,14 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -16028,7 +16204,30 @@
{ (exit 1); exit 1; }; }; }
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
-@@ -31449,8 +31527,8 @@
+ done
+ done
+ ;;
+- "intltool":C)
+-
+-for file in intltool-extract intltool-merge intltool-update; do
+- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
+- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
+- < ${ac_aux_dir}/${file}.in > ${file}.out
+- if cmp -s ${file} ${file}.out 2>/dev/null; then
+- rm -f ${file}.out
+- else
+- mv -f ${file}.out ${file}
+- fi
+- chmod ugo+x ${file}
+- chmod u+w ${file}
+-done
+-
+- ;;
+ "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+ esac ;;
+@@ -31449,8 +31620,8 @@
"$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
if test ! -f "po/Makefile"; then
@@ -16039,7 +16238,7 @@
{ (exit 1); exit 1; }; }
fi
mv "po/Makefile" "po/Makefile.tmp"
-@@ -31472,6 +31550,11 @@
+@@ -31472,6 +31643,11 @@
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
@@ -16051,7 +16250,7 @@
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
-@@ -31493,6 +31576,10 @@
+@@ -31493,6 +31669,10 @@
# would make configure fail if this is the last instruction.
$ac_cs_success || { (exit 1); exit 1; }
fi
@@ -16062,9 +16261,9 @@
echo "
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/cpufreq/help/Makefile.in gnome-applets-2.22.2/cpufreq/help/Makefile.in
---- gnome-applets-2.22.2.old/cpufreq/help/Makefile.in 2008-05-28 04:59:05.000000000 +0200
-+++ gnome-applets-2.22.2/cpufreq/help/Makefile.in 2008-06-02 14:54:05.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/cpufreq/help/Makefile.in gnome-applets-2.22.3/cpufreq/help/Makefile.in
+--- gnome-applets-2.22.3.old/cpufreq/help/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/cpufreq/help/Makefile.in 2008-06-30 12:57:48.000000000 +0200
@@ -62,7 +62,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16099,9 +16298,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/cpufreq/Makefile.in gnome-applets-2.22.2/cpufreq/Makefile.in
---- gnome-applets-2.22.2.old/cpufreq/Makefile.in 2008-05-28 04:59:05.000000000 +0200
-+++ gnome-applets-2.22.2/cpufreq/Makefile.in 2008-06-02 14:54:05.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/cpufreq/Makefile.in gnome-applets-2.22.3/cpufreq/Makefile.in
+--- gnome-applets-2.22.3.old/cpufreq/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/cpufreq/Makefile.in 2008-06-30 12:57:48.000000000 +0200
@@ -39,7 +39,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16136,9 +16335,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = help pixmaps src
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/cpufreq/pixmaps/Makefile.in gnome-applets-2.22.2/cpufreq/pixmaps/Makefile.in
---- gnome-applets-2.22.2.old/cpufreq/pixmaps/Makefile.in 2008-05-28 04:59:05.000000000 +0200
-+++ gnome-applets-2.22.2/cpufreq/pixmaps/Makefile.in 2008-06-02 14:54:05.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/cpufreq/pixmaps/Makefile.in gnome-applets-2.22.3/cpufreq/pixmaps/Makefile.in
+--- gnome-applets-2.22.3.old/cpufreq/pixmaps/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/cpufreq/pixmaps/Makefile.in 2008-06-30 12:57:48.000000000 +0200
@@ -38,7 +38,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16173,9 +16372,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
cpufreq_pixmapdir = $(pixmapsdir)/cpufreq-applet
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/cpufreq/src/cpufreq-selector/Makefile.in gnome-applets-2.22.2/cpufreq/src/cpufreq-selector/Makefile.in
---- gnome-applets-2.22.2.old/cpufreq/src/cpufreq-selector/Makefile.in 2008-05-28 04:59:05.000000000 +0200
-+++ gnome-applets-2.22.2/cpufreq/src/cpufreq-selector/Makefile.in 2008-06-02 14:54:05.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/cpufreq/src/cpufreq-selector/Makefile.in gnome-applets-2.22.3/cpufreq/src/cpufreq-selector/Makefile.in
+--- gnome-applets-2.22.3.old/cpufreq/src/cpufreq-selector/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/cpufreq/src/cpufreq-selector/Makefile.in 2008-06-30 12:57:49.000000000 +0200
@@ -39,7 +39,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16210,9 +16409,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
cpufreqselectordir = $(bindir)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/cpufreq/src/Makefile.in gnome-applets-2.22.2/cpufreq/src/Makefile.in
---- gnome-applets-2.22.2.old/cpufreq/src/Makefile.in 2008-05-28 04:59:05.000000000 +0200
-+++ gnome-applets-2.22.2/cpufreq/src/Makefile.in 2008-06-02 14:54:05.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/cpufreq/src/Makefile.in gnome-applets-2.22.3/cpufreq/src/Makefile.in
+--- gnome-applets-2.22.3.old/cpufreq/src/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/cpufreq/src/Makefile.in 2008-06-30 12:57:49.000000000 +0200
@@ -39,7 +39,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16247,9 +16446,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@BUILD_CPUFREQ_SELECTOR_TRUE at selector_SUBDIR = cpufreq-selector
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/drivemount/help/Makefile.in gnome-applets-2.22.2/drivemount/help/Makefile.in
---- gnome-applets-2.22.2.old/drivemount/help/Makefile.in 2008-05-28 04:59:05.000000000 +0200
-+++ gnome-applets-2.22.2/drivemount/help/Makefile.in 2008-06-02 14:54:06.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/drivemount/help/Makefile.in gnome-applets-2.22.3/drivemount/help/Makefile.in
+--- gnome-applets-2.22.3.old/drivemount/help/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/drivemount/help/Makefile.in 2008-06-30 12:57:50.000000000 +0200
@@ -62,7 +62,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16284,9 +16483,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/drivemount/Makefile.in gnome-applets-2.22.2/drivemount/Makefile.in
---- gnome-applets-2.22.2.old/drivemount/Makefile.in 2008-05-28 04:59:05.000000000 +0200
-+++ gnome-applets-2.22.2/drivemount/Makefile.in 2008-06-02 14:54:06.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/drivemount/Makefile.in gnome-applets-2.22.3/drivemount/Makefile.in
+--- gnome-applets-2.22.3.old/drivemount/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/drivemount/Makefile.in 2008-06-30 12:57:49.000000000 +0200
@@ -41,7 +41,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16321,9 +16520,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = help
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/geyes/docs/Makefile.in gnome-applets-2.22.2/geyes/docs/Makefile.in
---- gnome-applets-2.22.2.old/geyes/docs/Makefile.in 2008-05-28 04:59:05.000000000 +0200
-+++ gnome-applets-2.22.2/geyes/docs/Makefile.in 2008-06-02 14:54:06.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/geyes/docs/Makefile.in gnome-applets-2.22.3/geyes/docs/Makefile.in
+--- gnome-applets-2.22.3.old/geyes/docs/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/geyes/docs/Makefile.in 2008-06-30 12:57:50.000000000 +0200
@@ -62,7 +62,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16358,9 +16557,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/geyes/Makefile.in gnome-applets-2.22.2/geyes/Makefile.in
---- gnome-applets-2.22.2.old/geyes/Makefile.in 2008-05-28 04:59:05.000000000 +0200
-+++ gnome-applets-2.22.2/geyes/Makefile.in 2008-06-02 14:54:06.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/geyes/Makefile.in gnome-applets-2.22.3/geyes/Makefile.in
+--- gnome-applets-2.22.3.old/geyes/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/geyes/Makefile.in 2008-06-30 12:57:50.000000000 +0200
@@ -41,7 +41,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16395,9 +16594,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = themes docs
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/geyes/themes/Makefile.in gnome-applets-2.22.2/geyes/themes/Makefile.in
---- gnome-applets-2.22.2.old/geyes/themes/Makefile.in 2008-05-28 04:59:06.000000000 +0200
-+++ gnome-applets-2.22.2/geyes/themes/Makefile.in 2008-06-02 14:54:06.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/geyes/themes/Makefile.in gnome-applets-2.22.3/geyes/themes/Makefile.in
+--- gnome-applets-2.22.3.old/geyes/themes/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/geyes/themes/Makefile.in 2008-06-30 12:57:51.000000000 +0200
@@ -40,7 +40,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16432,9 +16631,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
Defaultdir = $(pkgdatadir)/geyes/Default
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/gkb-new/Makefile.in gnome-applets-2.22.2/gkb-new/Makefile.in
---- gnome-applets-2.22.2.old/gkb-new/Makefile.in 2008-05-28 04:59:06.000000000 +0200
-+++ gnome-applets-2.22.2/gkb-new/Makefile.in 2008-06-02 14:54:07.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/gkb-new/Makefile.in gnome-applets-2.22.3/gkb-new/Makefile.in
+--- gnome-applets-2.22.3.old/gkb-new/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/gkb-new/Makefile.in 2008-06-30 12:57:51.000000000 +0200
@@ -38,7 +38,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16469,9 +16668,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@GKB_SUN_FALSE at gkb_DDIRS = xmodmap
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/gkb-new/xmodmap/Makefile.in gnome-applets-2.22.2/gkb-new/xmodmap/Makefile.in
---- gnome-applets-2.22.2.old/gkb-new/xmodmap/Makefile.in 2008-05-28 04:59:06.000000000 +0200
-+++ gnome-applets-2.22.2/gkb-new/xmodmap/Makefile.in 2008-06-02 14:54:07.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/gkb-new/xmodmap/Makefile.in gnome-applets-2.22.3/gkb-new/xmodmap/Makefile.in
+--- gnome-applets-2.22.3.old/gkb-new/xmodmap/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/gkb-new/xmodmap/Makefile.in 2008-06-30 12:57:52.000000000 +0200
@@ -38,7 +38,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16506,9 +16705,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(GKB_MAPS) $(xmm_xml_in_file)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/gkb-new/xmodmap.sun/Makefile.in gnome-applets-2.22.2/gkb-new/xmodmap.sun/Makefile.in
---- gnome-applets-2.22.2.old/gkb-new/xmodmap.sun/Makefile.in 2008-05-28 04:59:06.000000000 +0200
-+++ gnome-applets-2.22.2/gkb-new/xmodmap.sun/Makefile.in 2008-06-02 14:54:07.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/gkb-new/xmodmap.sun/Makefile.in gnome-applets-2.22.3/gkb-new/xmodmap.sun/Makefile.in
+--- gnome-applets-2.22.3.old/gkb-new/xmodmap.sun/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/gkb-new/xmodmap.sun/Makefile.in 2008-06-30 12:57:51.000000000 +0200
@@ -38,7 +38,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16543,9 +16742,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(GKB_MAPS) $(xmm_xml_in_file)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/gswitchit/help/Makefile.in gnome-applets-2.22.2/gswitchit/help/Makefile.in
---- gnome-applets-2.22.2.old/gswitchit/help/Makefile.in 2008-05-28 04:59:06.000000000 +0200
-+++ gnome-applets-2.22.2/gswitchit/help/Makefile.in 2008-06-02 14:54:07.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/gswitchit/help/Makefile.in gnome-applets-2.22.3/gswitchit/help/Makefile.in
+--- gnome-applets-2.22.3.old/gswitchit/help/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/gswitchit/help/Makefile.in 2008-06-30 12:57:53.000000000 +0200
@@ -62,7 +62,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16580,9 +16779,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/gswitchit/Makefile.in gnome-applets-2.22.2/gswitchit/Makefile.in
---- gnome-applets-2.22.2.old/gswitchit/Makefile.in 2008-05-28 04:59:06.000000000 +0200
-+++ gnome-applets-2.22.2/gswitchit/Makefile.in 2008-06-02 14:54:07.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/gswitchit/Makefile.in gnome-applets-2.22.3/gswitchit/Makefile.in
+--- gnome-applets-2.22.3.old/gswitchit/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/gswitchit/Makefile.in 2008-06-30 12:57:53.000000000 +0200
@@ -41,7 +41,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16617,9 +16816,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = help
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/gweather/docs/Makefile.in gnome-applets-2.22.2/gweather/docs/Makefile.in
---- gnome-applets-2.22.2.old/gweather/docs/Makefile.in 2008-05-28 04:59:06.000000000 +0200
-+++ gnome-applets-2.22.2/gweather/docs/Makefile.in 2008-06-02 14:54:08.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/gweather/docs/Makefile.in gnome-applets-2.22.3/gweather/docs/Makefile.in
+--- gnome-applets-2.22.3.old/gweather/docs/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/gweather/docs/Makefile.in 2008-06-30 12:57:54.000000000 +0200
@@ -62,7 +62,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16654,9 +16853,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/gweather/Makefile.in gnome-applets-2.22.2/gweather/Makefile.in
---- gnome-applets-2.22.2.old/gweather/Makefile.in 2008-05-28 04:59:06.000000000 +0200
-+++ gnome-applets-2.22.2/gweather/Makefile.in 2008-06-02 14:54:08.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/gweather/Makefile.in gnome-applets-2.22.3/gweather/Makefile.in
+--- gnome-applets-2.22.3.old/gweather/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/gweather/Makefile.in 2008-06-30 12:57:54.000000000 +0200
@@ -41,7 +41,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16691,21 +16890,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = docs
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/intltool-extract.in gnome-applets-2.22.2/intltool-extract.in
---- gnome-applets-2.22.2.old/intltool-extract.in 2008-05-28 04:58:58.000000000 +0200
-+++ gnome-applets-2.22.2/intltool-extract.in 2008-06-02 14:53:47.000000000 +0200
-@@ -764,7 +764,7 @@
- }
-
- ## handle new glade files
-- while ($input =~ /<(property|atkproperty|col)\s+[^>]*translatable\s*=\s*"yes"(?:\s+[^>]*comments\s*=\s*"([^"]*)")?[^>]*>([^<]+)<\/\1>/sg) {
-+ while ($input =~ /<(property|atkproperty)\s+[^>]*translatable\s*=\s*"yes"(?:\s+[^>]*comments\s*=\s*"([^"]*)")?[^>]*>([^<]+)<\/\1>/sg) {
- $messages{entity_decode($3)} = [] unless $3 =~ /^(window|label)[0-9]+$/;
- if (defined($2) and !($3 =~ /^(window|label)[0-9]+$/)) {
- $comments{entity_decode($3)} = entity_decode($2) ;
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/invest-applet/data/art/Makefile.in gnome-applets-2.22.2/invest-applet/data/art/Makefile.in
---- gnome-applets-2.22.2.old/invest-applet/data/art/Makefile.in 2008-05-28 04:59:06.000000000 +0200
-+++ gnome-applets-2.22.2/invest-applet/data/art/Makefile.in 2008-06-02 14:54:08.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/invest-applet/data/art/Makefile.in gnome-applets-2.22.3/invest-applet/data/art/Makefile.in
+--- gnome-applets-2.22.3.old/invest-applet/data/art/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/invest-applet/data/art/Makefile.in 2008-06-30 12:57:55.000000000 +0200
@@ -38,7 +38,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16740,9 +16927,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
pixmaps_DATA = invest-big.png
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/invest-applet/data/Makefile.in gnome-applets-2.22.2/invest-applet/data/Makefile.in
---- gnome-applets-2.22.2.old/invest-applet/data/Makefile.in 2008-05-28 04:59:06.000000000 +0200
-+++ gnome-applets-2.22.2/invest-applet/data/Makefile.in 2008-06-02 14:54:08.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/invest-applet/data/Makefile.in gnome-applets-2.22.3/invest-applet/data/Makefile.in
+--- gnome-applets-2.22.3.old/invest-applet/data/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/invest-applet/data/Makefile.in 2008-06-30 12:57:55.000000000 +0200
@@ -38,7 +38,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16777,9 +16964,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = art
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/invest-applet/invest/Makefile.in gnome-applets-2.22.2/invest-applet/invest/Makefile.in
---- gnome-applets-2.22.2.old/invest-applet/invest/Makefile.in 2008-05-28 04:59:06.000000000 +0200
-+++ gnome-applets-2.22.2/invest-applet/invest/Makefile.in 2008-06-02 14:54:08.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/invest-applet/invest/Makefile.in gnome-applets-2.22.3/invest-applet/invest/Makefile.in
+--- gnome-applets-2.22.3.old/invest-applet/invest/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/invest-applet/invest/Makefile.in 2008-06-30 12:57:56.000000000 +0200
@@ -39,7 +39,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16814,9 +17001,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
bin_SCRIPTS = invest-chart
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/invest-applet/Makefile.in gnome-applets-2.22.2/invest-applet/Makefile.in
---- gnome-applets-2.22.2.old/invest-applet/Makefile.in 2008-05-28 04:59:06.000000000 +0200
-+++ gnome-applets-2.22.2/invest-applet/Makefile.in 2008-06-02 14:54:08.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/invest-applet/Makefile.in gnome-applets-2.22.3/invest-applet/Makefile.in
+--- gnome-applets-2.22.3.old/invest-applet/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/invest-applet/Makefile.in 2008-06-30 12:57:54.000000000 +0200
@@ -37,7 +37,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16851,9 +17038,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = invest data
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/ltmain.sh gnome-applets-2.22.2/ltmain.sh
---- gnome-applets-2.22.2.old/ltmain.sh 2008-02-08 01:57:47.000000000 +0100
-+++ gnome-applets-2.22.2/ltmain.sh 2008-04-29 23:33:55.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/ltmain.sh gnome-applets-2.22.3/ltmain.sh
+--- gnome-applets-2.22.3.old/ltmain.sh 2008-02-08 01:57:47.000000000 +0100
++++ gnome-applets-2.22.3/ltmain.sh 2008-04-29 23:33:55.000000000 +0200
@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
@@ -16863,9 +17050,102 @@
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/Makefile.in gnome-applets-2.22.2/Makefile.in
---- gnome-applets-2.22.2.old/Makefile.in 2008-05-28 04:59:08.000000000 +0200
-+++ gnome-applets-2.22.2/Makefile.in 2008-06-02 14:54:12.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/m4/intltool.m4 gnome-applets-2.22.3/m4/intltool.m4
+--- gnome-applets-2.22.3.old/m4/intltool.m4 2008-06-30 11:29:31.000000000 +0200
++++ gnome-applets-2.22.3/m4/intltool.m4 2008-06-30 12:56:57.000000000 +0200
+@@ -23,7 +23,7 @@
+ ## the same distribution terms that you use for the rest of that program.
+
+ dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+-# serial 36 IT_PROG_INTLTOOL
++# serial 40 IT_PROG_INTLTOOL
+ AC_DEFUN([IT_PROG_INTLTOOL],
+ [AC_PREREQ([2.50])dnl
+
+@@ -39,14 +39,21 @@
+ AC_MSG_CHECKING([for intltool >= $1])
+
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
+- [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
++ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
++ [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+ ]
+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
+ fi
+
++AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
++AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
++AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
++if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
++ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
++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 $< [$]@'
+ INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.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 $< [$]@'
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+@@ -101,12 +108,7 @@
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+ fi
+
+-# Use the tools built into the package, not the ones that are installed.
+-AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
+-AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
+-AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
+-
+-AC_PATH_PROG(INTLTOOL_PERL, perl)
++AC_PATH_PROG(INTLTOOL_PERL, [perl])
+ if test -z "$INTLTOOL_PERL"; then
+ AC_MSG_ERROR([perl not found; required for intltool])
+ fi
+@@ -152,42 +154,6 @@
+
+ IT_PO_SUBDIR([po])
+
+-dnl The following is very similar to
+-dnl
+-dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
+-dnl
+-dnl with the following slight differences:
+-dnl - the *.in files are in ac_aux_dir,
+-dnl - if the file haven't changed upon reconfigure, it's not touched,
+-dnl - the evaluation of the third parameter enables a hack which computes
+-dnl the actual value of $libdir,
+-dnl - the user sees "executing intltool commands", instead of
+-dnl "creating intltool-extract" and such.
+-dnl
+-dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
+-dnl a reason for it.
+-
+-AC_CONFIG_COMMANDS([intltool], [
+-
+-for file in intltool-extract intltool-merge intltool-update; do
+- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
+- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
+- < ${ac_aux_dir}/${file}.in > ${file}.out
+- if cmp -s ${file} ${file}.out 2>/dev/null; then
+- rm -f ${file}.out
+- else
+- mv -f ${file}.out ${file}
+- fi
+- chmod ugo+x ${file}
+- chmod u+w ${file}
+-done
+-
+-],
+-[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
+-prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
+-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
+-
+ ])
+
+
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/Makefile.in gnome-applets-2.22.3/Makefile.in
+--- gnome-applets-2.22.3.old/Makefile.in 2008-06-30 11:29:41.000000000 +0200
++++ gnome-applets-2.22.3/Makefile.in 2008-06-30 12:58:09.000000000 +0200
@@ -41,7 +41,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16900,9 +17180,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
gtop_applets = multiload
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/man/Makefile.in gnome-applets-2.22.2/man/Makefile.in
---- gnome-applets-2.22.2.old/man/Makefile.in 2008-05-28 04:59:07.000000000 +0200
-+++ gnome-applets-2.22.2/man/Makefile.in 2008-06-02 14:54:09.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/man/Makefile.in gnome-applets-2.22.3/man/Makefile.in
+--- gnome-applets-2.22.3.old/man/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/man/Makefile.in 2008-06-30 12:57:57.000000000 +0200
@@ -37,7 +37,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16937,9 +17217,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
man_MANS = \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/mini-commander/help/Makefile.in gnome-applets-2.22.2/mini-commander/help/Makefile.in
---- gnome-applets-2.22.2.old/mini-commander/help/Makefile.in 2008-05-28 04:59:07.000000000 +0200
-+++ gnome-applets-2.22.2/mini-commander/help/Makefile.in 2008-06-02 14:54:09.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/mini-commander/help/Makefile.in gnome-applets-2.22.3/mini-commander/help/Makefile.in
+--- gnome-applets-2.22.3.old/mini-commander/help/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/mini-commander/help/Makefile.in 2008-06-30 12:57:58.000000000 +0200
@@ -62,7 +62,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16974,9 +17254,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/mini-commander/Makefile.in gnome-applets-2.22.2/mini-commander/Makefile.in
---- gnome-applets-2.22.2.old/mini-commander/Makefile.in 2008-05-28 04:59:07.000000000 +0200
-+++ gnome-applets-2.22.2/mini-commander/Makefile.in 2008-06-02 14:54:09.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/mini-commander/Makefile.in gnome-applets-2.22.3/mini-commander/Makefile.in
+--- gnome-applets-2.22.3.old/mini-commander/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/mini-commander/Makefile.in 2008-06-30 12:57:57.000000000 +0200
@@ -39,7 +39,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -17011,9 +17291,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
DIST_SUBDIRS = src help
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/mini-commander/src/Makefile.in gnome-applets-2.22.2/mini-commander/src/Makefile.in
---- gnome-applets-2.22.2.old/mini-commander/src/Makefile.in 2008-05-28 04:59:07.000000000 +0200
-+++ gnome-applets-2.22.2/mini-commander/src/Makefile.in 2008-06-02 14:54:09.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/mini-commander/src/Makefile.in gnome-applets-2.22.3/mini-commander/src/Makefile.in
+--- gnome-applets-2.22.3.old/mini-commander/src/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/mini-commander/src/Makefile.in 2008-06-30 12:57:59.000000000 +0200
@@ -41,7 +41,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -17048,9 +17328,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
INCLUDES = \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/mixer/docs/Makefile.in gnome-applets-2.22.2/mixer/docs/Makefile.in
---- gnome-applets-2.22.2.old/mixer/docs/Makefile.in 2008-05-28 04:59:07.000000000 +0200
-+++ gnome-applets-2.22.2/mixer/docs/Makefile.in 2008-06-02 14:54:10.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/mixer/docs/Makefile.in gnome-applets-2.22.3/mixer/docs/Makefile.in
+--- gnome-applets-2.22.3.old/mixer/docs/Makefile.in 2008-06-30 11:29:40.000000000 +0200
++++ gnome-applets-2.22.3/mixer/docs/Makefile.in 2008-06-30 12:58:00.000000000 +0200
@@ -62,7 +62,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -17085,9 +17365,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/mixer/Makefile.in gnome-applets-2.22.2/mixer/Makefile.in
---- gnome-applets-2.22.2.old/mixer/Makefile.in 2008-05-28 04:59:07.000000000 +0200
-+++ gnome-applets-2.22.2/mixer/Makefile.in 2008-06-02 14:54:09.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/mixer/Makefile.in gnome-applets-2.22.3/mixer/Makefile.in
+--- gnome-applets-2.22.3.old/mixer/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/mixer/Makefile.in 2008-06-30 12:57:59.000000000 +0200
@@ -42,7 +42,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -17122,9 +17402,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = docs
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/modemlights/Makefile.in gnome-applets-2.22.2/modemlights/Makefile.in
---- gnome-applets-2.22.2.old/modemlights/Makefile.in 2008-05-28 04:59:07.000000000 +0200
-+++ gnome-applets-2.22.2/modemlights/Makefile.in 2008-06-02 14:54:10.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/modemlights/Makefile.in gnome-applets-2.22.3/modemlights/Makefile.in
+--- gnome-applets-2.22.3.old/modemlights/Makefile.in 2008-06-30 11:29:40.000000000 +0200
++++ gnome-applets-2.22.3/modemlights/Makefile.in 2008-06-30 12:58:00.000000000 +0200
@@ -43,7 +43,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -17164,9 +17444,9 @@
$(LIBGLADE_CFLAGS)
modem_applet_SOURCES = \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/multiload/docs/Makefile.in gnome-applets-2.22.2/multiload/docs/Makefile.in
---- gnome-applets-2.22.2.old/multiload/docs/Makefile.in 2008-05-28 04:59:07.000000000 +0200
-+++ gnome-applets-2.22.2/multiload/docs/Makefile.in 2008-06-02 14:54:10.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/multiload/docs/Makefile.in gnome-applets-2.22.3/multiload/docs/Makefile.in
+--- gnome-applets-2.22.3.old/multiload/docs/Makefile.in 2008-06-30 11:29:40.000000000 +0200
++++ gnome-applets-2.22.3/multiload/docs/Makefile.in 2008-06-30 12:58:01.000000000 +0200
@@ -62,7 +62,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -17201,9 +17481,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/multiload/Makefile.in gnome-applets-2.22.2/multiload/Makefile.in
---- gnome-applets-2.22.2.old/multiload/Makefile.in 2008-05-28 04:59:07.000000000 +0200
-+++ gnome-applets-2.22.2/multiload/Makefile.in 2008-06-02 14:54:10.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/multiload/Makefile.in gnome-applets-2.22.3/multiload/Makefile.in
+--- gnome-applets-2.22.3.old/multiload/Makefile.in 2008-06-30 11:29:40.000000000 +0200
++++ gnome-applets-2.22.3/multiload/Makefile.in 2008-06-30 12:58:01.000000000 +0200
@@ -41,7 +41,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -17238,9 +17518,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = docs
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/null_applet/Makefile.in gnome-applets-2.22.2/null_applet/Makefile.in
---- gnome-applets-2.22.2.old/null_applet/Makefile.in 2008-05-28 04:59:07.000000000 +0200
-+++ gnome-applets-2.22.2/null_applet/Makefile.in 2008-06-02 14:54:10.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/null_applet/Makefile.in gnome-applets-2.22.3/null_applet/Makefile.in
+--- gnome-applets-2.22.3.old/null_applet/Makefile.in 2008-06-30 11:29:40.000000000 +0200
++++ gnome-applets-2.22.3/null_applet/Makefile.in 2008-06-30 12:58:01.000000000 +0200
@@ -41,7 +41,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -17275,9 +17555,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
INCLUDES = \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/stickynotes/data/Makefile.in gnome-applets-2.22.2/stickynotes/data/Makefile.in
---- gnome-applets-2.22.2.old/stickynotes/data/Makefile.in 2008-05-28 04:59:08.000000000 +0200
-+++ gnome-applets-2.22.2/stickynotes/data/Makefile.in 2008-06-02 14:54:11.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/stickynotes/data/Makefile.in gnome-applets-2.22.3/stickynotes/data/Makefile.in
+--- gnome-applets-2.22.3.old/stickynotes/data/Makefile.in 2008-06-30 11:29:40.000000000 +0200
++++ gnome-applets-2.22.3/stickynotes/data/Makefile.in 2008-06-30 12:58:04.000000000 +0200
@@ -41,7 +41,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -17312,9 +17592,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
server_in_files = \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/stickynotes/docs/Makefile.in gnome-applets-2.22.2/stickynotes/docs/Makefile.in
---- gnome-applets-2.22.2.old/stickynotes/docs/Makefile.in 2008-05-28 04:59:08.000000000 +0200
-+++ gnome-applets-2.22.2/stickynotes/docs/Makefile.in 2008-06-02 14:54:11.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/stickynotes/docs/Makefile.in gnome-applets-2.22.3/stickynotes/docs/Makefile.in
+--- gnome-applets-2.22.3.old/stickynotes/docs/Makefile.in 2008-06-30 11:29:40.000000000 +0200
++++ gnome-applets-2.22.3/stickynotes/docs/Makefile.in 2008-06-30 12:58:05.000000000 +0200
@@ -62,7 +62,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -17349,9 +17629,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/stickynotes/Makefile.in gnome-applets-2.22.2/stickynotes/Makefile.in
---- gnome-applets-2.22.2.old/stickynotes/Makefile.in 2008-05-28 04:59:07.000000000 +0200
-+++ gnome-applets-2.22.2/stickynotes/Makefile.in 2008-06-02 14:54:11.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/stickynotes/Makefile.in gnome-applets-2.22.3/stickynotes/Makefile.in
+--- gnome-applets-2.22.3.old/stickynotes/Makefile.in 2008-06-30 11:29:40.000000000 +0200
++++ gnome-applets-2.22.3/stickynotes/Makefile.in 2008-06-30 12:58:04.000000000 +0200
@@ -42,7 +42,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -17386,9 +17666,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = pixmaps docs data
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/stickynotes/pixmaps/Makefile.in gnome-applets-2.22.2/stickynotes/pixmaps/Makefile.in
---- gnome-applets-2.22.2.old/stickynotes/pixmaps/Makefile.in 2008-05-28 04:59:08.000000000 +0200
-+++ gnome-applets-2.22.2/stickynotes/pixmaps/Makefile.in 2008-06-02 14:54:11.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/stickynotes/pixmaps/Makefile.in gnome-applets-2.22.3/stickynotes/pixmaps/Makefile.in
+--- gnome-applets-2.22.3.old/stickynotes/pixmaps/Makefile.in 2008-06-30 11:29:41.000000000 +0200
++++ gnome-applets-2.22.3/stickynotes/pixmaps/Makefile.in 2008-06-30 12:58:06.000000000 +0200
@@ -38,7 +38,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -17423,9 +17703,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
stickynotes_applet_pixmapsdir = $(datadir)/pixmaps/stickynotes
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/trashapplet/docs/Makefile.in gnome-applets-2.22.2/trashapplet/docs/Makefile.in
---- gnome-applets-2.22.2.old/trashapplet/docs/Makefile.in 2008-05-28 04:59:08.000000000 +0200
-+++ gnome-applets-2.22.2/trashapplet/docs/Makefile.in 2008-06-02 14:54:12.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/trashapplet/docs/Makefile.in gnome-applets-2.22.3/trashapplet/docs/Makefile.in
+--- gnome-applets-2.22.3.old/trashapplet/docs/Makefile.in 2008-06-30 11:29:41.000000000 +0200
++++ gnome-applets-2.22.3/trashapplet/docs/Makefile.in 2008-06-30 12:58:07.000000000 +0200
@@ -62,7 +62,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -17460,9 +17740,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/trashapplet/Makefile.in gnome-applets-2.22.2/trashapplet/Makefile.in
---- gnome-applets-2.22.2.old/trashapplet/Makefile.in 2008-05-28 04:59:08.000000000 +0200
-+++ gnome-applets-2.22.2/trashapplet/Makefile.in 2008-06-02 14:54:11.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/trashapplet/Makefile.in gnome-applets-2.22.3/trashapplet/Makefile.in
+--- gnome-applets-2.22.3.old/trashapplet/Makefile.in 2008-06-30 11:29:41.000000000 +0200
++++ gnome-applets-2.22.3/trashapplet/Makefile.in 2008-06-30 12:58:06.000000000 +0200
@@ -39,7 +39,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -17497,9 +17777,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = src docs
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.2.old/trashapplet/src/Makefile.in gnome-applets-2.22.2/trashapplet/src/Makefile.in
---- gnome-applets-2.22.2.old/trashapplet/src/Makefile.in 2008-05-28 04:59:08.000000000 +0200
-+++ gnome-applets-2.22.2/trashapplet/src/Makefile.in 2008-06-02 14:54:12.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/trashapplet/src/Makefile.in gnome-applets-2.22.3/trashapplet/src/Makefile.in
+--- gnome-applets-2.22.3.old/trashapplet/src/Makefile.in 2008-06-30 11:29:41.000000000 +0200
++++ gnome-applets-2.22.3/trashapplet/src/Makefile.in 2008-06-30 12:58:08.000000000 +0200
@@ -39,7 +39,6 @@
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/gnome-doc-utils.m4 \
More information about the pkg-gnome-commits
mailing list