r13274 - in /desktop/unstable/control-center/debian: changelog patches/70_relibtoolize.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Thu Oct 25 17:55:52 UTC 2007
Author: slomo
Date: Thu Oct 25 17:55:52 2007
New Revision: 13274
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13274
Log:
* New upstream bugfix release:
+ debian/patches/70_relibtoolize.patch:
- Regenerated for the new version.
Modified:
desktop/unstable/control-center/debian/changelog
desktop/unstable/control-center/debian/patches/70_relibtoolize.patch
Modified: desktop/unstable/control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/changelog?rev=13274&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/changelog (original)
+++ desktop/unstable/control-center/debian/changelog Thu Oct 25 17:55:52 2007
@@ -1,3 +1,11 @@
+control-center (1:2.20.1-1) unstable; urgency=low
+
+ * New upstream bugfix release:
+ + debian/patches/70_relibtoolize.patch:
+ - Regenerated for the new version.
+
+ -- Sebastian Dröge <slomo at debian.org> Thu, 25 Oct 2007 19:45:06 +0200
+
control-center (1:2.20.0.1-1) unstable; urgency=low
[ Loic Minier ]
Modified: desktop/unstable/control-center/debian/patches/70_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/patches/70_relibtoolize.patch?rev=13274&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/patches/70_relibtoolize.patch (original)
+++ desktop/unstable/control-center/debian/patches/70_relibtoolize.patch Thu Oct 25 17:55:52 2007
@@ -1,6 +1,6 @@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/aclocal.m4 control-center-2.20.0.1/aclocal.m4
---- control-center-2.20.0.1.old/aclocal.m4 2007-09-26 13:54:14.000000000 +0200
-+++ control-center-2.20.0.1/aclocal.m4 2007-10-05 09:10:52.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/aclocal.m4 control-center-2.20.1/aclocal.m4
+--- control-center-2.20.1.old/aclocal.m4 2007-10-15 17:25:55.000000000 +0200
++++ control-center-2.20.1/aclocal.m4 2007-10-25 19:51:18.000000000 +0200
@@ -11,4705 +11,4432 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@@ -13664,9 +13664,9 @@
m4_include([m4/gnome-doc-utils.m4])
m4_include([m4/intltool.m4])
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/capplets/about-me/Makefile.in control-center-2.20.0.1/capplets/about-me/Makefile.in
---- control-center-2.20.0.1.old/capplets/about-me/Makefile.in 2007-09-26 13:54:27.000000000 +0200
-+++ control-center-2.20.0.1/capplets/about-me/Makefile.in 2007-10-05 09:10:58.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/capplets/about-me/Makefile.in control-center-2.20.1/capplets/about-me/Makefile.in
+--- control-center-2.20.1.old/capplets/about-me/Makefile.in 2007-10-15 17:26:01.000000000 +0200
++++ control-center-2.20.1/capplets/about-me/Makefile.in 2007-10-25 19:51:29.000000000 +0200
@@ -215,8 +215,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -13688,9 +13688,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/capplets/accessibility/at-properties/Makefile.in control-center-2.20.0.1/capplets/accessibility/at-properties/Makefile.in
---- control-center-2.20.0.1.old/capplets/accessibility/at-properties/Makefile.in 2007-09-26 13:54:28.000000000 +0200
-+++ control-center-2.20.0.1/capplets/accessibility/at-properties/Makefile.in 2007-10-05 09:10:58.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/capplets/accessibility/at-properties/Makefile.in control-center-2.20.1/capplets/accessibility/at-properties/Makefile.in
+--- control-center-2.20.1.old/capplets/accessibility/at-properties/Makefile.in 2007-10-15 17:26:01.000000000 +0200
++++ control-center-2.20.1/capplets/accessibility/at-properties/Makefile.in 2007-10-25 19:51:30.000000000 +0200
@@ -213,8 +213,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -13712,9 +13712,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/capplets/accessibility/keyboard/Makefile.in control-center-2.20.0.1/capplets/accessibility/keyboard/Makefile.in
---- control-center-2.20.0.1.old/capplets/accessibility/keyboard/Makefile.in 2007-09-26 13:54:29.000000000 +0200
-+++ control-center-2.20.0.1/capplets/accessibility/keyboard/Makefile.in 2007-10-05 09:10:58.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/capplets/accessibility/keyboard/Makefile.in control-center-2.20.1/capplets/accessibility/keyboard/Makefile.in
+--- control-center-2.20.1.old/capplets/accessibility/keyboard/Makefile.in 2007-10-15 17:26:02.000000000 +0200
++++ control-center-2.20.1/capplets/accessibility/keyboard/Makefile.in 2007-10-25 19:51:30.000000000 +0200
@@ -222,8 +222,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -13736,9 +13736,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/capplets/accessibility/Makefile.in control-center-2.20.0.1/capplets/accessibility/Makefile.in
---- control-center-2.20.0.1.old/capplets/accessibility/Makefile.in 2007-09-26 13:54:28.000000000 +0200
-+++ control-center-2.20.0.1/capplets/accessibility/Makefile.in 2007-10-05 09:10:58.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/capplets/accessibility/Makefile.in control-center-2.20.1/capplets/accessibility/Makefile.in
+--- control-center-2.20.1.old/capplets/accessibility/Makefile.in 2007-10-15 17:26:01.000000000 +0200
++++ control-center-2.20.1/capplets/accessibility/Makefile.in 2007-10-25 19:51:30.000000000 +0200
@@ -184,8 +184,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -13760,9 +13760,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/capplets/appearance/data/Makefile.in control-center-2.20.0.1/capplets/appearance/data/Makefile.in
---- control-center-2.20.0.1.old/capplets/appearance/data/Makefile.in 2007-09-26 13:54:29.000000000 +0200
-+++ control-center-2.20.0.1/capplets/appearance/data/Makefile.in 2007-10-05 09:10:58.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/capplets/appearance/data/Makefile.in control-center-2.20.1/capplets/appearance/data/Makefile.in
+--- control-center-2.20.1.old/capplets/appearance/data/Makefile.in 2007-10-15 17:26:02.000000000 +0200
++++ control-center-2.20.1/capplets/appearance/data/Makefile.in 2007-10-25 19:51:30.000000000 +0200
@@ -194,8 +194,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -13784,9 +13784,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/capplets/appearance/Makefile.in control-center-2.20.0.1/capplets/appearance/Makefile.in
---- control-center-2.20.0.1.old/capplets/appearance/Makefile.in 2007-09-26 13:54:29.000000000 +0200
-+++ control-center-2.20.0.1/capplets/appearance/Makefile.in 2007-10-05 09:10:58.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/capplets/appearance/Makefile.in control-center-2.20.1/capplets/appearance/Makefile.in
+--- control-center-2.20.1.old/capplets/appearance/Makefile.in 2007-10-15 17:26:02.000000000 +0200
++++ control-center-2.20.1/capplets/appearance/Makefile.in 2007-10-25 19:51:30.000000000 +0200
@@ -220,8 +220,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -13808,9 +13808,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/capplets/common/Makefile.in control-center-2.20.0.1/capplets/common/Makefile.in
---- control-center-2.20.0.1.old/capplets/common/Makefile.in 2007-09-26 13:54:30.000000000 +0200
-+++ control-center-2.20.0.1/capplets/common/Makefile.in 2007-10-05 09:10:59.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/capplets/common/Makefile.in control-center-2.20.1/capplets/common/Makefile.in
+--- control-center-2.20.1.old/capplets/common/Makefile.in 2007-10-15 17:26:02.000000000 +0200
++++ control-center-2.20.1/capplets/common/Makefile.in 2007-10-25 19:51:30.000000000 +0200
@@ -204,8 +204,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -13832,9 +13832,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/capplets/default-applications/Makefile.in control-center-2.20.0.1/capplets/default-applications/Makefile.in
---- control-center-2.20.0.1.old/capplets/default-applications/Makefile.in 2007-09-26 13:54:30.000000000 +0200
-+++ control-center-2.20.0.1/capplets/default-applications/Makefile.in 2007-10-05 09:10:59.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/capplets/default-applications/Makefile.in control-center-2.20.1/capplets/default-applications/Makefile.in
+--- control-center-2.20.1.old/capplets/default-applications/Makefile.in 2007-10-15 17:26:02.000000000 +0200
++++ control-center-2.20.1/capplets/default-applications/Makefile.in 2007-10-25 19:51:31.000000000 +0200
@@ -222,8 +222,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -13856,9 +13856,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/capplets/display/Makefile.in control-center-2.20.0.1/capplets/display/Makefile.in
---- control-center-2.20.0.1.old/capplets/display/Makefile.in 2007-09-26 13:54:30.000000000 +0200
-+++ control-center-2.20.0.1/capplets/display/Makefile.in 2007-10-05 09:10:59.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/capplets/display/Makefile.in control-center-2.20.1/capplets/display/Makefile.in
+--- control-center-2.20.1.old/capplets/display/Makefile.in 2007-10-15 17:26:02.000000000 +0200
++++ control-center-2.20.1/capplets/display/Makefile.in 2007-10-25 19:51:31.000000000 +0200
@@ -223,8 +223,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -13880,9 +13880,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/capplets/keybindings/Makefile.in control-center-2.20.0.1/capplets/keybindings/Makefile.in
---- control-center-2.20.0.1.old/capplets/keybindings/Makefile.in 2007-09-26 13:54:30.000000000 +0200
-+++ control-center-2.20.0.1/capplets/keybindings/Makefile.in 2007-10-05 09:10:59.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/capplets/keybindings/Makefile.in control-center-2.20.1/capplets/keybindings/Makefile.in
+--- control-center-2.20.1.old/capplets/keybindings/Makefile.in 2007-10-15 17:26:03.000000000 +0200
++++ control-center-2.20.1/capplets/keybindings/Makefile.in 2007-10-25 19:51:31.000000000 +0200
@@ -214,8 +214,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -13904,9 +13904,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/capplets/keyboard/Makefile.in control-center-2.20.0.1/capplets/keyboard/Makefile.in
---- control-center-2.20.0.1.old/capplets/keyboard/Makefile.in 2007-09-26 13:54:30.000000000 +0200
-+++ control-center-2.20.0.1/capplets/keyboard/Makefile.in 2007-10-05 09:10:59.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/capplets/keyboard/Makefile.in control-center-2.20.1/capplets/keyboard/Makefile.in
+--- control-center-2.20.1.old/capplets/keyboard/Makefile.in 2007-10-15 17:26:03.000000000 +0200
++++ control-center-2.20.1/capplets/keyboard/Makefile.in 2007-10-25 19:51:31.000000000 +0200
@@ -218,8 +218,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -13928,9 +13928,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/capplets/Makefile.in control-center-2.20.0.1/capplets/Makefile.in
---- control-center-2.20.0.1.old/capplets/Makefile.in 2007-09-26 13:54:26.000000000 +0200
-+++ control-center-2.20.0.1/capplets/Makefile.in 2007-10-05 09:10:57.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/capplets/Makefile.in control-center-2.20.1/capplets/Makefile.in
+--- control-center-2.20.1.old/capplets/Makefile.in 2007-10-15 17:26:01.000000000 +0200
++++ control-center-2.20.1/capplets/Makefile.in 2007-10-25 19:51:29.000000000 +0200
@@ -186,8 +186,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -13952,9 +13952,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/capplets/mouse/Makefile.in control-center-2.20.0.1/capplets/mouse/Makefile.in
---- control-center-2.20.0.1.old/capplets/mouse/Makefile.in 2007-09-26 13:54:31.000000000 +0200
-+++ control-center-2.20.0.1/capplets/mouse/Makefile.in 2007-10-05 09:10:59.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/capplets/mouse/Makefile.in control-center-2.20.1/capplets/mouse/Makefile.in
+--- control-center-2.20.1.old/capplets/mouse/Makefile.in 2007-10-15 17:26:03.000000000 +0200
++++ control-center-2.20.1/capplets/mouse/Makefile.in 2007-10-25 19:51:31.000000000 +0200
@@ -208,8 +208,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -13976,9 +13976,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/capplets/network/Makefile.in control-center-2.20.0.1/capplets/network/Makefile.in
---- control-center-2.20.0.1.old/capplets/network/Makefile.in 2007-09-26 13:54:31.000000000 +0200
-+++ control-center-2.20.0.1/capplets/network/Makefile.in 2007-10-05 09:11:00.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/capplets/network/Makefile.in control-center-2.20.1/capplets/network/Makefile.in
+--- control-center-2.20.1.old/capplets/network/Makefile.in 2007-10-15 17:26:03.000000000 +0200
++++ control-center-2.20.1/capplets/network/Makefile.in 2007-10-25 19:51:31.000000000 +0200
@@ -221,8 +221,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -14000,9 +14000,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/capplets/sound/Makefile.in control-center-2.20.0.1/capplets/sound/Makefile.in
---- control-center-2.20.0.1.old/capplets/sound/Makefile.in 2007-09-26 13:54:31.000000000 +0200
-+++ control-center-2.20.0.1/capplets/sound/Makefile.in 2007-10-05 09:11:00.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/capplets/sound/Makefile.in control-center-2.20.1/capplets/sound/Makefile.in
+--- control-center-2.20.1.old/capplets/sound/Makefile.in 2007-10-15 17:26:04.000000000 +0200
++++ control-center-2.20.1/capplets/sound/Makefile.in 2007-10-25 19:51:32.000000000 +0200
@@ -225,8 +225,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -14024,9 +14024,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/capplets/windows/Makefile.in control-center-2.20.0.1/capplets/windows/Makefile.in
---- control-center-2.20.0.1.old/capplets/windows/Makefile.in 2007-10-05 09:10:28.000000000 +0200
-+++ control-center-2.20.0.1/capplets/windows/Makefile.in 2007-10-05 09:11:00.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/capplets/windows/Makefile.in control-center-2.20.1/capplets/windows/Makefile.in
+--- control-center-2.20.1.old/capplets/windows/Makefile.in 2007-10-25 19:50:53.000000000 +0200
++++ control-center-2.20.1/capplets/windows/Makefile.in 2007-10-25 19:51:32.000000000 +0200
@@ -210,8 +210,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -14048,14 +14048,14 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/configure control-center-2.20.0.1/configure
---- control-center-2.20.0.1.old/configure 2007-09-26 13:54:18.000000000 +0200
-+++ control-center-2.20.0.1/configure 2007-10-05 09:10:56.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/configure control-center-2.20.1/configure
+--- control-center-2.20.1.old/configure 2007-10-15 17:25:59.000000000 +0200
++++ control-center-2.20.1/configure 2007-10-25 19:51:27.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.60 for gnome-control-center 2.20.0.1.
-+# Generated by GNU Autoconf 2.61 for gnome-control-center 2.20.0.1.
+-# Generated by GNU Autoconf 2.60 for gnome-control-center 2.20.1.
++# Generated by GNU Autoconf 2.61 for gnome-control-center 2.20.1.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=control-center>.
#
@@ -14258,7 +14258,7 @@
TYPING_CFLAGS
TYPING_LIBS
HAVE_XINPUT_TRUE
-@@ -1030,6 +1044,7 @@
+@@ -1029,6 +1043,7 @@
CC
CFLAGS
LDFLAGS
@@ -14266,7 +14266,7 @@
CPPFLAGS
CPP
CXX
-@@ -1040,8 +1055,6 @@
+@@ -1039,8 +1054,6 @@
FFLAGS
PKG_CONFIG
XMKMF
@@ -14275,7 +14275,7 @@
CAPPLET_CFLAGS
CAPPLET_LIBS
GNOMECC_CFLAGS
-@@ -1064,6 +1077,8 @@
+@@ -1063,6 +1076,8 @@
DEFAULT_APPLICATIONS_CAPPLET_LIBS
METACITY_CFLAGS
METACITY_LIBS
@@ -14284,7 +14284,7 @@
TYPING_CFLAGS
TYPING_LIBS
FONT_CAPPLET_CFLAGS
-@@ -1211,10 +1226,10 @@
+@@ -1210,10 +1225,10 @@
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
@@ -14297,7 +14297,7 @@
eval enable_$ac_feature=no ;;
-docdir | --docdir | --docdi | --doc | --do)
-@@ -1230,10 +1245,10 @@
+@@ -1229,10 +1244,10 @@
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -14310,7 +14310,7 @@
eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-@@ -1427,19 +1442,19 @@
+@@ -1426,19 +1441,19 @@
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -14334,7 +14334,7 @@
eval with_$ac_package=no ;;
--x)
-@@ -1734,6 +1749,7 @@
+@@ -1733,6 +1748,7 @@
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
@@ -14342,7 +14342,7 @@
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
-@@ -1744,10 +1760,6 @@
+@@ -1743,10 +1759,6 @@
FFLAGS Fortran 77 compiler flags
PKG_CONFIG path to pkg-config utility
XMKMF Path to xmkmf, Makefile generator for X Window System
@@ -14353,7 +14353,7 @@
CAPPLET_CFLAGS
C compiler flags for CAPPLET, overriding pkg-config
CAPPLET_LIBS
-@@ -1790,6 +1802,8 @@
+@@ -1789,6 +1801,8 @@
C compiler flags for METACITY, overriding pkg-config
METACITY_LIBS
linker flags for METACITY, overriding pkg-config
@@ -14362,25 +14362,25 @@
TYPING_CFLAGS
C compiler flags for TYPING, overriding pkg-config
TYPING_LIBS linker flags for TYPING, overriding pkg-config
-@@ -1931,7 +1945,7 @@
+@@ -1930,7 +1944,7 @@
if $ac_init_version; then
cat <<\_ACEOF
- gnome-control-center configure 2.20.0.1
+ gnome-control-center configure 2.20.1
-generated by GNU Autoconf 2.60
+generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-@@ -1945,7 +1959,7 @@
+@@ -1944,7 +1958,7 @@
running configure, to aid debugging if configure makes a mistake.
- It was created by gnome-control-center $as_me 2.20.0.1, which was
+ It was created by gnome-control-center $as_me 2.20.1, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
-@@ -2298,14 +2312,6 @@
+@@ -2297,14 +2311,6 @@
@@ -14395,7 +14395,7 @@
ac_config_headers="$ac_config_headers config.h"
-@@ -2380,7 +2386,7 @@
+@@ -2379,7 +2385,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14404,7 +14404,7 @@
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
-@@ -2508,7 +2514,7 @@
+@@ -2507,7 +2513,7 @@
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14413,7 +14413,7 @@
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
-@@ -2561,7 +2567,7 @@
+@@ -2560,7 +2566,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14422,7 +14422,7 @@
ac_cv_prog_AWK="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2700,7 +2706,7 @@
+@@ -2699,7 +2705,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14431,7 +14431,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2740,7 +2746,7 @@
+@@ -2739,7 +2745,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14440,7 +14440,7 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2982,7 +2988,7 @@
+@@ -2981,7 +2987,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14449,7 +14449,7 @@
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3022,7 +3028,7 @@
+@@ -3021,7 +3027,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14458,7 +14458,7 @@
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3079,7 +3085,7 @@
+@@ -3078,7 +3084,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14467,7 +14467,7 @@
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3120,7 +3126,7 @@
+@@ -3119,7 +3125,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14476,7 +14476,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -3178,7 +3184,7 @@
+@@ -3177,7 +3183,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14485,7 +14485,7 @@
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3222,7 +3228,7 @@
+@@ -3221,7 +3227,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14494,7 +14494,7 @@
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3363,7 +3369,7 @@
+@@ -3362,7 +3368,7 @@
# in a Makefile. We should not override ac_cv_exeext if it was cached,
# so that the user can short-circuit this test for compilers unknown to
# Autoconf.
@@ -14503,7 +14503,7 @@
do
test -f "$ac_file" || continue
case $ac_file in
-@@ -3391,6 +3397,12 @@
+@@ -3390,6 +3396,12 @@
test "$ac_cv_exeext" = no && ac_cv_exeext=
else
@@ -14516,7 +14516,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3402,8 +3414,6 @@
+@@ -3401,8 +3413,6 @@
fi
ac_exeext=$ac_cv_exeext
@@ -14525,7 +14525,7 @@
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-@@ -3581,27 +3591,10 @@
+@@ -3580,27 +3590,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14557,7 +14557,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3656,27 +3649,10 @@
+@@ -3655,27 +3648,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14589,7 +14589,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3711,27 +3687,10 @@
+@@ -3710,27 +3686,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14621,7 +14621,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -3767,27 +3726,10 @@
+@@ -3766,27 +3725,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14653,7 +14653,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3903,27 +3845,10 @@
+@@ -3902,27 +3844,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14685,7 +14685,7 @@
ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
-@@ -4117,27 +4042,11 @@
+@@ -4116,27 +4041,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14718,7 +14718,7 @@
ac_cv_search_strerror=$ac_res
else
echo "$as_me: failed program was:" >&5
-@@ -4146,7 +4055,7 @@
+@@ -4145,7 +4054,7 @@
fi
@@ -14727,7 +14727,7 @@
conftest$ac_exeext
if test "${ac_cv_search_strerror+set}" = set; then
break
-@@ -4190,7 +4099,7 @@
+@@ -4189,7 +4098,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14736,7 +14736,7 @@
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4230,7 +4139,7 @@
+@@ -4229,7 +4138,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14745,7 +14745,7 @@
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4287,7 +4196,7 @@
+@@ -4286,7 +4195,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14754,7 +14754,7 @@
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4328,7 +4237,7 @@
+@@ -4327,7 +4236,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14763,7 +14763,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -4386,7 +4295,7 @@
+@@ -4385,7 +4294,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14772,7 +14772,7 @@
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4430,7 +4339,7 @@
+@@ -4429,7 +4338,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14781,7 +14781,7 @@
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4550,27 +4459,10 @@
+@@ -4549,27 +4458,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14813,7 +14813,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4625,27 +4517,10 @@
+@@ -4624,27 +4516,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14845,7 +14845,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4680,27 +4555,10 @@
+@@ -4679,27 +4554,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14877,7 +14877,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -4736,27 +4594,10 @@
+@@ -4735,27 +4593,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14909,7 +14909,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4872,27 +4713,10 @@
+@@ -4871,27 +4712,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14941,7 +14941,7 @@
ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
-@@ -5215,17 +5039,10 @@
+@@ -5214,17 +5038,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14963,7 +14963,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5259,17 +5076,10 @@
+@@ -5258,17 +5075,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14985,7 +14985,7 @@
# Broken: success on invalid input.
continue
else
-@@ -5334,17 +5144,10 @@
+@@ -5333,17 +5143,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15007,7 +15007,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5378,17 +5181,10 @@
+@@ -5377,17 +5180,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15029,7 +15029,7 @@
# Broken: success on invalid input.
continue
else
-@@ -5443,7 +5239,7 @@
+@@ -5442,7 +5238,7 @@
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
@@ -15038,7 +15038,7 @@
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
-@@ -5525,7 +5321,7 @@
+@@ -5524,7 +5320,7 @@
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
@@ -15047,7 +15047,7 @@
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
-@@ -5621,27 +5417,10 @@
+@@ -5620,27 +5416,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15079,7 +15079,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5944,12 +5723,13 @@
+@@ -5943,12 +5722,13 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15094,7 +15094,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -5984,6 +5764,7 @@
+@@ -5983,6 +5763,7 @@
fi
SED=$lt_cv_path_SED
@@ -15102,7 +15102,7 @@
{ echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6; }
-@@ -6183,8 +5964,8 @@
+@@ -6182,8 +5963,8 @@
echo "${ECHO_T}no, using $LN_S" >&6; }
fi
@@ -15113,7 +15113,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6225,16 +6006,22 @@
+@@ -6224,16 +6005,22 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -15140,7 +15140,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -6272,7 +6059,7 @@
+@@ -6271,7 +6058,7 @@
esac
;;
@@ -15149,7 +15149,7 @@
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
;;
-@@ -6288,11 +6075,11 @@
+@@ -6287,11 +6074,11 @@
;;
# This must be Linux ELF.
@@ -15163,7 +15163,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -6322,6 +6109,10 @@
+@@ -6321,6 +6108,10 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -15174,16 +15174,16 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -6408,7 +6199,7 @@
+@@ -6407,7 +6198,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6411 "configure"' > conftest.$ac_ext
-+ echo '#line 6202 "configure"' > conftest.$ac_ext
+- echo '#line 6410 "configure"' > conftest.$ac_ext
++ echo '#line 6201 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -6443,7 +6234,8 @@
+@@ -6442,7 +6233,8 @@
rm -rf conftest*
;;
@@ -15193,7 +15193,7 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -6454,6 +6246,9 @@
+@@ -6453,6 +6245,9 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -15203,7 +15203,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -6470,6 +6265,9 @@
+@@ -6469,6 +6264,9 @@
;;
*64-bit*)
case $host in
@@ -15213,7 +15213,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -6532,27 +6330,11 @@
+@@ -6531,27 +6329,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15246,7 +15246,7 @@
lt_cv_cc_needs_belf=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6561,7 +6343,7 @@
+@@ -6560,7 +6342,7 @@
lt_cv_cc_needs_belf=no
fi
@@ -15255,7 +15255,7 @@
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -6645,27 +6427,10 @@
+@@ -6644,27 +6426,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15287,7 +15287,7 @@
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -6728,27 +6493,10 @@
+@@ -6727,27 +6492,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15319,7 +15319,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6784,17 +6532,10 @@
+@@ -6783,17 +6531,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15341,7 +15341,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6886,7 +6627,7 @@
+@@ -6885,7 +6626,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15350,7 +15350,7 @@
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -6930,7 +6671,7 @@
+@@ -6929,7 +6670,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15359,7 +15359,7 @@
ac_cv_prog_ac_ct_CXX="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7043,27 +6784,10 @@
+@@ -7042,27 +6783,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15391,7 +15391,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7118,27 +6842,10 @@
+@@ -7117,27 +6841,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15423,7 +15423,7 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7173,27 +6880,10 @@
+@@ -7172,27 +6879,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15455,7 +15455,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -7229,27 +6919,10 @@
+@@ -7228,27 +6918,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15487,7 +15487,7 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7451,17 +7124,10 @@
+@@ -7450,17 +7123,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15509,7 +15509,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -7495,17 +7161,10 @@
+@@ -7494,17 +7160,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15531,7 +15531,7 @@
# Broken: success on invalid input.
continue
else
-@@ -7570,17 +7229,10 @@
+@@ -7569,17 +7228,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15553,7 +15553,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -7614,17 +7266,10 @@
+@@ -7613,17 +7265,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15575,7 +15575,7 @@
# Broken: success on invalid input.
continue
else
-@@ -7665,7 +7310,7 @@
+@@ -7664,7 +7309,7 @@
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
if test -n "$ac_tool_prefix"; then
@@ -15584,7 +15584,7 @@
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
-@@ -7683,7 +7328,7 @@
+@@ -7682,7 +7327,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15593,7 +15593,7 @@
ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7709,7 +7354,7 @@
+@@ -7708,7 +7353,7 @@
fi
if test -z "$F77"; then
ac_ct_F77=$F77
@@ -15602,7 +15602,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-@@ -7727,7 +7372,7 @@
+@@ -7726,7 +7371,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15611,7 +15611,7 @@
ac_cv_prog_ac_ct_F77="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7834,27 +7479,10 @@
+@@ -7833,27 +7478,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15643,7 +15643,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7897,27 +7525,10 @@
+@@ -7896,27 +7524,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15675,7 +15675,7 @@
ac_cv_prog_f77_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -8044,24 +7655,27 @@
+@@ -8043,24 +7654,27 @@
fi
;;
*)
@@ -15720,7 +15720,7 @@
;;
esac
-@@ -8078,6 +7692,7 @@
+@@ -8077,6 +7691,7 @@
@@ -15728,7 +15728,7 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-@@ -8115,7 +7730,7 @@
+@@ -8114,7 +7729,7 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -15737,7 +15737,7 @@
if test "$host_cpu" = ia64; then
symcode='[ABCDGIRSTW]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -8372,7 +7987,7 @@
+@@ -8371,7 +7986,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15746,7 +15746,7 @@
ac_cv_prog_AR="${ac_tool_prefix}ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8412,7 +8027,7 @@
+@@ -8411,7 +8026,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15755,7 +15755,7 @@
ac_cv_prog_ac_ct_AR="ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8468,7 +8083,7 @@
+@@ -8467,7 +8082,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15764,7 +15764,7 @@
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8508,7 +8123,7 @@
+@@ -8507,7 +8122,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15773,7 +15773,7 @@
ac_cv_prog_ac_ct_RANLIB="ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8564,7 +8179,7 @@
+@@ -8563,7 +8178,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15782,7 +15782,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8604,7 +8219,7 @@
+@@ -8603,7 +8218,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15791,7 +15791,7 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8666,7 +8281,7 @@
+@@ -8665,7 +8280,7 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -15800,7 +15800,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -8866,10 +8481,10 @@
+@@ -8865,10 +8480,10 @@
objext=$objext
# Code to be used in simple compile tests
@@ -15813,7 +15813,7 @@
# If no C compiler was specified, use CC.
-@@ -8884,13 +8499,13 @@
+@@ -8883,13 +8498,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -15829,7 +15829,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -8910,7 +8525,7 @@
+@@ -8909,7 +8524,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -15838,21 +15838,21 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -8921,11 +8536,11 @@
+@@ -8920,11 +8535,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:8924: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8539: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8923: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8538: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8928: \$? = $ac_status" >&5
-+ echo "$as_me:8543: \$? = $ac_status" >&5
+- echo "$as_me:8927: \$? = $ac_status" >&5
++ echo "$as_me:8542: \$? = $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.
-@@ -8976,13 +8591,15 @@
+@@ -8975,13 +8590,15 @@
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
@@ -15870,7 +15870,7 @@
lt_prog_compiler_pic='-DDLL_EXPORT'
;;
-@@ -8992,7 +8609,7 @@
+@@ -8991,7 +8608,7 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -15879,7 +15879,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -9050,7 +8667,7 @@
+@@ -9049,7 +8666,7 @@
esac
;;
@@ -15888,7 +15888,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -9083,7 +8700,7 @@
+@@ -9082,7 +8699,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -15897,7 +15897,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
-@@ -9102,6 +8719,22 @@
+@@ -9101,6 +8718,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -15920,7 +15920,7 @@
esac
;;
-@@ -9111,6 +8744,10 @@
+@@ -9110,6 +8743,10 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -15931,7 +15931,7 @@
solaris*)
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9178,7 +8815,7 @@
+@@ -9177,7 +8814,7 @@
else
lt_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
@@ -15940,21 +15940,21 @@
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -9189,11 +8826,11 @@
+@@ -9188,11 +8825,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:9192: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8829: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9191: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8828: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9196: \$? = $ac_status" >&5
-+ echo "$as_me:8833: \$? = $ac_status" >&5
+- echo "$as_me:9195: \$? = $ac_status" >&5
++ echo "$as_me:8832: \$? = $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.
-@@ -9242,7 +8879,7 @@
+@@ -9241,7 +8878,7 @@
lt_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -15963,7 +15963,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -9282,7 +8919,7 @@
+@@ -9281,7 +8918,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -15972,21 +15972,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -9293,11 +8930,11 @@
+@@ -9292,11 +8929,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:9296: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8933: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9295: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8932: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9300: \$? = $ac_status" >&5
-+ echo "$as_me:8937: \$? = $ac_status" >&5
+- echo "$as_me:9299: \$? = $ac_status" >&5
++ echo "$as_me:8936: \$? = $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
-@@ -9489,7 +9126,7 @@
+@@ -9488,7 +9125,7 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -15995,7 +15995,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -9507,7 +9144,7 @@
+@@ -9506,7 +9143,7 @@
fi
;;
@@ -16004,7 +16004,7 @@
hardcode_direct=no
hardcode_shlibpath_var=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -9522,7 +9159,7 @@
+@@ -9521,7 +9158,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -16013,7 +16013,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -9540,20 +9177,30 @@
+@@ -9539,20 +9176,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -16047,7 +16047,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9705,7 +9352,7 @@
+@@ -9704,7 +9351,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -16056,7 +16056,7 @@
else
# We have old collect2
hardcode_direct=unsupported
-@@ -9773,33 +9420,24 @@
+@@ -9772,33 +9419,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16107,7 +16107,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -9807,7 +9445,7 @@
+@@ -9806,7 +9444,7 @@
fi
@@ -16116,7 +16116,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -9848,33 +9486,24 @@
+@@ -9847,33 +9485,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16167,7 +16167,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -9882,7 +9511,7 @@
+@@ -9881,7 +9510,7 @@
fi
@@ -16176,7 +16176,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -9928,7 +9557,7 @@
+@@ -9927,7 +9556,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
@@ -16185,7 +16185,7 @@
fix_srcfile_path='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes=yes
;;
-@@ -9970,10 +9599,10 @@
+@@ -9969,10 +9598,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -16198,7 +16198,7 @@
module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -10013,7 +9642,7 @@
+@@ -10012,7 +9641,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -16207,7 +16207,7 @@
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -10115,7 +9744,7 @@
+@@ -10114,7 +9743,7 @@
link_all_deplibs=yes
;;
@@ -16216,7 +16216,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10135,24 +9764,28 @@
+@@ -10134,24 +9763,28 @@
;;
openbsd*)
@@ -16262,7 +16262,7 @@
fi
;;
-@@ -10211,17 +9844,16 @@
+@@ -10210,17 +9843,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -16289,7 +16289,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10278,7 +9910,7 @@
+@@ -10277,7 +9909,7 @@
fi
;;
@@ -16298,7 +16298,7 @@
no_undefined_flag='${wl}-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
-@@ -10355,7 +9987,7 @@
+@@ -10354,7 +9986,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -16307,7 +16307,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -10413,17 +10045,55 @@
+@@ -10412,17 +10044,55 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -16367,7 +16367,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -10583,12 +10253,8 @@
+@@ -10582,12 +10252,8 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -16382,7 +16382,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -10605,18 +10271,6 @@
+@@ -10604,18 +10270,6 @@
dynamic_linker=no
;;
@@ -16401,7 +16401,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -10654,7 +10308,7 @@
+@@ -10653,7 +10307,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -16410,7 +16410,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10717,7 +10371,7 @@
+@@ -10716,7 +10370,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -16419,7 +16419,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10772,7 +10426,7 @@
+@@ -10771,7 +10425,7 @@
;;
# This must be Linux ELF.
@@ -16428,7 +16428,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10786,31 +10440,10 @@
+@@ -10785,31 +10439,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -16436,7 +16436,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 10793 "configure"' > conftest.$ac_ext
+- echo '#line 10792 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -16462,7 +16462,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10822,7 +10455,7 @@
+@@ -10821,7 +10454,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -16471,7 +16471,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10831,7 +10464,7 @@
+@@ -10830,7 +10463,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -16480,7 +16480,7 @@
;;
netbsd*)
-@@ -10915,6 +10548,10 @@
+@@ -10914,6 +10547,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -16491,7 +16491,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11068,6 +10705,7 @@
+@@ -11067,6 +10704,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -16499,7 +16499,7 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
-@@ -11151,27 +10789,11 @@
+@@ -11150,27 +10788,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16532,7 +16532,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11180,7 +10802,7 @@
+@@ -11179,7 +10801,7 @@
ac_cv_lib_dl_dlopen=no
fi
@@ -16541,7 +16541,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -11262,27 +10884,11 @@
+@@ -11261,27 +10883,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16574,7 +16574,7 @@
ac_cv_func_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11291,7 +10897,7 @@
+@@ -11290,7 +10896,7 @@
ac_cv_func_shl_load=no
fi
@@ -16583,7 +16583,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-@@ -11341,27 +10947,11 @@
+@@ -11340,27 +10946,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16616,7 +16616,7 @@
ac_cv_lib_dld_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11370,7 +10960,7 @@
+@@ -11369,7 +10959,7 @@
ac_cv_lib_dld_shl_load=no
fi
@@ -16625,7 +16625,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -11442,27 +11032,11 @@
+@@ -11441,27 +11031,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16658,7 +16658,7 @@
ac_cv_func_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11471,7 +11045,7 @@
+@@ -11470,7 +11044,7 @@
ac_cv_func_dlopen=no
fi
@@ -16667,7 +16667,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-@@ -11521,27 +11095,11 @@
+@@ -11520,27 +11094,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16700,7 +16700,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11550,7 +11108,7 @@
+@@ -11549,7 +11107,7 @@
ac_cv_lib_dl_dlopen=no
fi
@@ -16709,7 +16709,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -11601,27 +11159,11 @@
+@@ -11600,27 +11158,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16742,7 +16742,7 @@
ac_cv_lib_svld_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11630,7 +11172,7 @@
+@@ -11629,7 +11171,7 @@
ac_cv_lib_svld_dlopen=no
fi
@@ -16751,7 +16751,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -11681,27 +11223,11 @@
+@@ -11680,27 +11222,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16784,7 +16784,7 @@
ac_cv_lib_dld_dld_link=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11710,7 +11236,7 @@
+@@ -11709,7 +11235,7 @@
ac_cv_lib_dld_dld_link=no
fi
@@ -16793,25 +16793,25 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -11766,7 +11292,7 @@
+@@ -11765,7 +11291,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11769 "configure"
-+#line 11295 "configure"
+-#line 11768 "configure"
++#line 11294 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11866,7 +11392,7 @@
+@@ -11865,7 +11391,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11869 "configure"
-+#line 11395 "configure"
+-#line 11868 "configure"
++#line 11394 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12064,6 +11590,7 @@
+@@ -12063,6 +11589,7 @@
module_cmds \
module_expsym_cmds \
lt_cv_prog_compiler_c_o \
@@ -16819,7 +16819,7 @@
exclude_expsyms \
include_expsyms; do
-@@ -12108,7 +11635,7 @@
+@@ -12107,7 +11634,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -16828,7 +16828,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -12432,7 +11959,7 @@
+@@ -12431,7 +11958,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -16837,7 +16837,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -12601,10 +12128,10 @@
+@@ -12600,10 +12127,10 @@
objext_CXX=$objext
# Code to be used in simple compile tests
@@ -16850,7 +16850,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -12620,13 +12147,13 @@
+@@ -12619,13 +12146,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -16866,7 +16866,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -12885,7 +12412,7 @@
+@@ -12884,7 +12411,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -16875,7 +16875,7 @@
else
# We have old collect2
hardcode_direct_CXX=unsupported
-@@ -12953,33 +12480,24 @@
+@@ -12952,33 +12479,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16926,7 +16926,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -12987,7 +12505,7 @@
+@@ -12986,7 +12504,7 @@
fi
@@ -16935,7 +16935,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13029,33 +12547,24 @@
+@@ -13028,33 +12546,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16986,7 +16986,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -13063,7 +12572,7 @@
+@@ -13062,7 +12571,7 @@
fi
@@ -16995,7 +16995,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13174,10 +12683,10 @@
+@@ -13173,10 +12682,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -17008,7 +17008,7 @@
module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -13211,7 +12720,7 @@
+@@ -13210,7 +12719,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -17017,7 +17017,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13260,9 +12769,7 @@
+@@ -13259,9 +12768,7 @@
hardcode_libdir_separator_CXX=:
case $host_cpu in
@@ -17028,7 +17028,7 @@
*)
export_dynamic_flag_spec_CXX='${wl}-E'
;;
-@@ -13330,7 +12837,7 @@
+@@ -13329,7 +12836,7 @@
;;
esac
;;
@@ -17037,7 +17037,7 @@
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -13370,7 +12877,7 @@
+@@ -13369,7 +12876,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -17046,7 +17046,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -13450,6 +12957,29 @@
+@@ -13449,6 +12956,29 @@
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -17076,7 +17076,7 @@
esac
;;
lynxos*)
-@@ -13472,7 +13002,7 @@
+@@ -13471,7 +13001,7 @@
;;
esac
;;
@@ -17085,7 +17085,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13488,16 +13018,20 @@
+@@ -13487,16 +13017,20 @@
ld_shlibs_CXX=no
;;
openbsd*)
@@ -17115,7 +17115,7 @@
;;
osf3*)
case $cc_basename in
-@@ -13659,15 +13193,10 @@
+@@ -13658,15 +13192,10 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -17134,7 +17134,7 @@
;;
esac
link_all_deplibs_CXX=yes
-@@ -13714,6 +13243,12 @@
+@@ -13713,6 +13242,12 @@
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -17147,7 +17147,7 @@
fi
;;
esac
-@@ -13905,7 +13440,7 @@
+@@ -13904,7 +13439,7 @@
# PORTME: override above test on systems where it is broken
case $host_os in
@@ -17156,7 +17156,7 @@
# Interix 3.5 installs completely hosed .la files for C++, so rather than
# hack all around it, let's just trust "g++" to DTRT.
predep_objects_CXX=
-@@ -13913,13 +13448,46 @@
+@@ -13912,13 +13447,46 @@
postdeps_CXX=
;;
@@ -17204,7 +17204,7 @@
;;
esac
;;
-@@ -13956,12 +13524,14 @@
+@@ -13955,12 +13523,14 @@
# like `-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
@@ -17221,7 +17221,7 @@
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -13973,7 +13543,7 @@
+@@ -13972,7 +13542,7 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -17230,7 +17230,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -14039,7 +13609,7 @@
+@@ -14038,7 +13608,7 @@
;;
esac
;;
@@ -17239,7 +17239,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -14082,7 +13652,7 @@
+@@ -14081,7 +13651,7 @@
;;
esac
;;
@@ -17248,7 +17248,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -14109,6 +13679,14 @@
+@@ -14108,6 +13678,14 @@
lt_prog_compiler_static_CXX='-non_shared'
;;
*)
@@ -17263,7 +17263,7 @@
;;
esac
;;
-@@ -14125,7 +13703,7 @@
+@@ -14124,7 +13702,7 @@
;;
esac
;;
@@ -17272,7 +17272,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -14223,7 +13801,7 @@
+@@ -14222,7 +13800,7 @@
else
lt_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
@@ -17281,21 +17281,21 @@
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -14234,11 +13812,11 @@
+@@ -14233,11 +13811,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:14237: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13815: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14236: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13814: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14241: \$? = $ac_status" >&5
-+ echo "$as_me:13819: \$? = $ac_status" >&5
+- echo "$as_me:14240: \$? = $ac_status" >&5
++ echo "$as_me:13818: \$? = $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.
-@@ -14287,7 +13865,7 @@
+@@ -14286,7 +13864,7 @@
lt_prog_compiler_static_works_CXX=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -17304,7 +17304,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -14327,7 +13905,7 @@
+@@ -14326,7 +13904,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -17313,21 +17313,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -14338,11 +13916,11 @@
+@@ -14337,11 +13915,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:14341: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13919: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14340: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13918: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14345: \$? = $ac_status" >&5
-+ echo "$as_me:13923: \$? = $ac_status" >&5
+- echo "$as_me:14344: \$? = $ac_status" >&5
++ echo "$as_me:13922: \$? = $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
-@@ -14408,7 +13986,10 @@
+@@ -14407,7 +13985,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -17339,7 +17339,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14439,7 +14020,7 @@
+@@ -14438,7 +14019,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -17348,7 +17348,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -14497,20 +14078,7 @@
+@@ -14496,20 +14077,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -17370,7 +17370,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14667,12 +14235,7 @@
+@@ -14666,12 +14234,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -17384,7 +17384,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -14689,18 +14252,6 @@
+@@ -14688,18 +14251,6 @@
dynamic_linker=no
;;
@@ -17403,7 +17403,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -14738,7 +14289,7 @@
+@@ -14737,7 +14288,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -17412,7 +17412,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14801,7 +14352,7 @@
+@@ -14800,7 +14351,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -17421,7 +17421,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14856,7 +14407,7 @@
+@@ -14855,7 +14406,7 @@
;;
# This must be Linux ELF.
@@ -17430,7 +17430,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14870,31 +14421,10 @@
+@@ -14869,31 +14420,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -17438,7 +17438,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 14877 "configure"' > conftest.$ac_ext
+- echo '#line 14876 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -17464,7 +17464,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14906,7 +14436,7 @@
+@@ -14905,7 +14435,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -17473,7 +17473,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14915,7 +14445,7 @@
+@@ -14914,7 +14444,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -17482,7 +17482,7 @@
;;
netbsd*)
-@@ -14999,6 +14529,10 @@
+@@ -14998,6 +14528,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -17493,7 +17493,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -15193,6 +14727,7 @@
+@@ -15192,6 +14726,7 @@
module_cmds_CXX \
module_expsym_cmds_CXX \
lt_cv_prog_compiler_c_o_CXX \
@@ -17501,7 +17501,7 @@
exclude_expsyms_CXX \
include_expsyms_CXX; do
-@@ -15513,7 +15048,7 @@
+@@ -15512,7 +15047,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -17510,7 +17510,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
-@@ -15604,10 +15139,17 @@
+@@ -15603,10 +15138,17 @@
objext_F77=$objext
# Code to be used in simple compile tests
@@ -17530,7 +17530,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -15623,13 +15165,13 @@
+@@ -15622,13 +15164,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -17546,7 +17546,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -15716,13 +15258,15 @@
+@@ -15715,13 +15257,15 @@
lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
;;
@@ -17564,7 +17564,7 @@
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
;;
-@@ -15732,7 +15276,7 @@
+@@ -15731,7 +15275,7 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -17573,7 +17573,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -15790,7 +15334,7 @@
+@@ -15789,7 +15333,7 @@
esac
;;
@@ -17582,7 +17582,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-@@ -15823,7 +15367,7 @@
+@@ -15822,7 +15366,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -17591,7 +17591,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
-@@ -15842,6 +15386,22 @@
+@@ -15841,6 +15385,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -17614,7 +17614,7 @@
esac
;;
-@@ -15851,6 +15411,10 @@
+@@ -15850,6 +15410,10 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -17625,7 +17625,7 @@
solaris*)
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -15918,7 +15482,7 @@
+@@ -15917,7 +15481,7 @@
else
lt_prog_compiler_pic_works_F77=no
ac_outfile=conftest.$ac_objext
@@ -17634,21 +17634,21 @@
lt_compiler_flag="$lt_prog_compiler_pic_F77"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -15929,11 +15493,11 @@
+@@ -15928,11 +15492,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:15932: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15496: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15931: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15495: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:15936: \$? = $ac_status" >&5
-+ echo "$as_me:15500: \$? = $ac_status" >&5
+- echo "$as_me:15935: \$? = $ac_status" >&5
++ echo "$as_me:15499: \$? = $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.
-@@ -15982,7 +15546,7 @@
+@@ -15981,7 +15545,7 @@
lt_prog_compiler_static_works_F77=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -17657,7 +17657,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -16022,7 +15586,7 @@
+@@ -16021,7 +15585,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -17666,21 +17666,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -16033,11 +15597,11 @@
+@@ -16032,11 +15596,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:16036: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15600: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16035: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15599: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16040: \$? = $ac_status" >&5
-+ echo "$as_me:15604: \$? = $ac_status" >&5
+- echo "$as_me:16039: \$? = $ac_status" >&5
++ echo "$as_me:15603: \$? = $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
-@@ -16229,7 +15793,7 @@
+@@ -16228,7 +15792,7 @@
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
@@ -17689,7 +17689,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -16247,7 +15811,7 @@
+@@ -16246,7 +15810,7 @@
fi
;;
@@ -17698,7 +17698,7 @@
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -16262,7 +15826,7 @@
+@@ -16261,7 +15825,7 @@
archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -17707,7 +17707,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -16280,20 +15844,30 @@
+@@ -16279,20 +15843,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -17741,7 +17741,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -16445,7 +16019,7 @@
+@@ -16444,7 +16018,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -17750,7 +17750,7 @@
else
# We have old collect2
hardcode_direct_F77=unsupported
-@@ -16503,33 +16077,24 @@
+@@ -16502,33 +16076,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -17801,7 +17801,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16537,7 +16102,7 @@
+@@ -16536,7 +16101,7 @@
fi
@@ -17810,7 +17810,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16568,33 +16133,24 @@
+@@ -16567,33 +16132,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -17861,7 +17861,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16602,7 +16158,7 @@
+@@ -16601,7 +16157,7 @@
fi
@@ -17870,7 +17870,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16648,7 +16204,7 @@
+@@ -16647,7 +16203,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
@@ -17879,7 +17879,7 @@
fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_F77=yes
;;
-@@ -16690,10 +16246,10 @@
+@@ -16689,10 +16245,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -17892,7 +17892,7 @@
module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -16733,7 +16289,7 @@
+@@ -16732,7 +16288,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -17901,7 +17901,7 @@
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
-@@ -16835,7 +16391,7 @@
+@@ -16834,7 +16390,7 @@
link_all_deplibs_F77=yes
;;
@@ -17910,7 +17910,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16855,24 +16411,28 @@
+@@ -16854,24 +16410,28 @@
;;
openbsd*)
@@ -17956,7 +17956,7 @@
fi
;;
-@@ -16931,17 +16491,16 @@
+@@ -16930,17 +16490,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -17983,7 +17983,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -16998,7 +16557,7 @@
+@@ -16997,7 +16556,7 @@
fi
;;
@@ -17992,7 +17992,7 @@
no_undefined_flag_F77='${wl}-z,text'
archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
-@@ -17075,7 +16634,7 @@
+@@ -17074,7 +16633,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -18001,7 +18001,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -17133,20 +16692,7 @@
+@@ -17132,20 +16691,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18023,7 +18023,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17303,12 +16849,7 @@
+@@ -17302,12 +16848,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -18037,7 +18037,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -17325,18 +16866,6 @@
+@@ -17324,18 +16865,6 @@
dynamic_linker=no
;;
@@ -18056,7 +18056,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -17374,7 +16903,7 @@
+@@ -17373,7 +16902,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -18065,7 +18065,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17437,7 +16966,7 @@
+@@ -17436,7 +16965,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -18074,7 +18074,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17492,7 +17021,7 @@
+@@ -17491,7 +17020,7 @@
;;
# This must be Linux ELF.
@@ -18083,7 +18083,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17506,31 +17035,10 @@
+@@ -17505,31 +17034,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -18091,7 +18091,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 17513 "configure"' > conftest.$ac_ext
+- echo '#line 17512 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -18117,7 +18117,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -17542,7 +17050,7 @@
+@@ -17541,7 +17049,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -18126,7 +18126,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17551,7 +17059,7 @@
+@@ -17550,7 +17058,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -18135,7 +18135,7 @@
;;
netbsd*)
-@@ -17635,6 +17143,10 @@
+@@ -17634,6 +17142,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -18146,7 +18146,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17829,6 +17341,7 @@
+@@ -17828,6 +17340,7 @@
module_cmds_F77 \
module_expsym_cmds_F77 \
lt_cv_prog_compiler_c_o_F77 \
@@ -18154,7 +18154,7 @@
exclude_expsyms_F77 \
include_expsyms_F77; do
-@@ -18149,7 +17662,7 @@
+@@ -18148,7 +17661,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -18163,7 +18163,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_F77
-@@ -18207,10 +17720,10 @@
+@@ -18206,10 +17719,10 @@
objext_GCJ=$objext
# Code to be used in simple compile tests
@@ -18176,7 +18176,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -18226,13 +17739,13 @@
+@@ -18225,13 +17738,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -18192,7 +18192,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -18273,7 +17786,7 @@
+@@ -18272,7 +17785,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -18201,21 +18201,21 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -18284,11 +17797,11 @@
+@@ -18283,11 +17796,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:18287: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17800: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18286: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17799: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18291: \$? = $ac_status" >&5
-+ echo "$as_me:17804: \$? = $ac_status" >&5
+- echo "$as_me:18290: \$? = $ac_status" >&5
++ echo "$as_me:17803: \$? = $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.
-@@ -18339,13 +17852,15 @@
+@@ -18338,13 +17851,15 @@
lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
;;
@@ -18233,7 +18233,7 @@
lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
;;
-@@ -18355,7 +17870,7 @@
+@@ -18354,7 +17869,7 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -18242,7 +18242,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -18413,7 +17928,7 @@
+@@ -18412,7 +17927,7 @@
esac
;;
@@ -18251,7 +18251,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-@@ -18446,7 +17961,7 @@
+@@ -18445,7 +17960,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -18260,7 +18260,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18465,6 +17980,22 @@
+@@ -18464,6 +17979,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -18283,7 +18283,7 @@
esac
;;
-@@ -18474,6 +18005,10 @@
+@@ -18473,6 +18004,10 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -18294,7 +18294,7 @@
solaris*)
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18541,7 +18076,7 @@
+@@ -18540,7 +18075,7 @@
else
lt_prog_compiler_pic_works_GCJ=no
ac_outfile=conftest.$ac_objext
@@ -18303,21 +18303,21 @@
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -18552,11 +18087,11 @@
+@@ -18551,11 +18086,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:18555: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18090: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18554: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18089: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18559: \$? = $ac_status" >&5
-+ echo "$as_me:18094: \$? = $ac_status" >&5
+- echo "$as_me:18558: \$? = $ac_status" >&5
++ echo "$as_me:18093: \$? = $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.
-@@ -18605,7 +18140,7 @@
+@@ -18604,7 +18139,7 @@
lt_prog_compiler_static_works_GCJ=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -18326,7 +18326,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -18645,7 +18180,7 @@
+@@ -18644,7 +18179,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -18335,21 +18335,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -18656,11 +18191,11 @@
+@@ -18655,11 +18190,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:18659: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18194: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18658: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18193: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18663: \$? = $ac_status" >&5
-+ echo "$as_me:18198: \$? = $ac_status" >&5
+- echo "$as_me:18662: \$? = $ac_status" >&5
++ echo "$as_me:18197: \$? = $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
-@@ -18852,7 +18387,7 @@
+@@ -18851,7 +18386,7 @@
allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
@@ -18358,7 +18358,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -18870,7 +18405,7 @@
+@@ -18869,7 +18404,7 @@
fi
;;
@@ -18367,7 +18367,7 @@
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -18885,7 +18420,7 @@
+@@ -18884,7 +18419,7 @@
archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -18376,7 +18376,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -18903,20 +18438,30 @@
+@@ -18902,20 +18437,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -18410,7 +18410,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -19068,7 +18613,7 @@
+@@ -19067,7 +18612,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -18419,7 +18419,7 @@
else
# We have old collect2
hardcode_direct_GCJ=unsupported
-@@ -19136,33 +18681,24 @@
+@@ -19135,33 +18680,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -18470,7 +18470,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -19170,7 +18706,7 @@
+@@ -19169,7 +18705,7 @@
fi
@@ -18479,7 +18479,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19211,33 +18747,24 @@
+@@ -19210,33 +18746,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -18530,7 +18530,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -19245,7 +18772,7 @@
+@@ -19244,7 +18771,7 @@
fi
@@ -18539,7 +18539,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19291,7 +18818,7 @@
+@@ -19290,7 +18817,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
@@ -18548,7 +18548,7 @@
fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_GCJ=yes
;;
-@@ -19333,10 +18860,10 @@
+@@ -19332,10 +18859,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -18561,7 +18561,7 @@
module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -19376,7 +18903,7 @@
+@@ -19375,7 +18902,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -18570,7 +18570,7 @@
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
-@@ -19478,7 +19005,7 @@
+@@ -19477,7 +19004,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -18579,7 +18579,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19498,24 +19025,28 @@
+@@ -19497,24 +19024,28 @@
;;
openbsd*)
@@ -18625,7 +18625,7 @@
fi
;;
-@@ -19574,17 +19105,16 @@
+@@ -19573,17 +19104,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -18652,7 +18652,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19641,7 +19171,7 @@
+@@ -19640,7 +19170,7 @@
fi
;;
@@ -18661,7 +18661,7 @@
no_undefined_flag_GCJ='${wl}-z,text'
archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
-@@ -19718,7 +19248,7 @@
+@@ -19717,7 +19247,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -18670,7 +18670,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -19776,20 +19306,7 @@
+@@ -19775,20 +19305,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18692,7 +18692,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19946,12 +19463,7 @@
+@@ -19945,12 +19462,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -18706,7 +18706,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -19968,18 +19480,6 @@
+@@ -19967,18 +19479,6 @@
dynamic_linker=no
;;
@@ -18725,7 +18725,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -20017,7 +19517,7 @@
+@@ -20016,7 +19516,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -18734,7 +18734,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -20080,7 +19580,7 @@
+@@ -20079,7 +19579,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -18743,7 +18743,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -20135,7 +19635,7 @@
+@@ -20134,7 +19634,7 @@
;;
# This must be Linux ELF.
@@ -18752,7 +18752,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -20149,31 +19649,10 @@
+@@ -20148,31 +19648,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -18760,7 +18760,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 20156 "configure"' > conftest.$ac_ext
+- echo '#line 20155 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -18786,7 +18786,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -20185,7 +19664,7 @@
+@@ -20184,7 +19663,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -18795,7 +18795,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -20194,7 +19673,7 @@
+@@ -20193,7 +19672,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -18804,7 +18804,7 @@
;;
netbsd*)
-@@ -20278,6 +19757,10 @@
+@@ -20277,6 +19756,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -18815,7 +18815,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -20472,6 +19955,7 @@
+@@ -20471,6 +19954,7 @@
module_cmds_GCJ \
module_expsym_cmds_GCJ \
lt_cv_prog_compiler_c_o_GCJ \
@@ -18823,7 +18823,7 @@
exclude_expsyms_GCJ \
include_expsyms_GCJ; do
-@@ -20792,7 +20276,7 @@
+@@ -20791,7 +20275,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -18832,7 +18832,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_GCJ
-@@ -20849,7 +20333,7 @@
+@@ -20848,7 +20332,7 @@
objext_RC=$objext
# Code to be used in simple compile tests
@@ -18841,7 +18841,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -20868,13 +20352,13 @@
+@@ -20867,13 +20351,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -18857,7 +18857,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -20952,6 +20436,7 @@
+@@ -20951,6 +20435,7 @@
module_cmds_RC \
module_expsym_cmds_RC \
lt_cv_prog_compiler_c_o_RC \
@@ -18865,7 +18865,7 @@
exclude_expsyms_RC \
include_expsyms_RC; do
-@@ -21272,7 +20757,7 @@
+@@ -21271,7 +20756,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -18874,7 +18874,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_RC
-@@ -21395,7 +20880,7 @@
+@@ -21394,7 +20879,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -18883,7 +18883,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21438,7 +20923,7 @@
+@@ -21437,7 +20922,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -18892,7 +18892,7 @@
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21686,7 +21171,7 @@
+@@ -21685,7 +21170,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -18901,7 +18901,7 @@
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21766,27 +21251,11 @@
+@@ -21765,27 +21250,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -18934,7 +18934,7 @@
DATADIRNAME=share
else
echo "$as_me: failed program was:" >&5
-@@ -21857,27 +21326,11 @@
+@@ -21856,27 +21325,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -18967,7 +18967,7 @@
ac_cv_func_bind_textdomain_codeset=yes
else
echo "$as_me: failed program was:" >&5
-@@ -21886,7 +21339,7 @@
+@@ -21885,7 +21338,7 @@
ac_cv_func_bind_textdomain_codeset=no
fi
@@ -18976,7 +18976,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-@@ -21904,7 +21357,7 @@
+@@ -21903,7 +21356,7 @@
esac
fi
@@ -18985,7 +18985,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -21965,27 +21418,10 @@
+@@ -21964,27 +21417,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19017,7 +19017,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22021,17 +21457,10 @@
+@@ -22020,17 +21456,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19039,7 +19039,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22129,27 +21558,11 @@
+@@ -22128,27 +21557,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19072,7 +19072,7 @@
am_cv_val_LC_MESSAGES=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22158,7 +21571,7 @@
+@@ -22157,7 +21570,7 @@
am_cv_val_LC_MESSAGES=no
fi
@@ -19081,7 +19081,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-@@ -22214,27 +21627,10 @@
+@@ -22213,27 +21626,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19113,7 +19113,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22270,17 +21666,10 @@
+@@ -22269,17 +21665,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19135,7 +19135,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22376,27 +21765,11 @@
+@@ -22375,27 +21764,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19168,7 +19168,7 @@
gt_cv_func_ngettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22405,7 +21778,7 @@
+@@ -22404,7 +21777,7 @@
gt_cv_func_ngettext_libc=no
fi
@@ -19177,7 +19177,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -22448,27 +21821,11 @@
+@@ -22447,27 +21820,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19210,7 +19210,7 @@
gt_cv_func_dgettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22477,7 +21834,7 @@
+@@ -22476,7 +21833,7 @@
gt_cv_func_dgettext_libc=no
fi
@@ -19219,7 +19219,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -22553,27 +21910,11 @@
+@@ -22552,27 +21909,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19252,7 +19252,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -22582,7 +21923,7 @@
+@@ -22581,7 +21922,7 @@
eval "$as_ac_var=no"
fi
@@ -19261,7 +19261,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -22647,27 +21988,11 @@
+@@ -22646,27 +21987,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19294,7 +19294,7 @@
ac_cv_lib_intl_bindtextdomain=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22676,7 +22001,7 @@
+@@ -22675,7 +22000,7 @@
ac_cv_lib_intl_bindtextdomain=no
fi
@@ -19303,7 +19303,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -22725,27 +22050,11 @@
+@@ -22724,27 +22049,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19336,7 +19336,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22754,7 +22063,7 @@
+@@ -22753,7 +22062,7 @@
ac_cv_lib_intl_ngettext=no
fi
@@ -19345,7 +19345,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -22803,27 +22112,11 @@
+@@ -22802,27 +22111,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19378,7 +19378,7 @@
ac_cv_lib_intl_dgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22832,7 +22125,7 @@
+@@ -22831,7 +22124,7 @@
ac_cv_lib_intl_dgettext=no
fi
@@ -19387,7 +19387,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -22894,27 +22187,11 @@
+@@ -22893,27 +22186,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19420,7 +19420,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22923,7 +22200,7 @@
+@@ -22922,7 +22199,7 @@
ac_cv_lib_intl_ngettext=no
fi
@@ -19429,7 +19429,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -22972,27 +22249,11 @@
+@@ -22971,27 +22248,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19462,7 +19462,7 @@
ac_cv_lib_intl_dcgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23001,7 +22262,7 @@
+@@ -23000,7 +22261,7 @@
ac_cv_lib_intl_dcgettext=no
fi
@@ -19471,7 +19471,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23096,27 +22357,11 @@
+@@ -23095,27 +22356,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19504,7 +19504,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -23125,7 +22370,7 @@
+@@ -23124,7 +22369,7 @@
eval "$as_ac_var=no"
fi
@@ -19513,7 +19513,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -23272,27 +22517,11 @@
+@@ -23271,27 +22516,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19546,7 +19546,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -23301,7 +22530,7 @@
+@@ -23300,7 +22529,7 @@
eval "$as_ac_var=no"
fi
@@ -19555,7 +19555,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -23362,7 +22591,7 @@
+@@ -23361,7 +22590,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -19564,7 +19564,7 @@
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -23450,27 +22679,11 @@
+@@ -23449,27 +22678,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19597,7 +19597,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -23542,27 +22755,11 @@
+@@ -23541,27 +22754,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19630,7 +19630,7 @@
ac_cv_func_bind_textdomain_codeset=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23571,7 +22768,7 @@
+@@ -23570,7 +22767,7 @@
ac_cv_func_bind_textdomain_codeset=no
fi
@@ -19639,7 +19639,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-@@ -23592,7 +22789,7 @@
+@@ -23591,7 +22788,7 @@
esac
fi
@@ -19648,7 +19648,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
-@@ -23799,27 +22996,10 @@
+@@ -23798,27 +22995,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19680,7 +19680,7 @@
has_option=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24017,17 +23197,10 @@
+@@ -24016,17 +23196,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19702,7 +19702,7 @@
# We can compile using X headers with no special include directory.
ac_x_includes=
else
-@@ -24050,7 +23223,7 @@
+@@ -24049,7 +23222,7 @@
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
@@ -19711,7 +19711,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24079,27 +23252,11 @@
+@@ -24078,27 +23251,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19744,7 +19744,7 @@
LIBS=$ac_save_LIBS
# We can link X programs with no special library path.
ac_x_libraries=
-@@ -24112,7 +23269,7 @@
+@@ -24111,7 +23268,7 @@
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
@@ -19753,7 +19753,7 @@
ac_x_libraries=$ac_dir
break 2
fi
-@@ -24120,7 +23277,7 @@
+@@ -24119,7 +23276,7 @@
done
fi
@@ -19762,7 +19762,7 @@
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
-@@ -24175,12 +23332,12 @@
+@@ -24174,12 +23331,12 @@
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
@@ -19780,7 +19780,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -24208,44 +23365,20 @@
+@@ -24207,44 +23364,20 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19834,7 +19834,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -24273,48 +23406,30 @@
+@@ -24272,48 +23405,30 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19900,7 +19900,7 @@
fi
# Check for system-dependent libraries X programs must link with.
-@@ -24363,27 +23478,11 @@
+@@ -24362,27 +23477,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19933,7 +19933,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -24431,27 +23530,11 @@
+@@ -24430,27 +23529,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19966,7 +19966,7 @@
ac_cv_lib_dnet_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24460,7 +23543,7 @@
+@@ -24459,7 +23542,7 @@
ac_cv_lib_dnet_dnet_ntoa=no
fi
@@ -19975,7 +19975,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -24513,27 +23596,11 @@
+@@ -24512,27 +23595,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20008,7 +20008,7 @@
ac_cv_lib_dnet_stub_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24542,7 +23609,7 @@
+@@ -24541,7 +23608,7 @@
ac_cv_lib_dnet_stub_dnet_ntoa=no
fi
@@ -20017,7 +20017,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -24555,7 +23622,7 @@
+@@ -24554,7 +23621,7 @@
fi
fi
@@ -20026,7 +20026,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
-@@ -24630,27 +23697,11 @@
+@@ -24629,27 +23696,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20059,7 +20059,7 @@
ac_cv_func_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24659,7 +23710,7 @@
+@@ -24658,7 +23709,7 @@
ac_cv_func_gethostbyname=no
fi
@@ -20068,7 +20068,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-@@ -24708,27 +23759,11 @@
+@@ -24707,27 +23758,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20101,7 +20101,7 @@
ac_cv_lib_nsl_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24737,7 +23772,7 @@
+@@ -24736,7 +23771,7 @@
ac_cv_lib_nsl_gethostbyname=no
fi
@@ -20110,7 +20110,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -24790,27 +23825,11 @@
+@@ -24789,27 +23824,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20143,7 +20143,7 @@
ac_cv_lib_bsd_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24819,7 +23838,7 @@
+@@ -24818,7 +23837,7 @@
ac_cv_lib_bsd_gethostbyname=no
fi
@@ -20152,7 +20152,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -24902,27 +23921,11 @@
+@@ -24901,27 +23920,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20185,7 +20185,7 @@
ac_cv_func_connect=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24931,7 +23934,7 @@
+@@ -24930,7 +23933,7 @@
ac_cv_func_connect=no
fi
@@ -20194,7 +20194,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-@@ -24980,27 +23983,11 @@
+@@ -24979,27 +23982,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20227,7 +20227,7 @@
ac_cv_lib_socket_connect=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25009,7 +23996,7 @@
+@@ -25008,7 +23995,7 @@
ac_cv_lib_socket_connect=no
fi
@@ -20236,7 +20236,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -25085,27 +24072,11 @@
+@@ -25084,27 +24071,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20269,7 +20269,7 @@
ac_cv_func_remove=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25114,7 +24085,7 @@
+@@ -25113,7 +24084,7 @@
ac_cv_func_remove=no
fi
@@ -20278,7 +20278,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-@@ -25163,27 +24134,11 @@
+@@ -25162,27 +24133,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20311,7 +20311,7 @@
ac_cv_lib_posix_remove=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25192,7 +24147,7 @@
+@@ -25191,7 +24146,7 @@
ac_cv_lib_posix_remove=no
fi
@@ -20320,7 +20320,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -25268,27 +24223,11 @@
+@@ -25267,27 +24222,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20353,7 +20353,7 @@
ac_cv_func_shmat=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25297,7 +24236,7 @@
+@@ -25296,7 +24235,7 @@
ac_cv_func_shmat=no
fi
@@ -20362,7 +20362,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-@@ -25346,27 +24285,11 @@
+@@ -25345,27 +24284,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20395,7 +20395,7 @@
ac_cv_lib_ipc_shmat=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25375,7 +24298,7 @@
+@@ -25374,7 +24297,7 @@
ac_cv_lib_ipc_shmat=no
fi
@@ -20404,7 +20404,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -25439,27 +24362,11 @@
+@@ -25438,27 +24361,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20437,7 +20437,7 @@
ac_cv_lib_ICE_IceConnectionNumber=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25468,7 +24375,7 @@
+@@ -25467,7 +24374,7 @@
ac_cv_lib_ICE_IceConnectionNumber=no
fi
@@ -20446,7 +20446,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -25547,27 +24454,11 @@
+@@ -25546,27 +24453,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20479,7 +20479,7 @@
ac_cv_func_XScreenSaverQueryInfo=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25576,7 +24467,7 @@
+@@ -25575,7 +24466,7 @@
ac_cv_func_XScreenSaverQueryInfo=no
fi
@@ -20488,7 +20488,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XScreenSaverQueryInfo" >&5
-@@ -25630,27 +24521,11 @@
+@@ -25629,27 +24520,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20521,7 +20521,7 @@
ac_cv_lib_Xss_XScreenSaverQueryInfo=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25659,7 +24534,7 @@
+@@ -25658,7 +24533,7 @@
ac_cv_lib_Xss_XScreenSaverQueryInfo=no
fi
@@ -20530,7 +20530,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -25715,27 +24590,11 @@
+@@ -25714,27 +24589,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20563,7 +20563,7 @@
ac_cv_lib_Xext_XScreenSaverQueryInfo=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25744,7 +24603,7 @@
+@@ -25743,7 +24602,7 @@
ac_cv_lib_Xext_XScreenSaverQueryInfo=no
fi
@@ -20572,7 +20572,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -25805,27 +24664,10 @@
+@@ -25804,27 +24663,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20604,7 +20604,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25861,17 +24703,10 @@
+@@ -25860,17 +24702,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20626,7 +20626,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25977,27 +24812,11 @@
+@@ -25976,27 +24811,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20659,7 +20659,7 @@
ac_cv_lib_Xxf86misc_XF86MiscQueryExtension=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26006,7 +24825,7 @@
+@@ -26005,7 +24824,7 @@
ac_cv_lib_Xxf86misc_XF86MiscQueryExtension=no
fi
@@ -20668,7 +20668,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -26049,27 +24868,10 @@
+@@ -26048,27 +24867,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20700,7 +20700,7 @@
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26134,27 +24936,10 @@
+@@ -26133,27 +24935,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20732,7 +20732,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26190,17 +24975,10 @@
+@@ -26189,17 +24974,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20754,7 +20754,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26235,160 +25013,40 @@
+@@ -26234,160 +25012,40 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -20939,7 +20939,7 @@
pkg_failed=no
{ echo "$as_me:$LINENO: checking for CAPPLET" >&5
-@@ -26480,7 +25138,7 @@
+@@ -26479,7 +25137,7 @@
and CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -20948,7 +20948,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -26490,7 +25148,7 @@
+@@ -26489,7 +25147,7 @@
and CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -20957,7 +20957,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -26591,7 +25249,7 @@
+@@ -26590,7 +25248,7 @@
and GNOMECC_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -20966,7 +20966,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -26601,7 +25259,7 @@
+@@ -26600,7 +25258,7 @@
and GNOMECC_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -20975,7 +20975,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -26702,7 +25360,7 @@
+@@ -26701,7 +25359,7 @@
and GNOME_SETTINGS_DAEMON_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -20984,7 +20984,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -26712,7 +25370,7 @@
+@@ -26711,7 +25369,7 @@
and GNOME_SETTINGS_DAEMON_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -20993,7 +20993,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -26813,7 +25471,7 @@
+@@ -26812,7 +25470,7 @@
and OLD_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21002,7 +21002,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -26823,7 +25481,7 @@
+@@ -26822,7 +25480,7 @@
and OLD_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21011,7 +21011,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -26924,7 +25582,7 @@
+@@ -26923,7 +25581,7 @@
and GNOME_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21020,7 +21020,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -26934,7 +25592,7 @@
+@@ -26933,7 +25591,7 @@
and GNOME_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21029,7 +21029,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -27035,7 +25693,7 @@
+@@ -27034,7 +25692,7 @@
and GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21038,7 +21038,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -27045,7 +25703,7 @@
+@@ -27044,7 +25702,7 @@
and GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21047,7 +21047,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -27146,7 +25804,7 @@
+@@ -27145,7 +25803,7 @@
and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21056,7 +21056,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -27156,7 +25814,7 @@
+@@ -27155,7 +25813,7 @@
and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21065,7 +21065,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -27257,7 +25915,7 @@
+@@ -27256,7 +25914,7 @@
and VFS_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21074,7 +21074,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -27267,7 +25925,7 @@
+@@ -27266,7 +25924,7 @@
and VFS_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21083,7 +21083,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -27368,7 +26026,7 @@
+@@ -27367,7 +26025,7 @@
and GNOME_DESKTOP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21092,7 +21092,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -27378,7 +26036,7 @@
+@@ -27377,7 +26035,7 @@
and GNOME_DESKTOP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21101,7 +21101,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -27479,7 +26137,7 @@
+@@ -27478,7 +26136,7 @@
and DEFAULT_APPLICATIONS_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21110,7 +21110,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -27489,7 +26147,7 @@
+@@ -27488,7 +26146,7 @@
and DEFAULT_APPLICATIONS_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21119,7 +21119,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -27590,7 +26248,7 @@
+@@ -27589,7 +26247,7 @@
and METACITY_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21128,7 +21128,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -27600,7 +26258,7 @@
+@@ -27599,7 +26257,7 @@
and METACITY_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21137,7 +21137,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -27612,6 +26270,117 @@
+@@ -27611,6 +26269,117 @@
fi
pkg_failed=no
@@ -21255,7 +21255,7 @@
{ echo "$as_me:$LINENO: checking for TYPING" >&5
echo $ECHO_N "checking for TYPING... $ECHO_C" >&6; }
-@@ -27701,7 +26470,7 @@
+@@ -27700,7 +26469,7 @@
and TYPING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21264,7 +21264,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -27711,7 +26480,7 @@
+@@ -27710,7 +26479,7 @@
and TYPING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21273,7 +21273,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -27776,27 +26545,11 @@
+@@ -27775,27 +26544,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21306,7 +21306,7 @@
ac_cv_lib_Xi_XListInputDevices=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27805,7 +26558,7 @@
+@@ -27804,7 +26557,7 @@
ac_cv_lib_Xi_XListInputDevices=no
fi
@@ -21315,7 +21315,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -27840,27 +26593,10 @@
+@@ -27839,27 +26592,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21347,7 +21347,7 @@
ac_cv_header_X11_extensions_XInput_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27991,7 +26727,7 @@
+@@ -27990,7 +26726,7 @@
and FONT_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21356,7 +21356,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -28001,7 +26737,7 @@
+@@ -28000,7 +26736,7 @@
and FONT_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21365,7 +21365,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -28103,7 +26839,7 @@
+@@ -28102,7 +26838,7 @@
and AT_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21374,7 +21374,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -28113,7 +26849,7 @@
+@@ -28112,7 +26848,7 @@
and AT_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21383,7 +21383,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -28168,27 +26904,11 @@
+@@ -28167,27 +26903,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21416,7 +21416,7 @@
ac_cv_lib_Xrandr_XRRUpdateConfiguration=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28197,7 +26917,7 @@
+@@ -28196,7 +26916,7 @@
ac_cv_lib_Xrandr_XRRUpdateConfiguration=no
fi
@@ -21425,7 +21425,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28232,27 +26952,10 @@
+@@ -28231,27 +26951,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21457,7 +21457,7 @@
ac_cv_header_X11_extensions_Xrandr_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28382,7 +27085,7 @@
+@@ -28381,7 +27084,7 @@
and DISPLAY_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21466,7 +21466,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -28392,7 +27095,7 @@
+@@ -28391,7 +27094,7 @@
and DISPLAY_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21475,7 +21475,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -28606,7 +27309,7 @@
+@@ -28622,7 +27325,7 @@
and LIBGNOMEKBD_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21484,7 +21484,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -28616,7 +27319,7 @@
+@@ -28632,7 +27335,7 @@
and LIBGNOMEKBD_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21493,7 +21493,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -28720,7 +27423,7 @@
+@@ -28736,7 +27439,7 @@
and LIBGNOMEKBDUI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21502,7 +21502,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -28730,7 +27433,7 @@
+@@ -28746,7 +27449,7 @@
and LIBGNOMEKBDUI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21511,7 +21511,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -28845,7 +27548,7 @@
+@@ -28861,7 +27564,7 @@
and THEME_METHOD_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21520,7 +21520,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -28855,7 +27558,7 @@
+@@ -28871,7 +27574,7 @@
and THEME_METHOD_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21529,7 +21529,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -28956,7 +27659,7 @@
+@@ -28972,7 +27675,7 @@
and THEMUS_THUMBNAILER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21538,7 +21538,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -28966,7 +27669,7 @@
+@@ -28982,7 +27685,7 @@
and THEMUS_THUMBNAILER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21547,7 +21547,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -29067,7 +27770,7 @@
+@@ -29083,7 +27786,7 @@
and THEMUS_COMPONENT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21556,7 +21556,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -29077,7 +27780,7 @@
+@@ -29093,7 +27796,7 @@
and THEMUS_COMPONENT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21565,7 +21565,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -29178,7 +27881,7 @@
+@@ -29194,7 +27897,7 @@
and THEMUS_APPLIER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21574,7 +21574,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -29188,7 +27891,7 @@
+@@ -29204,7 +27907,7 @@
and THEMUS_APPLIER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21583,7 +21583,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -29289,7 +27992,7 @@
+@@ -29305,7 +28008,7 @@
and FONT_METHOD_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21592,7 +21592,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -29299,7 +28002,7 @@
+@@ -29315,7 +28018,7 @@
and FONT_METHOD_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21601,7 +21601,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -29400,7 +28103,7 @@
+@@ -29416,7 +28119,7 @@
and FONT_THUMBNAILER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21610,7 +21610,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -29410,7 +28113,7 @@
+@@ -29426,7 +28129,7 @@
and FONT_THUMBNAILER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21619,7 +21619,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -29511,7 +28214,7 @@
+@@ -29527,7 +28230,7 @@
and FONT_CONTEXT_MENU_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21628,7 +21628,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -29521,7 +28224,7 @@
+@@ -29537,7 +28240,7 @@
and FONT_CONTEXT_MENU_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21637,7 +21637,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -29622,7 +28325,7 @@
+@@ -29638,7 +28341,7 @@
and FONT_VIEW_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21646,7 +21646,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -29632,7 +28335,7 @@
+@@ -29648,7 +28351,7 @@
and FONT_VIEW_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21655,7 +21655,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -29662,7 +28365,7 @@
+@@ -29678,7 +28381,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -21664,7 +21664,7 @@
ac_cv_path_FREETYPE_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -29815,7 +28518,7 @@
+@@ -29831,7 +28534,7 @@
and LIBEBOOK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21673,7 +21673,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -29825,7 +28528,7 @@
+@@ -29841,7 +28544,7 @@
and LIBEBOOK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21682,7 +21682,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -29947,7 +28650,7 @@
+@@ -29963,7 +28666,7 @@
and HAL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21691,7 +21691,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -29957,7 +28660,7 @@
+@@ -29973,7 +28676,7 @@
and HAL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21700,7 +21700,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -29994,7 +28697,7 @@
+@@ -30010,7 +28713,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -21709,7 +21709,7 @@
ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -30037,7 +28740,7 @@
+@@ -30053,7 +28756,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -21718,7 +21718,7 @@
ac_cv_path_GDK_PIXBUF_CSOURCE_32="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -30089,7 +28792,7 @@
+@@ -30105,7 +28808,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -21727,7 +21727,7 @@
ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -30140,7 +28843,7 @@
+@@ -30156,7 +28859,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -21736,7 +21736,7 @@
ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -30262,27 +28965,10 @@
+@@ -30278,27 +28981,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21768,7 +21768,7 @@
have_oss=yes
-@@ -30725,7 +29411,7 @@
+@@ -30741,7 +29427,7 @@
and SOUND_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21777,7 +21777,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -30735,7 +29421,7 @@
+@@ -30751,7 +29437,7 @@
and SOUND_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21786,7 +21786,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -30789,7 +29475,7 @@
+@@ -30805,7 +29491,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -21795,7 +21795,7 @@
ac_cv_path_UPDATE_MIME_DATABASE="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -30830,7 +29516,7 @@
+@@ -30846,7 +29532,7 @@
@@ -21804,7 +21804,7 @@
cat >confcache <<\_ACEOF
-@@ -30982,13 +29668,6 @@
+@@ -30998,13 +29684,6 @@
ac_config_commands="$ac_config_commands po/stamp-it"
@@ -21818,7 +21818,7 @@
if test -z "${HAVE_XINPUT_TRUE}" && test -z "${HAVE_XINPUT_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"HAVE_XINPUT\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -31083,7 +29762,8 @@
+@@ -31099,7 +29778,8 @@
## M4sh Initialization. ##
## --------------------- ##
@@ -21828,7 +21828,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -31092,10 +29772,13 @@
+@@ -31108,10 +29788,13 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -21845,7 +21845,7 @@
# PATH needs CR
-@@ -31319,19 +30002,28 @@
+@@ -31335,19 +30018,28 @@
as_mkdir_p=false
fi
@@ -21885,16 +21885,16 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -31347,7 +30039,7 @@
+@@ -31363,7 +30055,7 @@
# values after options handling.
ac_log="
- This file was extended by gnome-control-center $as_me 2.20.0.1, which was
+ This file was extended by gnome-control-center $as_me 2.20.1, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -31376,7 +30068,7 @@
+@@ -31392,7 +30084,7 @@
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
@@ -21903,16 +21903,16 @@
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
-@@ -31400,7 +30092,7 @@
+@@ -31416,7 +30108,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
- gnome-control-center config.status 2.20.0.1
+ gnome-control-center config.status 2.20.1
-configured by $0, generated by GNU Autoconf 2.60,
+configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2006 Free Software Foundation, Inc.
-@@ -31560,8 +30252,6 @@
+@@ -31576,8 +30268,6 @@
"gnome-settings-daemon/xrdb/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-settings-daemon/xrdb/Makefile" ;;
"help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
"libbackground/Makefile") CONFIG_FILES="$CONFIG_FILES libbackground/Makefile" ;;
@@ -21921,7 +21921,7 @@
"libsounds/Makefile") CONFIG_FILES="$CONFIG_FILES libsounds/Makefile" ;;
"libwindow-settings/Makefile") CONFIG_FILES="$CONFIG_FILES libwindow-settings/Makefile" ;;
"libwindow-settings/gnome-window-settings-2.0.pc") CONFIG_FILES="$CONFIG_FILES libwindow-settings/gnome-window-settings-2.0.pc" ;;
-@@ -31727,6 +30417,7 @@
+@@ -31743,6 +30433,7 @@
host_cpu!$host_cpu$ac_delim
host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim
@@ -21929,7 +21929,7 @@
LN_S!$LN_S$ac_delim
ECHO!$ECHO$ac_delim
AR!$AR$ac_delim
-@@ -31734,7 +30425,6 @@
+@@ -31750,7 +30441,6 @@
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
ac_ct_CXX!$ac_ct_CXX$ac_delim
@@ -21937,7 +21937,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -31776,6 +30466,7 @@
+@@ -31792,6 +30482,7 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -21945,7 +21945,7 @@
am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
CXXCPP!$CXXCPP$ac_delim
-@@ -31843,10 +30534,6 @@
+@@ -31859,10 +30550,6 @@
TYPING_BREAK!$TYPING_BREAK$ac_delim
SCREENSAVER_LIBS!$SCREENSAVER_LIBS$ac_delim
XF86MISC_LIBS!$XF86MISC_LIBS$ac_delim
@@ -21956,7 +21956,7 @@
CAPPLET_CFLAGS!$CAPPLET_CFLAGS$ac_delim
CAPPLET_LIBS!$CAPPLET_LIBS$ac_delim
GNOMECC_CFLAGS!$GNOMECC_CFLAGS$ac_delim
-@@ -31869,10 +30556,13 @@
+@@ -31885,10 +30572,13 @@
DEFAULT_APPLICATIONS_CAPPLET_LIBS!$DEFAULT_APPLICATIONS_CAPPLET_LIBS$ac_delim
METACITY_CFLAGS!$METACITY_CFLAGS$ac_delim
METACITY_LIBS!$METACITY_LIBS$ac_delim
@@ -21970,7 +21970,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -31914,7 +30604,6 @@
+@@ -31930,7 +30620,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -21978,18 +21978,18 @@
FONT_CAPPLET_LIBS!$FONT_CAPPLET_LIBS$ac_delim
AT_CAPPLET_CFLAGS!$AT_CAPPLET_CFLAGS$ac_delim
AT_CAPPLET_LIBS!$AT_CAPPLET_LIBS$ac_delim
-@@ -31991,7 +30680,7 @@
+@@ -32006,7 +30695,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/gnome-settings-daemon/actions/Makefile.in control-center-2.20.0.1/gnome-settings-daemon/actions/Makefile.in
---- control-center-2.20.0.1.old/gnome-settings-daemon/actions/Makefile.in 2007-09-26 13:54:32.000000000 +0200
-+++ control-center-2.20.0.1/gnome-settings-daemon/actions/Makefile.in 2007-10-05 09:11:00.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/gnome-settings-daemon/actions/Makefile.in control-center-2.20.1/gnome-settings-daemon/actions/Makefile.in
+--- control-center-2.20.1.old/gnome-settings-daemon/actions/Makefile.in 2007-10-15 17:26:05.000000000 +0200
++++ control-center-2.20.1/gnome-settings-daemon/actions/Makefile.in 2007-10-25 19:51:32.000000000 +0200
@@ -224,8 +224,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -22011,9 +22011,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/gnome-settings-daemon/Makefile.in control-center-2.20.0.1/gnome-settings-daemon/Makefile.in
---- control-center-2.20.0.1.old/gnome-settings-daemon/Makefile.in 2007-09-26 13:54:31.000000000 +0200
-+++ control-center-2.20.0.1/gnome-settings-daemon/Makefile.in 2007-10-05 09:11:00.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/gnome-settings-daemon/Makefile.in control-center-2.20.1/gnome-settings-daemon/Makefile.in
+--- control-center-2.20.1.old/gnome-settings-daemon/Makefile.in 2007-10-15 17:26:04.000000000 +0200
++++ control-center-2.20.1/gnome-settings-daemon/Makefile.in 2007-10-25 19:51:32.000000000 +0200
@@ -258,8 +258,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -22035,9 +22035,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/gnome-settings-daemon/xrdb/Makefile.in control-center-2.20.0.1/gnome-settings-daemon/xrdb/Makefile.in
---- control-center-2.20.0.1.old/gnome-settings-daemon/xrdb/Makefile.in 2007-09-26 13:54:32.000000000 +0200
-+++ control-center-2.20.0.1/gnome-settings-daemon/xrdb/Makefile.in 2007-10-05 09:11:01.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/gnome-settings-daemon/xrdb/Makefile.in control-center-2.20.1/gnome-settings-daemon/xrdb/Makefile.in
+--- control-center-2.20.1.old/gnome-settings-daemon/xrdb/Makefile.in 2007-10-15 17:26:05.000000000 +0200
++++ control-center-2.20.1/gnome-settings-daemon/xrdb/Makefile.in 2007-10-25 19:51:32.000000000 +0200
@@ -182,8 +182,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -22059,9 +22059,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/help/Makefile.in control-center-2.20.0.1/help/Makefile.in
---- control-center-2.20.0.1.old/help/Makefile.in 2007-09-26 13:54:32.000000000 +0200
-+++ control-center-2.20.0.1/help/Makefile.in 2007-10-05 09:11:01.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/help/Makefile.in control-center-2.20.1/help/Makefile.in
+--- control-center-2.20.1.old/help/Makefile.in 2007-10-15 17:26:05.000000000 +0200
++++ control-center-2.20.1/help/Makefile.in 2007-10-25 19:51:33.000000000 +0200
@@ -197,8 +197,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -22083,9 +22083,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/intltool-extract.in control-center-2.20.0.1/intltool-extract.in
---- control-center-2.20.0.1.old/intltool-extract.in 2007-09-26 13:54:07.000000000 +0200
-+++ control-center-2.20.0.1/intltool-extract.in 2007-10-05 09:10:46.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/intltool-extract.in control-center-2.20.1/intltool-extract.in
+--- control-center-2.20.1.old/intltool-extract.in 2007-10-15 17:25:48.000000000 +0200
++++ control-center-2.20.1/intltool-extract.in 2007-10-25 19:51:09.000000000 +0200
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
@@ -22095,9 +22095,9 @@
## Loaded modules
use strict;
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/intltool-merge.in control-center-2.20.0.1/intltool-merge.in
---- control-center-2.20.0.1.old/intltool-merge.in 2007-09-26 13:54:07.000000000 +0200
-+++ control-center-2.20.0.1/intltool-merge.in 2007-10-05 09:10:46.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/intltool-merge.in control-center-2.20.1/intltool-merge.in
+--- control-center-2.20.1.old/intltool-merge.in 2007-10-15 17:25:48.000000000 +0200
++++ control-center-2.20.1/intltool-merge.in 2007-10-25 19:51:09.000000000 +0200
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
@@ -22107,9 +22107,9 @@
## Loaded modules
use strict;
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/intltool-update.in control-center-2.20.0.1/intltool-update.in
---- control-center-2.20.0.1.old/intltool-update.in 2007-09-26 13:54:07.000000000 +0200
-+++ control-center-2.20.0.1/intltool-update.in 2007-10-05 09:10:46.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/intltool-update.in control-center-2.20.1/intltool-update.in
+--- control-center-2.20.1.old/intltool-update.in 2007-10-15 17:25:48.000000000 +0200
++++ control-center-2.20.1/intltool-update.in 2007-10-25 19:51:09.000000000 +0200
@@ -30,7 +30,7 @@
## Release information
@@ -22119,9 +22119,9 @@
my $PACKAGE = "intltool";
## Loaded modules
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/libbackground/Makefile.in control-center-2.20.0.1/libbackground/Makefile.in
---- control-center-2.20.0.1.old/libbackground/Makefile.in 2007-09-26 13:54:34.000000000 +0200
-+++ control-center-2.20.0.1/libbackground/Makefile.in 2007-10-05 09:11:01.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/libbackground/Makefile.in control-center-2.20.1/libbackground/Makefile.in
+--- control-center-2.20.1.old/libbackground/Makefile.in 2007-10-15 17:26:05.000000000 +0200
++++ control-center-2.20.1/libbackground/Makefile.in 2007-10-25 19:51:33.000000000 +0200
@@ -191,8 +191,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -22143,9 +22143,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/libsounds/Makefile.in control-center-2.20.0.1/libsounds/Makefile.in
---- control-center-2.20.0.1.old/libsounds/Makefile.in 2007-09-26 13:54:35.000000000 +0200
-+++ control-center-2.20.0.1/libsounds/Makefile.in 2007-10-05 09:11:01.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/libsounds/Makefile.in control-center-2.20.1/libsounds/Makefile.in
+--- control-center-2.20.1.old/libsounds/Makefile.in 2007-10-15 17:26:06.000000000 +0200
++++ control-center-2.20.1/libsounds/Makefile.in 2007-10-25 19:51:33.000000000 +0200
@@ -195,8 +195,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -22167,9 +22167,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/libwindow-settings/Makefile.in control-center-2.20.0.1/libwindow-settings/Makefile.in
---- control-center-2.20.0.1.old/libwindow-settings/Makefile.in 2007-10-05 09:10:28.000000000 +0200
-+++ control-center-2.20.0.1/libwindow-settings/Makefile.in 2007-10-05 09:11:01.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/libwindow-settings/Makefile.in control-center-2.20.1/libwindow-settings/Makefile.in
+--- control-center-2.20.1.old/libwindow-settings/Makefile.in 2007-10-25 19:50:53.000000000 +0200
++++ control-center-2.20.1/libwindow-settings/Makefile.in 2007-10-25 19:51:33.000000000 +0200
@@ -226,8 +226,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -22191,9 +22191,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/ltmain.sh control-center-2.20.0.1/ltmain.sh
---- control-center-2.20.0.1.old/ltmain.sh 2007-09-20 01:36:32.000000000 +0200
-+++ control-center-2.20.0.1/ltmain.sh 2007-08-14 19:43:36.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/ltmain.sh control-center-2.20.1/ltmain.sh
+--- control-center-2.20.1.old/ltmain.sh 2007-09-20 01:36:32.000000000 +0200
++++ control-center-2.20.1/ltmain.sh 2007-08-14 19:43:36.000000000 +0200
@@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -22747,9 +22747,9 @@
All other options (arguments beginning with \`-') are ignored.
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/Makefile.in control-center-2.20.0.1/Makefile.in
---- control-center-2.20.0.1.old/Makefile.in 2007-09-26 13:54:37.000000000 +0200
-+++ control-center-2.20.0.1/Makefile.in 2007-10-05 09:11:02.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/Makefile.in control-center-2.20.1/Makefile.in
+--- control-center-2.20.1.old/Makefile.in 2007-10-15 17:26:08.000000000 +0200
++++ control-center-2.20.1/Makefile.in 2007-10-25 19:51:34.000000000 +0200
@@ -200,8 +200,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -22771,7 +22771,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -315,7 +316,7 @@
+@@ -314,7 +315,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -22780,9 +22780,9 @@
DISTCLEANFILES = \
gnome-doc-utils.make \
intltool-extract \
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/schemas/Makefile.in control-center-2.20.0.1/schemas/Makefile.in
---- control-center-2.20.0.1.old/schemas/Makefile.in 2007-09-26 13:54:35.000000000 +0200
-+++ control-center-2.20.0.1/schemas/Makefile.in 2007-10-05 09:11:01.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/schemas/Makefile.in control-center-2.20.1/schemas/Makefile.in
+--- control-center-2.20.1.old/schemas/Makefile.in 2007-10-15 17:26:07.000000000 +0200
++++ control-center-2.20.1/schemas/Makefile.in 2007-10-25 19:51:33.000000000 +0200
@@ -182,8 +182,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -22804,9 +22804,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/shell/Makefile.in control-center-2.20.0.1/shell/Makefile.in
---- control-center-2.20.0.1.old/shell/Makefile.in 2007-09-26 13:54:35.000000000 +0200
-+++ control-center-2.20.0.1/shell/Makefile.in 2007-10-05 09:11:01.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/shell/Makefile.in control-center-2.20.1/shell/Makefile.in
+--- control-center-2.20.1.old/shell/Makefile.in 2007-10-15 17:26:07.000000000 +0200
++++ control-center-2.20.1/shell/Makefile.in 2007-10-25 19:51:33.000000000 +0200
@@ -54,7 +54,7 @@
gnome_control_center_OBJECTS = $(am_gnome_control_center_OBJECTS)
am__DEPENDENCIES_1 =
@@ -22837,7 +22837,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -327,7 +328,7 @@
+@@ -326,7 +327,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
INCLUDES = \
@@ -22846,7 +22846,7 @@
$(GNOMECC_CFLAGS)
gnome_control_center_SOURCES = \
-@@ -335,7 +336,7 @@
+@@ -334,7 +335,7 @@
gnome_control_center_LDADD = \
$(GNOMECC_LIBS) \
@@ -22855,9 +22855,9 @@
AM_CPPFLAGS = \
-DGNOMELOCALEDIR="\"$(datadir)/locale\""
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/typing-break/Makefile.in control-center-2.20.0.1/typing-break/Makefile.in
---- control-center-2.20.0.1.old/typing-break/Makefile.in 2007-09-26 13:54:36.000000000 +0200
-+++ control-center-2.20.0.1/typing-break/Makefile.in 2007-10-05 09:11:02.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/typing-break/Makefile.in control-center-2.20.1/typing-break/Makefile.in
+--- control-center-2.20.1.old/typing-break/Makefile.in 2007-10-15 17:26:07.000000000 +0200
++++ control-center-2.20.1/typing-break/Makefile.in 2007-10-25 19:51:34.000000000 +0200
@@ -217,8 +217,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -22879,9 +22879,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/vfs-methods/fontilus/Makefile.in control-center-2.20.0.1/vfs-methods/fontilus/Makefile.in
---- control-center-2.20.0.1.old/vfs-methods/fontilus/Makefile.in 2007-09-26 13:54:36.000000000 +0200
-+++ control-center-2.20.0.1/vfs-methods/fontilus/Makefile.in 2007-10-05 09:11:02.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/vfs-methods/fontilus/Makefile.in control-center-2.20.1/vfs-methods/fontilus/Makefile.in
+--- control-center-2.20.1.old/vfs-methods/fontilus/Makefile.in 2007-10-15 17:26:07.000000000 +0200
++++ control-center-2.20.1/vfs-methods/fontilus/Makefile.in 2007-10-25 19:51:34.000000000 +0200
@@ -239,8 +239,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -22903,9 +22903,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/vfs-methods/Makefile.in control-center-2.20.0.1/vfs-methods/Makefile.in
---- control-center-2.20.0.1.old/vfs-methods/Makefile.in 2007-09-26 13:54:36.000000000 +0200
-+++ control-center-2.20.0.1/vfs-methods/Makefile.in 2007-10-05 09:11:02.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/vfs-methods/Makefile.in control-center-2.20.1/vfs-methods/Makefile.in
+--- control-center-2.20.1.old/vfs-methods/Makefile.in 2007-10-15 17:26:07.000000000 +0200
++++ control-center-2.20.1/vfs-methods/Makefile.in 2007-10-25 19:51:34.000000000 +0200
@@ -184,8 +184,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -22927,9 +22927,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -x'*config.guess' -x'*config.sub' -Naur control-center-2.20.0.1.old/vfs-methods/themus/Makefile.in control-center-2.20.0.1/vfs-methods/themus/Makefile.in
---- control-center-2.20.0.1.old/vfs-methods/themus/Makefile.in 2007-09-26 13:54:36.000000000 +0200
-+++ control-center-2.20.0.1/vfs-methods/themus/Makefile.in 2007-10-05 09:11:02.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.1.old/vfs-methods/themus/Makefile.in control-center-2.20.1/vfs-methods/themus/Makefile.in
+--- control-center-2.20.1.old/vfs-methods/themus/Makefile.in 2007-10-15 17:26:07.000000000 +0200
++++ control-center-2.20.1/vfs-methods/themus/Makefile.in 2007-10-25 19:51:34.000000000 +0200
@@ -250,8 +250,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
More information about the pkg-gnome-commits
mailing list