r18034 - in /desktop/experimental/control-center/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Dec 28 13:23:12 UTC 2008
Author: joss
Date: Sun Dec 28 13:23:12 2008
New Revision: 18034
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18034
Log:
* New upstream release.
+ Correctly sets background without nautilus. Closes: #472902.
+ The about-me capplet correctly saves emails. Closes: #350651.
+ Resolutions are sorted in the display capplet. Closes: #509899.
* Update build-dependencies.
* Build-depend on libeel 2.24 to build against the experimental
version.
* Suggest libcanberra-gtk-module instead of esound-clients.
* Remove obsolete files: libgnome-settings-daemon-dev.install,
gnome-control-center.dirs.
* Switch to quilt for managing patches; build-depend on quilt.
* 01_fix_libslab_build.patch: updated for the new version.
* 02_xklavier_utf8.patch: dropped, merged upstream
* 25_window_manager_settings.patch: don’t patch the Makefile.in’s.
* 70_relibtoolize.patch: regenerated.
* capplets-data.gconf-defaults: the /music key is renamed to /media.
* Don’t remove the GConf schemas in the installation target.
* *.install: simplify a lot the installation files.
Added:
desktop/experimental/control-center/debian/patches/series
Removed:
desktop/experimental/control-center/debian/gnome-control-center.dirs
desktop/experimental/control-center/debian/libgnome-settings-daemon-dev.install
desktop/experimental/control-center/debian/patches/02_xklavier_utf8.patch
Modified:
desktop/experimental/control-center/debian/capplets-data.gconf-defaults
desktop/experimental/control-center/debian/capplets-data.install
desktop/experimental/control-center/debian/changelog
desktop/experimental/control-center/debian/control
desktop/experimental/control-center/debian/control.in
desktop/experimental/control-center/debian/gnome-control-center.install
desktop/experimental/control-center/debian/patches/01_fix_libslab_build.patch
desktop/experimental/control-center/debian/patches/03_a11y_logout.patch
desktop/experimental/control-center/debian/patches/04_path_xtra.patch
desktop/experimental/control-center/debian/patches/25_window_manager_settings.patch
desktop/experimental/control-center/debian/patches/70_relibtoolize.patch
desktop/experimental/control-center/debian/rules
Modified: desktop/experimental/control-center/debian/capplets-data.gconf-defaults
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/capplets-data.gconf-defaults?rev=18034&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/capplets-data.gconf-defaults (original)
+++ desktop/experimental/control-center/debian/capplets-data.gconf-defaults Sun Dec 28 13:23:12 2008
@@ -10,6 +10,6 @@
/apps/gnome_settings_daemon/keybindings/stop "0xa4"
/apps/gnome_settings_daemon/keybindings/previous "0x90"
/apps/gnome_settings_daemon/keybindings/next "0x99"
-/apps/gnome_settings_daemon/keybindings/music "0xed"
+/apps/gnome_settings_daemon/keybindings/media "0xed"
/apps/gnome_settings_daemon/keybindings/calculator "0xa1"
/desktop/gnome/applications/media/exec "rhythmbox"
Modified: desktop/experimental/control-center/debian/capplets-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/capplets-data.install?rev=18034&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/capplets-data.install (original)
+++ desktop/experimental/control-center/debian/capplets-data.install Sun Dec 28 13:23:12 2008
@@ -1,13 +1,2 @@
debian/tmp/etc
-debian/tmp/usr/share/gnome-control-center/glade
-debian/tmp/usr/share/gnome-control-center/keybindings
-debian/tmp/usr/share/gnome-control-center/pixmaps/
-debian/tmp/usr/share/gnome-control-center/gnome-default-applications.xml
-debian/tmp/usr/share/icons/hicolor
-debian/tmp/usr/share/locale
-debian/tmp/usr/share/mime/packages/gnome-theme-package.xml
-debian/tmp/usr/share/gnome
-debian/tmp/etc/gnome-vfs-2.0/modules
-debian/tmp/usr/share/applications/*.desktop
-debian/tmp/usr/share/omf
-debian/tmp/usr/share/desktop-directories
+debian/tmp/usr/share
Modified: desktop/experimental/control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/changelog?rev=18034&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/changelog (original)
+++ desktop/experimental/control-center/debian/changelog Sun Dec 28 13:23:12 2008
@@ -1,9 +1,27 @@
-control-center (1:2.22.2.1-3) UNRELEASED; urgency=low
+control-center (1:2.24.0.1-1) experimental; urgency=low
* 03_a11y_logout.patch: use gnome-panel-logout for logout when
available.
-
- -- Josselin Mouette <joss at debian.org> Fri, 24 Oct 2008 21:41:03 +0200
+ * New upstream release.
+ + Correctly sets background without nautilus. Closes: #472902.
+ + The about-me capplet correctly saves emails. Closes: #350651.
+ + Resolutions are sorted in the display capplet. Closes: #509899.
+ * Update build-dependencies.
+ * Build-depend on libeel 2.24 to build against the experimental
+ version.
+ * Suggest libcanberra-gtk-module instead of esound-clients.
+ * Remove obsolete files: libgnome-settings-daemon-dev.install,
+ gnome-control-center.dirs.
+ * Switch to quilt for managing patches; build-depend on quilt.
+ * 01_fix_libslab_build.patch: updated for the new version.
+ * 02_xklavier_utf8.patch: dropped, merged upstream
+ * 25_window_manager_settings.patch: don’t patch the Makefile.in’s.
+ * 70_relibtoolize.patch: regenerated.
+ * capplets-data.gconf-defaults: the /music key is renamed to /media.
+ * Don’t remove the GConf schemas in the installation target.
+ * *.install: simplify a lot the installation files.
+
+ -- Josselin Mouette <joss at debian.org> Sun, 28 Dec 2008 12:38:50 +0100
control-center (1:2.22.2.1-2) unstable; urgency=low
Modified: desktop/experimental/control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/control?rev=18034&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/control (original)
+++ desktop/experimental/control-center/debian/control Sun Dec 28 13:23:12 2008
@@ -6,58 +6,49 @@
Standards-Version: 3.8.0
Build-Depends: cdbs (>= 0.4.41),
gnome-pkg-tools (>= 0.10),
+ quilt,
dpkg-dev (>= 1.13.19),
debhelper (>= 5.0.0),
+ docbook-to-man,
+ autotools-dev,
+ type-handling (>= 0.2.8),
+ gnome-doc-utils (>= 0.3.2),
+ intltool (>= 0.37.1),
+ libxt-dev,
+ libx11-dev,
+ libxss-dev,
+ libxxf86misc-dev,
libgtk2.0-dev (>= 2.11.6),
+ libglib2.0-dev (>= 2.17.4),
+ libgconf2-dev,
libgnomeui-dev (>= 2.16.0-2),
- intltool (>= 0.35.5),
- libglade2-dev (>= 2.4.0-1),
- libgnome-desktop-dev (>= 2.21.4),
- zlib1g-dev,
- flex,
- libmetacity-dev (>= 1:2.21.21),
+ libglade2-dev (>= 1:2.4.0-1),
+ libgnome-desktop-dev (>= 2.23.90),
+ librsvg2-dev,
+ libgnome-menu-dev (>= 2.12.0),
+ libpango1.0-dev (>= 1.17),
+ libeel2-dev (>= 2.24),
+ libpanel-applet2-dev,
+ libdbus-1-dev (>= 0.32),
+ libdbus-glib-1-dev (>= 0.32),
+ libxml2-dev,
+ libmetacity-dev (>= 1:2.23.1),
+ gnome-settings-daemon-dev (>= 2.22.0),
+ libxft-dev (>= 2.1.2),
+ libxrender-dev,
+ libxrandr-dev,
libxcursor-dev,
- libbonobo2-dev (>= 2.6.2-6),
- libnautilus-extension-dev (>= 2.6.0),
- libxrandr-dev,
- docbook-to-man,
+ libgnomekbd-dev (>= 2.24),
+ libxklavier12-dev (>= 3.6),
+ libebook1.2-dev (>= 1.7.90),
+ libhal-dev (>= 0.5.6),
libgstreamer0.10-dev (>= 0.10.1.2),
libgstreamer-plugins-base0.10-dev (>= 0.10.1.2),
- autotools-dev,
- type-handling (>= 0.2.8),
- libxss-dev,
- libxinerama-dev,
- libxft-dev (>= 2.1.2),
- libxxf86misc-dev,
- libxkbfile-dev,
- libebook1.2-dev (>= 1.7.90),
+ libcanberra-gtk-dev (>= 0.4),
desktop-file-utils,
- gnome-doc-utils (>= 0.3.2),
- libgnome-menu-dev (>= 2.12.0),
- libx11-dev,
- libxrender-dev,
- libgconf2-dev,
- libbonoboui2-dev,
- libesd0-dev,
- libgnomevfs2-dev,
- libfontconfig1-dev,
- libfreetype6-dev,
- libglib2.0-dev (>= 2.16.0),
- libxt-dev,
- libhal-dev (>= 0.5.6),
- libdbus-1-dev (>= 0.32),
- libdbus-glib-1-dev (>= 0.32),
- librsvg2-dev,
- libpanel-applet2-dev,
- libgnomekbd-dev (>= 0.1),
shared-mime-info,
libslab-dev,
- libpango1.0-dev (>= 1.17),
- libgnomekbdui-dev (>= 2.21.4.1),
- scrollkeeper,
- libxklavier12-dev (>= 3.2) | libxklavier-dev,
- libeel2-dev,
- gnome-settings-daemon-dev (>= 2.22.0)
+ scrollkeeper
Package: gnome-control-center
Architecture: any
@@ -70,7 +61,7 @@
gnome-settings-daemon,
gnome-menus (>= 2.12.0),
gnome-desktop-data,
- gnome-icon-theme (>= 2.16),
+ gnome-icon-theme (>= 2.24),
desktop-file-utils
Recommends: bzip2,
evolution-data-server,
@@ -79,7 +70,7 @@
Replaces: capplets
Conflicts: capplets,
gnome-session (<< 2.22.0)
-Suggests: esound-clients,
+Suggests: libcanberra-gtk-module,
gnome-screensaver | xscreensaver,
x11-xserver-utils,
gstreamer0.10-alsa | gstreamer0.10-audiosink
Modified: desktop/experimental/control-center/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/control.in?rev=18034&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/control.in (original)
+++ desktop/experimental/control-center/debian/control.in Sun Dec 28 13:23:12 2008
@@ -6,58 +6,49 @@
Standards-Version: 3.8.0
Build-Depends: cdbs (>= 0.4.41),
gnome-pkg-tools (>= 0.10),
+ quilt,
dpkg-dev (>= 1.13.19),
debhelper (>= 5.0.0),
+ docbook-to-man,
+ autotools-dev,
+ type-handling (>= 0.2.8),
+ gnome-doc-utils (>= 0.3.2),
+ intltool (>= 0.37.1),
+ libxt-dev,
+ libx11-dev,
+ libxss-dev,
+ libxxf86misc-dev,
libgtk2.0-dev (>= 2.11.6),
+ libglib2.0-dev (>= 2.17.4),
+ libgconf2-dev,
libgnomeui-dev (>= 2.16.0-2),
- intltool (>= 0.35.5),
- libglade2-dev (>= 2.4.0-1),
- libgnome-desktop-dev (>= 2.21.4),
- zlib1g-dev,
- flex,
- libmetacity-dev (>= 1:2.21.21),
+ libglade2-dev (>= 1:2.4.0-1),
+ libgnome-desktop-dev (>= 2.23.90),
+ librsvg2-dev,
+ libgnome-menu-dev (>= 2.12.0),
+ libpango1.0-dev (>= 1.17),
+ libeel2-dev (>= 2.24),
+ libpanel-applet2-dev,
+ libdbus-1-dev (>= 0.32),
+ libdbus-glib-1-dev (>= 0.32),
+ libxml2-dev,
+ libmetacity-dev (>= 1:2.23.1),
+ gnome-settings-daemon-dev (>= 2.22.0),
+ libxft-dev (>= 2.1.2),
+ libxrender-dev,
+ libxrandr-dev,
libxcursor-dev,
- libbonobo2-dev (>= 2.6.2-6),
- libnautilus-extension-dev (>= 2.6.0),
- libxrandr-dev,
- docbook-to-man,
+ libgnomekbd-dev (>= 2.24),
+ libxklavier12-dev (>= 3.6),
+ libebook1.2-dev (>= 1.7.90),
+ libhal-dev (>= 0.5.6),
libgstreamer0.10-dev (>= 0.10.1.2),
libgstreamer-plugins-base0.10-dev (>= 0.10.1.2),
- autotools-dev,
- type-handling (>= 0.2.8),
- libxss-dev,
- libxinerama-dev,
- libxft-dev (>= 2.1.2),
- libxxf86misc-dev,
- libxkbfile-dev,
- libebook1.2-dev (>= 1.7.90),
+ libcanberra-gtk-dev (>= 0.4),
desktop-file-utils,
- gnome-doc-utils (>= 0.3.2),
- libgnome-menu-dev (>= 2.12.0),
- libx11-dev,
- libxrender-dev,
- libgconf2-dev,
- libbonoboui2-dev,
- libesd0-dev,
- libgnomevfs2-dev,
- libfontconfig1-dev,
- libfreetype6-dev,
- libglib2.0-dev (>= 2.16.0),
- libxt-dev,
- libhal-dev (>= 0.5.6),
- libdbus-1-dev (>= 0.32),
- libdbus-glib-1-dev (>= 0.32),
- librsvg2-dev,
- libpanel-applet2-dev,
- libgnomekbd-dev (>= 0.1),
shared-mime-info,
libslab-dev,
- libpango1.0-dev (>= 1.17),
- libgnomekbdui-dev (>= 2.21.4.1),
- scrollkeeper,
- libxklavier12-dev (>= 3.2) | libxklavier-dev,
- libeel2-dev,
- gnome-settings-daemon-dev (>= 2.22.0)
+ scrollkeeper
Package: gnome-control-center
Architecture: any
@@ -70,7 +61,7 @@
gnome-settings-daemon,
gnome-menus (>= 2.12.0),
gnome-desktop-data,
- gnome-icon-theme (>= 2.16),
+ gnome-icon-theme (>= 2.24),
desktop-file-utils
Recommends: bzip2,
evolution-data-server,
@@ -79,7 +70,7 @@
Replaces: capplets
Conflicts: capplets,
gnome-session (<< 2.22.0)
-Suggests: esound-clients,
+Suggests: libcanberra-gtk-module,
gnome-screensaver | xscreensaver,
x11-xserver-utils,
gstreamer0.10-alsa | gstreamer0.10-audiosink
Modified: desktop/experimental/control-center/debian/gnome-control-center.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/gnome-control-center.install?rev=18034&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/gnome-control-center.install (original)
+++ desktop/experimental/control-center/debian/gnome-control-center.install Sun Dec 28 13:23:12 2008
@@ -1,5 +1,2 @@
-debian/tmp/usr/bin/gnome-control-center
debian/control-center2.xpm usr/share/pixmaps
debian/tmp/usr/bin
-debian/tmp/usr/lib/gnome-vfs-2.0/modules/*.so
-debian/tmp/usr/lib/nautilus/extensions-1.0/*.so
Modified: desktop/experimental/control-center/debian/patches/01_fix_libslab_build.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/patches/01_fix_libslab_build.patch?rev=18034&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/patches/01_fix_libslab_build.patch (original)
+++ desktop/experimental/control-center/debian/patches/01_fix_libslab_build.patch Sun Dec 28 13:23:12 2008
@@ -1,14 +1,18 @@
---- Makefile.am.old 2008-03-16 21:21:10.000000000 +0100
-+++ Makefile.am 2008-03-16 21:21:20.000000000 +0100
+Index: gnome-control-center-2.24.0.1/Makefile.am
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/Makefile.am 2008-09-24 18:36:27.000000000 +0200
++++ gnome-control-center-2.24.0.1/Makefile.am 2008-12-28 13:20:18.557505073 +0100
@@ -1,4 +1,4 @@
--SUBDIRS = po libsounds libbackground libwindow-settings libslab capplets shell help vfs-methods $(TYPING_BREAK)
-+SUBDIRS = po libsounds libbackground libwindow-settings capplets shell help vfs-methods $(TYPING_BREAK)
+-SUBDIRS = po libwindow-settings libslab capplets shell help
++SUBDIRS = po libwindow-settings capplets shell help
- ACLOCAL_AMFLAGS = -I m4
-
---- configure.in.old 2008-03-16 21:21:28.000000000 +0100
-+++ configure.in 2008-03-16 21:24:42.000000000 +0100
-@@ -86,9 +86,6 @@
+ if HAVE_TYPING_BREAK
+ SUBDIRS += typing-break
+Index: gnome-control-center-2.24.0.1/configure.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/configure.in 2008-09-24 18:37:28.000000000 +0200
++++ gnome-control-center-2.24.0.1/configure.in 2008-12-28 13:21:15.373512065 +0100
+@@ -87,9 +87,6 @@ dnl ====================================
dnl Check that we meet the dependencies
dnl ==============================================
@@ -16,35 +20,37 @@
-AM_CONDITIONAL(ENABLE_DYNAMIC_LIBSLAB, test "x$ENABLE_DYNAMIC_LIBSLAB" = "x1")
-
COMMON_MODULES="gtk+-2.0 >= 2.11.6 dnl
+ glib-2.0 >= 2.17.4 dnl
gio-2.0 dnl
- gconf-2.0 dnl
-@@ -97,7 +94,6 @@
- libbonobo-2.0 dnl
- libbonoboui-2.0 dnl
- gnome-desktop-2.0 >= 2.21.4"
+@@ -97,7 +94,6 @@ COMMON_MODULES="gtk+-2.0 >= 2.11.6 dnl
+ libgnomeui-2.0 >= 2.2.0 dnl
+ libglade-2.0 >= 2.0.0 dnl
+ gnome-desktop-2.0 >= 2.23.90"
-PKG_CHECK_MODULES(LIBSLAB, $COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0)
PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0)
PKG_CHECK_MODULES(GNOME, libgnomeui-2.0)
-@@ -106,6 +102,7 @@
+@@ -105,6 +101,7 @@ PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib
PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0)
PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
- PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.21.21)
+ PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.23.1)
+PKG_CHECK_MODULES(SLAB, libslab)
PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0)
- PKG_CHECK_MODULES(LIBBACKGROUND, glib-2.0 gobject-2.0 gdk-2.0 gconf-2.0)
- PKG_CHECK_MODULES(LIBSOUNDS, gio-2.0 libgnome-2.0 libgnomeui-2.0)
-@@ -446,8 +443,6 @@
+ PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
+ PKG_CHECK_MODULES(GIO, gio-2.0)
+@@ -370,8 +367,6 @@ capplets/sound/gnome-settings-sound.desk
+ capplets/windows/Makefile
capplets/windows/window-properties.desktop.in
help/Makefile
- libbackground/Makefile
-libslab/Makefile
-libslab/libslab.pc
- libsounds/Makefile
libwindow-settings/Makefile
libwindow-settings/gnome-window-settings-2.0.pc
---- shell/Makefile.am.old 2008-03-16 21:24:50.000000000 +0100
-+++ shell/Makefile.am 2008-03-16 21:25:16.000000000 +0100
+ po/Makefile.in
+Index: gnome-control-center-2.24.0.1/shell/Makefile.am
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/shell/Makefile.am 2008-09-24 18:36:21.000000000 +0200
++++ gnome-control-center-2.24.0.1/shell/Makefile.am 2008-12-28 13:19:51.955857028 +0100
@@ -1,5 +1,5 @@
INCLUDES = \
- -I$(top_srcdir)/libslab \
@@ -52,7 +58,7 @@
$(GNOMECC_CFLAGS)
bin_PROGRAMS = gnome-control-center
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ gnome_control_center_SOURCES = \
gnome_control_center_LDADD = \
$(GNOMECC_LIBS) \
Modified: desktop/experimental/control-center/debian/patches/03_a11y_logout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/patches/03_a11y_logout.patch?rev=18034&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/patches/03_a11y_logout.patch (original)
+++ desktop/experimental/control-center/debian/patches/03_a11y_logout.patch Sun Dec 28 13:23:12 2008
@@ -1,6 +1,8 @@
---- capplets/accessibility/at-properties/main.c.orig 2008-10-24 21:32:11.628329507 +0200
-+++ capplets/accessibility/at-properties/main.c 2008-10-24 21:39:59.927826441 +0200
-@@ -85,8 +85,12 @@
+Index: gnome-control-center-2.24.0.1/capplets/accessibility/at-properties/main.c
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/capplets/accessibility/at-properties/main.c 2008-09-24 18:36:22.000000000 +0200
++++ gnome-control-center-2.24.0.1/capplets/accessibility/at-properties/main.c 2008-12-28 13:22:48.211860165 +0100
+@@ -94,8 +94,12 @@ cb_dialog_response (GtkDialog *dialog, g
gtk_main_quit ();
}
Modified: desktop/experimental/control-center/debian/patches/04_path_xtra.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/patches/04_path_xtra.patch?rev=18034&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/patches/04_path_xtra.patch (original)
+++ desktop/experimental/control-center/debian/patches/04_path_xtra.patch Sun Dec 28 13:23:12 2008
@@ -1,9 +1,10 @@
-diff -urNad control-center-2.18.0/configure.in control-center-2.18.0.new/configure.in
---- control-center-2.18.0/configure.in 2007-03-26 17:11:41.000000000 +0200
-+++ control-center-2.18.0.new/configure.in 2007-03-26 17:13:46.000000000 +0200
-@@ -52,7 +52,7 @@
- AC_CHECK_FUNCS(putenv)
- AC_CHECK_FUNCS(setenv)
+Index: gnome-control-center-2.24.0.1/configure.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/configure.in 2008-12-28 13:21:15.373512065 +0100
++++ gnome-control-center-2.24.0.1/configure.in 2008-12-28 13:22:57.644359897 +0100
+@@ -48,7 +48,7 @@ GNOME_DEBUG_CHECK
+ GNOME_COMPILE_WARNINGS([maximum])
+ GNOME_MAINTAINER_MODE_DEFINES
-AC_PATH_XTRA
+AC_PATH_XTRA( [X11], [X11/Xlib.h], [XSync ()])
Modified: desktop/experimental/control-center/debian/patches/25_window_manager_settings.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/patches/25_window_manager_settings.patch?rev=18034&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/patches/25_window_manager_settings.patch (original)
+++ desktop/experimental/control-center/debian/patches/25_window_manager_settings.patch Sun Dec 28 13:23:12 2008
@@ -1,45 +1,23 @@
-diff -Nur control-center-2.16.3/capplets/windows/Makefile.am control-center-2.16.3.new/capplets/windows/Makefile.am
---- control-center-2.16.3/capplets/windows/Makefile.am 2007-01-29 12:10:38.000000000 +0100
-+++ control-center-2.16.3.new/capplets/windows/Makefile.am 2007-03-17 15:25:59.000000000 +0100
-@@ -17,7 +17,7 @@
+Index: gnome-control-center-2.24.0.1/capplets/windows/Makefile.am
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/capplets/windows/Makefile.am 2008-12-28 13:23:47.476361870 +0100
++++ gnome-control-center-2.24.0.1/capplets/windows/Makefile.am 2008-12-28 13:25:03.059860400 +0100
+@@ -20,7 +20,7 @@ desktop_DATA = $(Desktop_in_files:.deskt
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) \
-I$(top_srcdir)/libwindow-settings \
- -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" \
+ -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/libgnome-window-settings1"\" \
-DGLADEDIR=\""$(gladedir)"\" \
+ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DPIXMAPDIR=\""$(pixmapdir)"\"
-
-diff -Nur control-center-2.16.3/capplets/windows/Makefile.in control-center-2.16.3.new/capplets/windows/Makefile.in
---- control-center-2.16.3/capplets/windows/Makefile.in 2007-01-30 10:28:40.000000000 +0100
-+++ control-center-2.16.3.new/capplets/windows/Makefile.in 2007-03-17 15:25:59.000000000 +0100
-@@ -343,7 +343,7 @@
- desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
- INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) \
- -I$(top_srcdir)/libwindow-settings \
-- -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" \
-+ -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/libgnome-window-settings1"\" \
- -DGLADEDIR=\""$(gladedir)"\" \
- -DPIXMAPDIR=\""$(pixmapdir)"\"
-
-diff -Nur control-center-2.16.3/libwindow-settings/Makefile.am control-center-2.16.3.new/libwindow-settings/Makefile.am
---- control-center-2.16.3/libwindow-settings/Makefile.am 2007-01-29 12:10:31.000000000 +0100
-+++ control-center-2.16.3.new/libwindow-settings/Makefile.am 2007-03-17 15:25:59.000000000 +0100
+Index: gnome-control-center-2.24.0.1/libwindow-settings/Makefile.am
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/libwindow-settings/Makefile.am 2008-12-28 13:23:47.380355813 +0100
++++ gnome-control-center-2.24.0.1/libwindow-settings/Makefile.am 2008-12-28 13:25:03.059860400 +0100
@@ -1,4 +1,4 @@
-WM_MODULE_DIR=$(libdir)/window-manager-settings
+WM_MODULE_DIR=$(libdir)/libgnome-window-settings1
INCLUDES = \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-diff -Nur control-center-2.16.3/libwindow-settings/Makefile.in control-center-2.16.3.new/libwindow-settings/Makefile.in
---- control-center-2.16.3/libwindow-settings/Makefile.in 2007-01-30 10:28:47.000000000 +0100
-+++ control-center-2.16.3.new/libwindow-settings/Makefile.in 2007-03-17 15:26:58.000000000 +0100
-@@ -345,7 +345,7 @@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--WM_MODULE_DIR = $(libdir)/window-manager-settings
-+WM_MODULE_DIR = $(libdir)/libgnome-window-settings1
- INCLUDES = \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
+ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
Modified: desktop/experimental/control-center/debian/patches/70_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/patches/70_relibtoolize.patch?rev=18034&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/patches/70_relibtoolize.patch (original)
+++ desktop/experimental/control-center/debian/patches/70_relibtoolize.patch Sun Dec 28 13:23:12 2008
@@ -1,7 +1,14 @@
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/aclocal.m4 control-center-2.22.2.1/aclocal.m4
---- control-center-2.22.2.1.old/aclocal.m4 1974-05-20 03:43:54.000000000 +0100
-+++ control-center-2.22.2.1/aclocal.m4 2008-05-29 10:34:45.000000000 +0200
-@@ -13,1163 +13,816 @@
+libtoolize --force --copy
+aclocal-1.10 -I m4
+automake-1.10 -acf
+autoconf
+rm -rf autom4te.cache
+
+Index: gnome-control-center-2.24.0.1/aclocal.m4
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/aclocal.m4 2008-09-24 18:41:31.000000000 +0200
++++ gnome-control-center-2.24.0.1/aclocal.m4 2008-12-28 13:26:29.715854737 +0100
+@@ -13,4447 +13,3529 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
@@ -51,8 +58,10 @@
-# This is a private macro too. Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-+ AC_ARG_WITH(gconf-source,
-+ [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
++ AC_ARG_WITH([gconf-source],
++ AC_HELP_STRING([--with-gconf-source=sourceaddress],
++ [Config database for installing schema files.]),
++ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
@@ -76,8 +85,10 @@
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-+ AC_ARG_WITH(gconf-schema-file-dir,
-+ [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
++ AC_ARG_WITH([gconf-schema-file-dir],
++ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
++ [Directory for installing schema files.]),
++ [GCONF_SCHEMA_FILE_DIR="$withval"],)
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
@@ -256,15 +267,17 @@
- AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-+AC_SUBST($1)dnl
-+])
-
+-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
++AC_SUBST($1)dnl
++])
+
+-# serial 9
+# GLIB_WITH_NLS
+#-----------------
+glib_DEFUN([GLIB_WITH_NLS],
@@ -272,21 +285,16 @@
+ [USE_NLS=yes
+ AC_SUBST(USE_NLS)
--# serial 9
-+ gt_cv_have_gettext=no
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
++ gt_cv_have_gettext=no
+
+ CATOBJEXT=NONE
+ XGETTEXT=:
+ INTLLIBS=
-
-+ AC_CHECK_HEADER(libintl.h,
-+ [gt_cv_func_dgettext_libintl="no"
-+ libintl_extra_libs=""
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
@@ -303,6 +311,67 @@
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
+-
+-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+- [$1], CXX, [depcc="$CXX" am_compiler_list=],
+- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+- [$1], UPC, [depcc="$UPC" am_compiler_list=],
+- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+- [depcc="$$1" am_compiler_list=])
+-
+-AC_CACHE_CHECK([dependency style of $depcc],
+- [am_cv_$1_dependencies_compiler_type],
+-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+- # We make a subdir and do the tests there. Otherwise we can end up
+- # making bogus files that we don't know about and never remove. For
+- # instance it was reported that on HP-UX the gcc test will end up
+- # making a dummy file named `D' -- because `-MD' means `put the output
+- # in D'.
+- mkdir conftest.dir
+- # Copy depcomp to subdir because otherwise we won't find it if we're
+- # using a relative directory.
+- cp "$am_depcomp" conftest.dir
+- cd conftest.dir
+- # We will build objects and dependencies in a subdirectory because
+- # it helps to detect inapplicable dependency modes. For instance
+- # both Tru64's cc and ICC support -MD to output dependencies as a
+- # side effect of compilation, but ICC will put the dependencies in
+- # the current directory while Tru64 will put them in the object
+- # directory.
+- mkdir sub
+-
+- am_cv_$1_dependencies_compiler_type=none
+- if test "$am_compiler_list" = ""; then
+- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+- fi
+- for depmode in $am_compiler_list; do
+- # Setup a source with many dependencies, because some compilers
+- # like to wrap large dependency lists on column 80 (with \), and
+- # we should not choose a depcomp mode which is confused by this.
+- #
+- # We need to recreate these files for each test, as the compiler may
+- # overwrite some of them when testing with obscure command lines.
+- # This happens at least with the AIX C compiler.
+- : > sub/conftest.c
+- for i in 1 2 3 4 5 6; do
+- echo '#include "conftst'$i'.h"' >> sub/conftest.c
+- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
+- touch sub/conftst$i.h
+- done
+- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++ AC_CHECK_HEADER(libintl.h,
++ [gt_cv_func_dgettext_libintl="no"
++ libintl_extra_libs=""
+
+- case $depmode in
+- nosideeffect)
+- # after this tag, mechanisms are not by side-effect, so they'll
+- # only be used when explicitly requested
+- if test "x$enable_dependency_tracking" = xyes; then
+- continue
+- else
+- break
+ #
+ # First check in libc
+ #
@@ -324,110 +393,6 @@
+ gt_cv_func_dgettext_libc=yes,
+ gt_cv_func_dgettext_libc=no)
+ ])
-+ fi
-+
-+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-+ AC_CHECK_FUNCS(bind_textdomain_codeset)
-+ fi
-
--ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
-- [$1], CXX, [depcc="$CXX" am_compiler_list=],
-- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-- [$1], UPC, [depcc="$UPC" am_compiler_list=],
-- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
-- [depcc="$$1" am_compiler_list=])
-+ #
-+ # If we don't have everything we want, check in libintl
-+ #
-+ if test "$gt_cv_func_dgettext_libc" != "yes" \
-+ || test "$gt_cv_func_ngettext_libc" != "yes" \
-+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-+
-+ AC_CHECK_LIB(intl, bindtextdomain,
-+ [AC_CHECK_LIB(intl, ngettext,
-+ [AC_CHECK_LIB(intl, dgettext,
-+ gt_cv_func_dgettext_libintl=yes)])])
-
--AC_CACHE_CHECK([dependency style of $depcc],
-- [am_cv_$1_dependencies_compiler_type],
--[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-- # We make a subdir and do the tests there. Otherwise we can end up
-- # making bogus files that we don't know about and never remove. For
-- # instance it was reported that on HP-UX the gcc test will end up
-- # making a dummy file named `D' -- because `-MD' means `put the output
-- # in D'.
-- mkdir conftest.dir
-- # Copy depcomp to subdir because otherwise we won't find it if we're
-- # using a relative directory.
-- cp "$am_depcomp" conftest.dir
-- cd conftest.dir
-- # We will build objects and dependencies in a subdirectory because
-- # it helps to detect inapplicable dependency modes. For instance
-- # both Tru64's cc and ICC support -MD to output dependencies as a
-- # side effect of compilation, but ICC will put the dependencies in
-- # the current directory while Tru64 will put them in the object
-- # directory.
-- mkdir sub
-+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-+ AC_MSG_CHECKING([if -liconv is needed to use gettext])
-+ AC_MSG_RESULT([])
-+ AC_CHECK_LIB(intl, ngettext,
-+ [AC_CHECK_LIB(intl, dcgettext,
-+ [gt_cv_func_dgettext_libintl=yes
-+ libintl_extra_libs=-liconv],
-+ :,-liconv)],
-+ :,-liconv)
-+ fi
-
-- am_cv_$1_dependencies_compiler_type=none
-- if test "$am_compiler_list" = ""; then
-- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-- fi
-- for depmode in $am_compiler_list; do
-- # Setup a source with many dependencies, because some compilers
-- # like to wrap large dependency lists on column 80 (with \), and
-- # we should not choose a depcomp mode which is confused by this.
-- #
-- # We need to recreate these files for each test, as the compiler may
-- # overwrite some of them when testing with obscure command lines.
-- # This happens at least with the AIX C compiler.
-- : > sub/conftest.c
-- for i in 1 2 3 4 5 6; do
-- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-- # Solaris 8's {/usr,}/bin/sh.
-- touch sub/conftst$i.h
-- done
-- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+ #
-+ # If we found libintl, then check in it for bind_textdomain_codeset();
-+ # we'll prefer libc if neither have bind_textdomain_codeset(),
-+ # and both have dgettext and ngettext
-+ #
-+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-+ glib_save_LIBS="$LIBS"
-+ LIBS="$LIBS -lintl $libintl_extra_libs"
-+ unset ac_cv_func_bind_textdomain_codeset
-+ AC_CHECK_FUNCS(bind_textdomain_codeset)
-+ LIBS="$glib_save_LIBS"
-
-- case $depmode in
-- nosideeffect)
-- # after this tag, mechanisms are not by side-effect, so they'll
-- # only be used when explicitly requested
-- if test "x$enable_dependency_tracking" = xyes; then
-- continue
-- else
-- break
-+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-+ gt_cv_func_dgettext_libc=no
-+ else
-+ if test "$gt_cv_func_dgettext_libc" = "yes" \
-+ && test "$gt_cv_func_ngettext_libc" = "yes"; then
-+ gt_cv_func_dgettext_libintl=no
-+ fi
-+ fi
-+ fi
fi
- ;;
- none) break ;;
@@ -455,7 +420,147 @@
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
- break
-+
++
++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++ AC_CHECK_FUNCS(bind_textdomain_codeset)
+ fi
+- fi
+- done
+-
+- cd ..
+- rm -rf conftest.dir
+-else
+- am_cv_$1_dependencies_compiler_type=none
+-fi
+-])
+-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+-AM_CONDITIONAL([am__fastdep$1], [
+- test "x$enable_dependency_tracking" != xno \
+- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+-])
+-
+-
+-# AM_SET_DEPDIR
+-# -------------
+-# Choose a directory name for dependency files.
+-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+-AC_DEFUN([AM_SET_DEPDIR],
+-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+-])
+-
+
+-# AM_DEP_TRACK
+-# ------------
+-AC_DEFUN([AM_DEP_TRACK],
+-[AC_ARG_ENABLE(dependency-tracking,
+-[ --disable-dependency-tracking speeds up one-time build
+- --enable-dependency-tracking do not reject slow dependency extractors])
+-if test "x$enable_dependency_tracking" != xno; then
+- am_depcomp="$ac_aux_dir/depcomp"
+- AMDEPBACKSLASH='\'
+-fi
+-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+-AC_SUBST([AMDEPBACKSLASH])dnl
+-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+-])
++ #
++ # If we don't have everything we want, check in libintl
++ #
++ if test "$gt_cv_func_dgettext_libc" != "yes" \
++ || test "$gt_cv_func_ngettext_libc" != "yes" \
++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
++
++ AC_CHECK_LIB(intl, bindtextdomain,
++ [AC_CHECK_LIB(intl, ngettext,
++ [AC_CHECK_LIB(intl, dgettext,
++ gt_cv_func_dgettext_libintl=yes)])])
+
+-# Generate code to set up dependency tracking. -*- Autoconf -*-
++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
++ AC_MSG_CHECKING([if -liconv is needed to use gettext])
++ AC_MSG_RESULT([])
++ AC_CHECK_LIB(intl, ngettext,
++ [AC_CHECK_LIB(intl, dcgettext,
++ [gt_cv_func_dgettext_libintl=yes
++ libintl_extra_libs=-liconv],
++ :,-liconv)],
++ :,-liconv)
++ fi
+
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++ #
++ # If we found libintl, then check in it for bind_textdomain_codeset();
++ # we'll prefer libc if neither have bind_textdomain_codeset(),
++ # and both have dgettext and ngettext
++ #
++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
++ glib_save_LIBS="$LIBS"
++ LIBS="$LIBS -lintl $libintl_extra_libs"
++ unset ac_cv_func_bind_textdomain_codeset
++ AC_CHECK_FUNCS(bind_textdomain_codeset)
++ LIBS="$glib_save_LIBS"
+
+-#serial 3
++ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
++ gt_cv_func_dgettext_libc=no
++ else
++ if test "$gt_cv_func_dgettext_libc" = "yes" \
++ && test "$gt_cv_func_ngettext_libc" = "yes"; then
++ gt_cv_func_dgettext_libintl=no
++ fi
++ fi
++ fi
++ fi
+
+-# _AM_OUTPUT_DEPENDENCY_COMMANDS
+-# ------------------------------
+-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[for mf in $CONFIG_FILES; do
+- # Strip MF so we end up with the name of the file.
+- mf=`echo "$mf" | sed -e 's/:.*$//'`
+- # Check whether this is an Automake generated Makefile or not.
+- # We used to match only the files named `Makefile.in', but
+- # some people rename them; so instead we look at the file content.
+- # Grep'ing the first line is not enough: some people post-process
+- # each Makefile.in and add a new line on top of each file to say so.
+- # Grep'ing the whole file is not good either: AIX grep has a line
+- # limit of 2048, but all sed's we know have understand at least 4000.
+- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+- dirpart=`AS_DIRNAME("$mf")`
+- else
+- continue
+- fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+- test -z "$DEPDIR" && continue
+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
+- test -z "am__include" && continue
+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+- # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n 's/^U = //p' < "$mf"`
+- # Find all dependency output files, they are included files with
+- # $(DEPDIR) in their names. We invoke sed twice because it is the
+- # simplest approach to changing $(DEPDIR) to its actual value in the
+- # expansion.
+- for file in `sed -n "
+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+- # Make sure the directory exists.
+- test -f "$dirpart/$file" && continue
+- fdir=`AS_DIRNAME(["$file"])`
+- AS_MKDIR_P([$dirpart/$fdir])
+- # echo "creating $dirpart/$file"
+- echo '# dummy' > "$dirpart/$file"
+- done
+-done
+-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+ if test "$gt_cv_func_dgettext_libc" = "yes" \
+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
+ gt_cv_have_gettext=yes
@@ -518,25 +623,25 @@
+ else
+ gt_cv_have_gettext=no
+ fi
- fi
++ fi
+ ])
-+
+
+ if test "$gt_cv_have_gettext" = "yes" ; then
+ AC_DEFINE(ENABLE_NLS, 1,
+ [always defined to indicate that i18n is enabled])
- fi
-- done
-
-- cd ..
-- rm -rf conftest.dir
--else
-- am_cv_$1_dependencies_compiler_type=none
--fi
--])
--AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
--AM_CONDITIONAL([am__fastdep$1], [
-- test "x$enable_dependency_tracking" != xno \
-- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
++ fi
+
+-# AM_OUTPUT_DEPENDENCY_COMMANDS
+-# -----------------------------
+-# This macro should only be invoked once -- use via AC_REQUIRE.
+-#
+-# This code is only required when automatic dependency tracking
+-# is enabled. FIXME. This creates each `.P' file that we will
+-# need in order to bootstrap the dependency handling code.
+-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[AC_CONFIG_COMMANDS([depfiles],
+- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+ dnl Test whether we really found GNU xgettext.
+ if test "$XGETTEXT" != ":"; then
@@ -551,22 +656,22 @@
+ fi
+ fi
+-# Do all the work for Automake. -*- Autoconf -*-
+ # We need to process the po/ directory.
+ POSUB=po
--# AM_SET_DEPDIR
--# -------------
--# Choose a directory name for dependency files.
--# This macro is AC_REQUIREd in _AM_DEPENDENCIES
--AC_DEFUN([AM_SET_DEPDIR],
--[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
--AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
--])
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006, 2008 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+ AC_OUTPUT_COMMANDS(
+ [case "$CONFIG_FILES" in *po/Makefile.in*)
+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+ esac])
+-# serial 13
+ dnl These rules are solely for the distribution goal. While doing this
+ dnl we only have to keep exactly one list of the available catalogs
+ dnl in configure.in.
@@ -575,20 +680,8 @@
+ POFILES="$POFILES $lang.po"
+ done
--# AM_DEP_TRACK
--# ------------
--AC_DEFUN([AM_DEP_TRACK],
--[AC_ARG_ENABLE(dependency-tracking,
--[ --disable-dependency-tracking speeds up one-time build
-- --enable-dependency-tracking do not reject slow dependency extractors])
--if test "x$enable_dependency_tracking" != xno; then
-- am_depcomp="$ac_aux_dir/depcomp"
-- AMDEPBACKSLASH='\'
--fi
--AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
--AC_SUBST([AMDEPBACKSLASH])dnl
--_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
--])
+-# This macro actually does too much. Some checks are only needed if
+-# your package does certain things. But this isn't really a big deal.
+ dnl Make all variables we use known to autoconf.
+ AC_SUBST(CATALOGS)
+ AC_SUBST(CATOBJEXT)
@@ -602,7 +695,33 @@
+ AC_SUBST(POSUB)
+ ])
--# Generate code to set up dependency tracking. -*- Autoconf -*-
+-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+-# AM_INIT_AUTOMAKE([OPTIONS])
+-# -----------------------------------------------
+-# The call with PACKAGE and VERSION arguments is the old style
+-# call (pre autoconf-2.50), which is being phased out. PACKAGE
+-# and VERSION should now be passed to AC_INIT and removed from
+-# the call to AM_INIT_AUTOMAKE.
+-# We support both call styles for the transition. After
+-# the next Automake release, Autoconf can make the AC_INIT
+-# arguments mandatory, and then we can depend on a new Autoconf
+-# release and drop the old call support.
+-AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_PREREQ([2.60])dnl
+-dnl Autoconf wants to disallow AM_ names. We explicitly allow
+-dnl the ones we care about.
+-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+-AC_REQUIRE([AC_PROG_INSTALL])dnl
+-if test "`cd $srcdir && pwd`" != "`pwd`"; then
+- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+- # is not polluted with repeated "-I."
+- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+- # test to see if srcdir already configured
+- if test -f $srcdir/config.status; then
+- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+- fi
+-fi
+# AM_GLIB_GNU_GETTEXT
+# -------------------
+# Do checks necessary for use of gettext. If a suitable implementation
@@ -620,12 +739,15 @@
+ GLIB_LC_MESSAGES
+ GLIB_WITH_NLS
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
+-# test whether we have cygpath
+-if test -z "$CYGPATH_W"; then
+- if (cygpath --version) >/dev/null 2>/dev/null; then
+- CYGPATH_W='cygpath -w'
+- else
+- CYGPATH_W=echo
+- fi
+-fi
+-AC_SUBST([CYGPATH_W])
+ if test "$gt_cv_have_gettext" = "yes"; then
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
@@ -657,56 +779,27 @@
+ AC_MSG_RESULT($LINGUAS)
+ fi
--#serial 3
+-# Define the identity of the package.
+-dnl Distinguish between old-style and new-style calls.
+-m4_ifval([$2],
+-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+- AC_SUBST([PACKAGE], [$1])dnl
+- AC_SUBST([VERSION], [$2])],
+-[_AM_SET_OPTIONS([$1])dnl
+-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+ dnl Construct list of names of catalog files to be constructed.
+ if test -n "$LINGUAS"; then
+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+ fi
+ fi
--# _AM_OUTPUT_DEPENDENCY_COMMANDS
--# ------------------------------
--AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
--[for mf in $CONFIG_FILES; do
-- # Strip MF so we end up with the name of the file.
-- mf=`echo "$mf" | sed -e 's/:.*$//'`
-- # Check whether this is an Automake generated Makefile or not.
-- # We used to match only the files named `Makefile.in', but
-- # some people rename them; so instead we look at the file content.
-- # Grep'ing the first line is not enough: some people post-process
-- # each Makefile.in and add a new line on top of each file to say so.
-- # Grep'ing the whole file is not good either: AIX grep has a line
-- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-- dirpart=`AS_DIRNAME("$mf")`
-- else
-- continue
-- fi
-- # Extract the definition of DEPDIR, am__include, and am__quote
-- # from the Makefile without running `make'.
-- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-- test -z "$DEPDIR" && continue
-- am__include=`sed -n 's/^am__include = //p' < "$mf"`
-- test -z "am__include" && continue
-- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-- # When using ansi2knr, U may be empty or an underscore; expand it
-- U=`sed -n 's/^U = //p' < "$mf"`
-- # Find all dependency output files, they are included files with
-- # $(DEPDIR) in their names. We invoke sed twice because it is the
-- # simplest approach to changing $(DEPDIR) to its actual value in the
-- # expansion.
-- for file in `sed -n "
-- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-- # Make sure the directory exists.
-- test -f "$dirpart/$file" && continue
-- fdir=`AS_DIRNAME(["$file"])`
-- AS_MKDIR_P([$dirpart/$fdir])
-- # echo "creating $dirpart/$file"
-- echo '# dummy' > "$dirpart/$file"
-- done
--done
--])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+-_AM_IF_OPTION([no-define],,
+-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+ dnl Try to locate is.
@@ -719,6 +812,39 @@
+ fi
+ AC_SUBST(MKINSTALLDIRS)
+-# Some tools Automake needs.
+-AC_REQUIRE([AM_SANITY_CHECK])dnl
+-AC_REQUIRE([AC_ARG_PROGRAM])dnl
+-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+-AM_MISSING_PROG(AUTOCONF, autoconf)
+-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+-AM_MISSING_PROG(AUTOHEADER, autoheader)
+-AM_MISSING_PROG(MAKEINFO, makeinfo)
+-AM_PROG_INSTALL_SH
+-AM_PROG_INSTALL_STRIP
+-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+-# We need awk for the "check" target. The system "awk" is bad on
+-# some platforms.
+-AC_REQUIRE([AC_PROG_AWK])dnl
+-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+- [_AM_PROG_TAR([v7])])])
+-_AM_IF_OPTION([no-dependencies],,
+-[AC_PROVIDE_IFELSE([AC_PROG_CC],
+- [_AM_DEPENDENCIES(CC)],
+- [define([AC_PROG_CC],
+- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+-AC_PROVIDE_IFELSE([AC_PROG_CXX],
+- [_AM_DEPENDENCIES(CXX)],
+- [define([AC_PROG_CXX],
+- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+- [_AM_DEPENDENCIES(OBJC)],
+- [define([AC_PROG_OBJC],
+- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+-])
+ dnl Generate list of files to be processed by xgettext which will
+ dnl be included in po/Makefile.
+ test -d po || mkdir po
@@ -735,18 +861,7 @@
+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+ < $srcdir/po/POTFILES.in > po/POTFILES
+ ])
-
--# AM_OUTPUT_DEPENDENCY_COMMANDS
--# -----------------------------
--# This macro should only be invoked once -- use via AC_REQUIRE.
--#
--# This code is only required when automatic dependency tracking
--# is enabled. FIXME. This creates each `.P' file that we will
--# need in order to bootstrap the dependency handling code.
--AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
--[AC_CONFIG_COMMANDS([depfiles],
-- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
++
+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+# -------------------------------
+# Define VARIABLE to the location where catalog files will
@@ -771,12 +886,7 @@
+ [Define the location where the catalogs will be installed])
])
--dnl AM_GCONF_SOURCE_2
--dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
--dnl (i.e. pass to gconftool-2
--dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
--dnl you should install foo.schemas files
- dnl
++dnl
+dnl Now the definitions that aclocal will find
+dnl
+ifdef(glib_configure_in,[],[
@@ -784,13 +894,9 @@
+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+])dnl
--AC_DEFUN([AM_GCONF_SOURCE_2],
--[
-- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-- else
-- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-- fi
+-# When config.status generates a header, we must update the stamp-h file.
+-# This file resides in the same directory as the config header
+-# that is generated. The stamp files are numbered to have different names.
+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+#
+# Create a temporary file with TEST-FILE as its contents and pass the
@@ -807,28 +913,51 @@
+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+fi])
-- AC_ARG_WITH(gconf-source,
-- [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
-
-- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
+-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+-# loop where config.status creates the headers, so we can generate
+-# our stamp files there.
+-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+-[# Compute $1's index in $config_headers.
+-_am_arg=$1
+-_am_stamp_count=1
+-for _am_header in $config_headers :; do
+- case $_am_header in
+- $_am_arg | $_am_arg:* )
+- break ;;
+- * )
+- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+- esac
+-done
+-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+# gnome-common.m4
+#
-- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-- fi
+-# AM_PROG_INSTALL_SH
+-# ------------------
+-# Define $install_sh.
+-AC_DEFUN([AM_PROG_INSTALL_SH],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+-AC_SUBST(install_sh)])
+dnl GNOME_COMMON_INIT
-- AC_ARG_WITH(gconf-schema-file-dir,
-- [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
+-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+AC_DEFUN([GNOME_COMMON_INIT],
+[
+ dnl this macro should come after AC_CONFIG_MACRO_DIR
+ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
-- AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
+-# serial 2
+ dnl ensure that when the Automake generated makefile calls aclocal,
+ dnl it honours the $ACLOCAL_FLAGS environment variable
+ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
@@ -836,48 +965,23 @@
+ ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
+ fi
-- AC_ARG_ENABLE(schemas-install,
-- [ --disable-schemas-install Disable the schemas installation],
-- [case ${enableval} in
-- yes|no) ;;
-- *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
-- esac])
-- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
+-# Check whether the underlying file-system supports filenames
+-# with a leading dot. For instance MS-DOS doesn't.
+-AC_DEFUN([AM_SET_LEADING_DOT],
+-[rm -rf .tst 2>/dev/null
+-mkdir .tst 2>/dev/null
+-if test -d .tst; then
+- am__leading_dot=.
+-else
+- am__leading_dot=_
+-fi
+-rmdir .tst 2>/dev/null
+-AC_SUBST([am__leading_dot])])
+ AC_SUBST([ACLOCAL_AMFLAGS])
- ])
-
--# Copyright (C) 1995-2002 Free Software Foundation, Inc.
--# Copyright (C) 2001-2003,2004 Red Hat, Inc.
--#
--# This file is free software, distributed under the terms of the GNU
--# General Public License. As a special exception to the GNU General
--# Public License, this file may be distributed as part of a program
--# that contains a configuration script generated by Autoconf, under
--# the same distribution terms as the rest of that program.
--#
--# This file can be copied and used freely without restrictions. It can
--# be used in projects which are not available under the GNU Public License
--# but which still want to provide support for the GNU gettext functionality.
--#
--# Macro to add for using GNU gettext.
--# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
--#
--# Modified to never use included libintl.
--# Owen Taylor <otaylor at redhat.com>, 12/15/1998
--#
--# Major rework to remove unused code
--# Owen Taylor <otaylor at redhat.com>, 12/11/2002
--#
--# Added better handling of ALL_LINGUAS from GNU gettext version
--# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
--#
--# Modified to require ngettext
--# Matthias Clasen <mclasen at redhat.com> 08/06/2004
--#
--# We need this here as well, since someone might use autoconf-2.5x
--# to configure GLib then an older version to configure a package
--# using AM_GLIB_GNU_GETTEXT
--AC_PREREQ(2.53)
++])
+
+-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+-# From Jim Meyering
+AC_DEFUN([GNOME_DEBUG_CHECK],
+[
+ AC_ARG_ENABLE([debug],
@@ -885,40 +989,40 @@
+ [turn on debugging]),,
+ [enable_debug=no])
+-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+ if test x$enable_debug = xyes ; then
+ AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
+ [Enable additional debugging at the expense of performance and size])
+ fi
+])
-+
+
+-# serial 4
+dnl GNOME_MAINTAINER_MODE_DEFINES ()
+dnl define DISABLE_DEPRECATED
- dnl
--dnl We go to great lengths to make sure that aclocal won't
--dnl try to pull in the installed version of these macros
--dnl when running aclocal in the glib directory.
--dnl
--m4_copy([AC_DEFUN],[glib_DEFUN])
--m4_copy([AC_REQUIRE],[glib_REQUIRE])
--dnl
--dnl At the end, if we're not within glib, we'll define the public
--dnl definitions in terms of our private definitions.
--dnl
++dnl
+AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
+[
+ AC_REQUIRE([AM_MAINTAINER_MODE])
--# GLIB_LC_MESSAGES
--#--------------------
--glib_DEFUN([GLIB_LC_MESSAGES],
-- [AC_CHECK_HEADERS([locale.h])
-- if test $ac_cv_header_locale_h = yes; then
-- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-- if test $am_cv_val_LC_MESSAGES = yes; then
-- AC_DEFINE(HAVE_LC_MESSAGES, 1,
-- [Define if your <locale.h> file defines LC_MESSAGES.])
+-AC_DEFUN([AM_MAINTAINER_MODE],
+-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+- dnl maintainer-mode is disabled by default
+- AC_ARG_ENABLE(maintainer-mode,
+-[ --enable-maintainer-mode enable make rules and dependencies not useful
+- (and sometimes confusing) to the casual installer],
+- USE_MAINTAINER_MODE=$enableval,
+- USE_MAINTAINER_MODE=no)
+- AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+- MAINT=$MAINTAINER_MODE_TRUE
+- AC_SUBST(MAINT)dnl
+-]
+-)
+ if test $USE_MAINTAINER_MODE = yes; then
+ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED"
+ else
@@ -926,7 +1030,8 @@
+ fi
+ AC_SUBST(DISABLE_DEPRECATED)
+])
-+
+
+-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+dnl GNOME_COMPILE_WARNINGS
+dnl Turn on many useful compiler warnings
+dnl For now, only works on GCC
@@ -934,43 +1039,68 @@
+ dnl ******************************
+ dnl More compiler warnings
+ dnl ******************************
-+
+
+-# Check to see how 'make' treats includes. -*- Autoconf -*-
+ AC_ARG_ENABLE(compile-warnings,
+ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
+ [Turn on compiler warnings]),,
+ [enable_compile_warnings="m4_default([$1],[yes])"])
-+
+
+-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+ warnCFLAGS=
+ if test "x$GCC" != xyes; then
+ enable_compile_warnings=no
- fi
-- fi])
-
--# GLIB_PATH_PROG_WITH_TEST
--#----------------------------
--dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
--dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
--glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
--[# Extract the first word of "$2", so it can be a program name with args.
--set dummy $2; ac_word=[$]2
--AC_MSG_CHECKING([for $ac_word])
--AC_CACHE_VAL(ac_cv_path_$1,
--[case "[$]$1" in
-- /*)
-- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-- ;;
-- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in ifelse([$5], , $PATH, [$5]); do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- if [$3]; then
-- ac_cv_path_$1="$ac_dir/$ac_word"
-- break
-- fi
++ fi
+
+-# serial 3
+ warning_flags=
+ realsave_CFLAGS="$CFLAGS"
-+
+
+-# AM_MAKE_INCLUDE()
+-# -----------------
+-# Check to see how make treats includes.
+-AC_DEFUN([AM_MAKE_INCLUDE],
+-[am_make=${MAKE-make}
+-cat > confinc << 'END'
+-am__doit:
+- @echo done
+-.PHONY: am__doit
+-END
+-# If we don't find an include directive, just comment out the code.
+-AC_MSG_CHECKING([for style of include used by $am_make])
+-am__include="#"
+-am__quote=
+-_am_result=none
+-# First try GNU make style include.
+-echo "include confinc" > confmf
+-# We grep out `Entering directory' and `Leaving directory'
+-# messages which can occur if `w' ends up in MAKEFLAGS.
+-# In particular we don't look at `^make:' because GNU make might
+-# be invoked under some other name (usually "gmake"), in which
+-# case it prints its new name instead of `make'.
+-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+- am__include=include
+- am__quote=
+- _am_result=GNU
+-fi
+-# Now try BSD make style include.
+-if test "$am__include" = "#"; then
+- echo '.include "confinc"' > confmf
+- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+- am__include=.include
+- am__quote="\""
+- _am_result=BSD
+- fi
+-fi
+-AC_SUBST([am__include])
+-AC_SUBST([am__quote])
+-AC_MSG_RESULT([$_am_result])
+-rm -f confinc confmf
+-])
+ case "$enable_compile_warnings" in
+ no)
+ warning_flags=
@@ -1011,12 +1141,19 @@
+ CFLAGS="$realsave_CFLAGS"
+ AC_MSG_CHECKING(what warning flags to pass to the C compiler)
+ AC_MSG_RESULT($warning_flags)
-+
+
+-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+ AC_ARG_ENABLE(iso-c,
+ AC_HELP_STRING([--enable-iso-c],
+ [Try to warn if code is not ISO C ]),,
+ [enable_iso_c=no])
-+
+
+-# serial 5
+ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
+ complCFLAGS=
+ if test "x$enable_iso_c" != "xno"; then
@@ -1030,7 +1167,676 @@
+ *) complCFLAGS="$complCFLAGS -pedantic" ;;
+ esac
+ fi
- fi
++ fi
++ AC_MSG_RESULT($complCFLAGS)
+
+-# AM_PROG_CC_C_O
+-# --------------
+-# Like AC_PROG_CC_C_O, but changed for automake.
+-AC_DEFUN([AM_PROG_CC_C_O],
+-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-AC_REQUIRE_AUX_FILE([compile])dnl
+-# FIXME: we rely on the cache variable name because
+-# there is no other way.
+-set dummy $CC
+-ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+- # Losing compiler, so override with the script.
+- # FIXME: It is wrong to rewrite CC.
+- # But if we don't then we get into trouble of one sort or another.
+- # A longer-term fix would be to have automake use am__CC in this case,
+- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+- CC="$am_aux_dir/compile $CC"
+-fi
+-dnl Make sure AC_PROG_CC is never called again, or it will override our
+-dnl setting of CC.
+-m4_define([AC_PROG_CC],
+- [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
++ WARN_CFLAGS="$warning_flags $complCFLAGS"
++ AC_SUBST(WARN_CFLAGS)
+ ])
+
+-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
++dnl For C++, do basically the same thing.
+
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++AC_DEFUN([GNOME_CXX_WARNINGS],[
++ AC_ARG_ENABLE(cxx-warnings,
++ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
++ [Turn on compiler warnings.]),,
++ [enable_cxx_warnings="m4_default([$1],[minimum])"])
+
+-# serial 5
++ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
++ warnCXXFLAGS=
++ if test "x$GXX" != xyes; then
++ enable_cxx_warnings=no
++ fi
++ if test "x$enable_cxx_warnings" != "xno"; then
++ if test "x$GXX" = "xyes"; then
++ case " $CXXFLAGS " in
++ *[\ \ ]-Wall[\ \ ]*) ;;
++ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
++ esac
+
+-# AM_MISSING_PROG(NAME, PROGRAM)
+-# ------------------------------
+-AC_DEFUN([AM_MISSING_PROG],
+-[AC_REQUIRE([AM_MISSING_HAS_RUN])
+-$1=${$1-"${am_missing_run}$2"}
+-AC_SUBST($1)])
++ ## -W is not all that useful. And it cannot be controlled
++ ## with individual -Wno-xxx flags, unlike -Wall
++ if test "x$enable_cxx_warnings" = "xyes"; then
++ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
++ fi
++ fi
++ fi
++ AC_MSG_RESULT($warnCXXFLAGS)
+
++ AC_ARG_ENABLE(iso-cxx,
++ AC_HELP_STRING([--enable-iso-cxx],
++ [Try to warn if code is not ISO C++ ]),,
++ [enable_iso_cxx=no])
+
+-# AM_MISSING_HAS_RUN
+-# ------------------
+-# Define MISSING if not defined so far and test if it supports --run.
+-# If it does, set am_missing_run to use it, otherwise, to nothing.
+-AC_DEFUN([AM_MISSING_HAS_RUN],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-AC_REQUIRE_AUX_FILE([missing])dnl
+-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+-# Use eval to expand $SHELL
+-if eval "$MISSING --run true"; then
+- am_missing_run="$MISSING --run "
+-else
+- am_missing_run=
+- AC_MSG_WARN([`missing' script is too old or missing])
+-fi
+-])
++ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
++ complCXXFLAGS=
++ if test "x$enable_iso_cxx" != "xno"; then
++ if test "x$GXX" = "xyes"; then
++ case " $CXXFLAGS " in
++ *[\ \ ]-ansi[\ \ ]*) ;;
++ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
++ esac
+
+-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++ case " $CXXFLAGS " in
++ *[\ \ ]-pedantic[\ \ ]*) ;;
++ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
++ esac
++ fi
++ fi
++ AC_MSG_RESULT($complCXXFLAGS)
+
+-# AM_PROG_MKDIR_P
+-# ---------------
+-# Check for `mkdir -p'.
+-AC_DEFUN([AM_PROG_MKDIR_P],
+-[AC_PREREQ([2.60])dnl
+-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
+-dnl while keeping a definition of mkdir_p for backward compatibility.
+-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+-dnl Makefile.ins that do not define MKDIR_P, so we do our own
+-dnl adjustment using top_builddir (which is defined more often than
+-dnl MKDIR_P).
+-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+-case $mkdir_p in
+- [[\\/$]]* | ?:[[\\/]]*) ;;
+- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+-esac
++ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
++ AC_SUBST(WARN_CXXFLAGS)
+ ])
+
+-# Helper functions for option handling. -*- Autoconf -*-
+-
+-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 3
++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+-# _AM_MANGLE_OPTION(NAME)
+-# -----------------------
+-AC_DEFUN([_AM_MANGLE_OPTION],
+-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
+
+-# _AM_SET_OPTION(NAME)
+-# ------------------------------
+-# Set option NAME. Presently that only means defining a flag for this option.
+-AC_DEFUN([_AM_SET_OPTION],
+-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+-# _AM_SET_OPTIONS(OPTIONS)
+-# ----------------------------------
+-# OPTIONS is a space-separated list of Automake options.
+-AC_DEFUN([_AM_SET_OPTIONS],
+-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
++# -----------------------------------------------------------
++# If this macro is not defined by Autoconf, define it here.
++m4_ifdef([AC_PROVIDE_IFELSE],
++ [],
++ [m4_define([AC_PROVIDE_IFELSE],
++ [m4_ifdef([AC_PROVIDE_$1],
++ [$2], [$3])])])
+
+-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+-# -------------------------------------------
+-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+-AC_DEFUN([_AM_IF_OPTION],
+-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# AC_PROG_LIBTOOL
++# ---------------
++AC_DEFUN([AC_PROG_LIBTOOL],
++[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
++dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
++dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
++ AC_PROVIDE_IFELSE([AC_PROG_CXX],
++ [AC_LIBTOOL_CXX],
++ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
++ ])])
++dnl And a similar setup for Fortran 77 support
++ AC_PROVIDE_IFELSE([AC_PROG_F77],
++ [AC_LIBTOOL_F77],
++ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
++])])
+
+-# AM_RUN_LOG(COMMAND)
+-# -------------------
+-# Run COMMAND, save the exit status in ac_status, and log it.
+-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+-AC_DEFUN([AM_RUN_LOG],
+-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+- ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+- (exit $ac_status); }])
+-
+-# Check to make sure that the build environment is sane. -*- Autoconf -*-
++dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
++dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
++dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
++ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
++ [AC_LIBTOOL_GCJ],
++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
++ [AC_LIBTOOL_GCJ],
++ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
++ [AC_LIBTOOL_GCJ],
++ [ifdef([AC_PROG_GCJ],
++ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
++ ifdef([A][M_PROG_GCJ],
++ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
++ ifdef([LT_AC_PROG_GCJ],
++ [define([LT_AC_PROG_GCJ],
++ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
++])])# AC_PROG_LIBTOOL
+
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+
+-# serial 4
++# _AC_PROG_LIBTOOL
++# ----------------
++AC_DEFUN([_AC_PROG_LIBTOOL],
++[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+-# AM_SANITY_CHECK
+-# ---------------
+-AC_DEFUN([AM_SANITY_CHECK],
+-[AC_MSG_CHECKING([whether build environment is sane])
+-# Just in case
+-sleep 1
+-echo timestamp > conftest.file
+-# Do `set' in a subshell so we don't clobber the current shell's
+-# arguments. Must try -L first in case configure is actually a
+-# symlink; some systems play weird games with the mod time of symlinks
+-# (eg FreeBSD returns the mod time of the symlink's containing
+-# directory).
+-if (
+- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+- if test "$[*]" = "X"; then
+- # -L didn't work.
+- set X `ls -t $srcdir/configure conftest.file`
+- fi
+- rm -f conftest.file
+- if test "$[*]" != "X $srcdir/configure conftest.file" \
+- && test "$[*]" != "X conftest.file $srcdir/configure"; then
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+- # If neither matched, then we have a broken ls. This can happen
+- # if, for instance, CONFIG_SHELL is bash and it inherits a
+- # broken ls alias from the environment. This has actually
+- # happened. Such a system could not be considered "sane".
+- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+-alias in your environment])
+- fi
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++AC_SUBST(LIBTOOL)dnl
+
+- test "$[2]" = conftest.file
+- )
+-then
+- # Ok.
+- :
+-else
+- AC_MSG_ERROR([newly created file is older than distributed files!
+-Check your system clock])
+-fi
+-AC_MSG_RESULT(yes)])
++# Prevent multiple expansion
++define([AC_PROG_LIBTOOL], [])
++])# _AC_PROG_LIBTOOL
+
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+
+-# AM_PROG_INSTALL_STRIP
+-# ---------------------
+-# One issue with vendor `install' (even GNU) is that you can't
+-# specify the program used to strip binaries. This is especially
+-# annoying in cross-compiling environments, where the build's strip
+-# is unlikely to handle the host's binaries.
+-# Fortunately install-sh will honor a STRIPPROG variable, so we
+-# always use install-sh in `make install-strip', and initialize
+-# STRIPPROG with the value of the STRIP variable (set by the user).
+-AC_DEFUN([AM_PROG_INSTALL_STRIP],
+-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'. However `strip' might not be the right
+-# tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
+-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+-if test "$cross_compiling" != no; then
+- AC_CHECK_TOOL([STRIP], [strip], :)
+-fi
+-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+-AC_SUBST([INSTALL_STRIP_PROGRAM])])
++# AC_LIBTOOL_SETUP
++# ----------------
++AC_DEFUN([AC_LIBTOOL_SETUP],
++[AC_PREREQ(2.50)dnl
++AC_REQUIRE([AC_ENABLE_SHARED])dnl
++AC_REQUIRE([AC_ENABLE_STATIC])dnl
++AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_PROG_LD])dnl
++AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
++AC_REQUIRE([AC_PROG_NM])dnl
+
+-# Copyright (C) 2006 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++AC_REQUIRE([AC_PROG_LN_S])dnl
++AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
++AC_REQUIRE([AC_OBJEXT])dnl
++AC_REQUIRE([AC_EXEEXT])dnl
++dnl
++AC_LIBTOOL_SYS_MAX_CMD_LEN
++AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++AC_LIBTOOL_OBJDIR
+
+-# _AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
+-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+-# This macro is traced by Automake.
+-AC_DEFUN([_AM_SUBST_NOTMAKE])
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++_LT_AC_PROG_ECHO_BACKSLASH
+
+-# Check how to create a tarball. -*- Autoconf -*-
++case $host_os in
++aix3*)
++ # AIX sometimes has problems with the GCC collect2 program. For some
++ # reason, if we set the COLLECT_NAMES environment variable, the problems
++ # vanish in a puff of smoke.
++ if test "X${COLLECT_NAMES+set}" != Xset; then
++ COLLECT_NAMES=
++ export COLLECT_NAMES
++ fi
++ ;;
++esac
+
+-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# Sed substitution that helps us do robust quoting. It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e 1s/^X//'
++[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+-# serial 2
++# Same as above, but do not quote variable references.
++[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+-# _AM_PROG_TAR(FORMAT)
+-# --------------------
+-# Check how to create a tarball in format FORMAT.
+-# FORMAT should be one of `v7', `ustar', or `pax'.
+-#
+-# Substitute a variable $(am__tar) that is a command
+-# writing to stdout a FORMAT-tarball containing the directory
+-# $tardir.
+-# tardir=directory && $(am__tar) > result.tar
+-#
+-# Substitute a variable $(am__untar) that extract such
+-# a tarball read from stdin.
+-# $(am__untar) < result.tar
+-AC_DEFUN([_AM_PROG_TAR],
+-[# Always define AMTAR for backward compatibility.
+-AM_MISSING_PROG([AMTAR], [tar])
+-m4_if([$1], [v7],
+- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+- [m4_case([$1], [ustar],, [pax],,
+- [m4_fatal([Unknown tar format])])
+-AC_MSG_CHECKING([how to create a $1 tar archive])
+-# Loop over all known methods to create a tar archive until one works.
+-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+-# Do not fold the above two line into one, because Tru64 sh and
+-# Solaris sh will not grok spaces in the rhs of `-'.
+-for _am_tool in $_am_tools
+-do
+- case $_am_tool in
+- gnutar)
+- for _am_tar in tar gnutar gtar;
+- do
+- AM_RUN_LOG([$_am_tar --version]) && break
+- done
+- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+- am__untar="$_am_tar -xf -"
+- ;;
+- plaintar)
+- # Must skip GNU tar: if it does not support --format= it doesn't create
+- # ustar tarball either.
+- (tar --version) >/dev/null 2>&1 && continue
+- am__tar='tar chf - "$$tardir"'
+- am__tar_='tar chf - "$tardir"'
+- am__untar='tar xf -'
+- ;;
+- pax)
+- am__tar='pax -L -x $1 -w "$$tardir"'
+- am__tar_='pax -L -x $1 -w "$tardir"'
+- am__untar='pax -r'
+- ;;
+- cpio)
+- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+- am__untar='cpio -i -H $1 -d'
+- ;;
+- none)
+- am__tar=false
+- am__tar_=false
+- am__untar=false
+- ;;
+- esac
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+- # If the value was cached, stop now. We just wanted to have am__tar
+- # and am__untar set.
+- test -n "${am_cv_prog_tar_$1}" && break
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
+
+- # tar/untar a dummy directory, and stop if the command works
+- rm -rf conftest.dir
+- mkdir conftest.dir
+- echo GrepMe > conftest.dir/file
+- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+- rm -rf conftest.dir
+- if test -s conftest.tar; then
+- AM_RUN_LOG([$am__untar <conftest.tar])
+- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+- fi
+-done
+-rm -rf conftest.dir
++# Constants:
++rm="rm -f"
+
+-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+-AC_SUBST([am__tar])
+-AC_SUBST([am__untar])
+-]) # _AM_PROG_TAR
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
+
+-dnl AM_GCONF_SOURCE_2
+-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
+-dnl (i.e. pass to gconftool-2
+-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
+-dnl you should install foo.schemas files
+-dnl
++# All known linkers require a `.a' archive for static linking (except MSVC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+-AC_DEFUN([AM_GCONF_SOURCE_2],
+-[
+- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
+- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+- else
+- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
+- fi
++AC_CHECK_TOOL(AR, ar, false)
++AC_CHECK_TOOL(RANLIB, ranlib, :)
++AC_CHECK_TOOL(STRIP, strip, :)
+
+- AC_ARG_WITH([gconf-source],
+- AC_HELP_STRING([--with-gconf-source=sourceaddress],
+- [Config database for installing schema files.]),
+- [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
+
+- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
+- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$SED" && SED=sed
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
+
+- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+- fi
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
+
+- AC_ARG_WITH([gconf-schema-file-dir],
+- AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
+- [Directory for installing schema files.]),
+- [GCONF_SCHEMA_FILE_DIR="$withval"],)
++if test -n "$RANLIB"; then
++ case $host_os in
++ openbsd*)
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++ ;;
++ *)
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
++ ;;
++ esac
++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
+
+- AC_SUBST(GCONF_SCHEMA_FILE_DIR)
+- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++_LT_CC_BASENAME([$compiler])
+
+- AC_ARG_ENABLE(schemas-install,
+- [ --disable-schemas-install Disable the schemas installation],
+- [case ${enableval} in
+- yes|no) ;;
+- *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
+- esac])
+- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
+-])
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
++ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++ AC_PATH_MAGIC
++ fi
++ ;;
++esac
+
+-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+-#
+-# This file is free software, distributed under the terms of the GNU
+-# General Public License. As a special exception to the GNU General
+-# Public License, this file may be distributed as part of a program
+-# that contains a configuration script generated by Autoconf, under
+-# the same distribution terms as the rest of that program.
+-#
+-# This file can be copied and used freely without restrictions. It can
+-# be used in projects which are not available under the GNU Public License
+-# but which still want to provide support for the GNU gettext functionality.
+-#
+-# Macro to add for using GNU gettext.
+-# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
+-#
+-# Modified to never use included libintl.
+-# Owen Taylor <otaylor at redhat.com>, 12/15/1998
+-#
+-# Major rework to remove unused code
+-# Owen Taylor <otaylor at redhat.com>, 12/11/2002
+-#
+-# Added better handling of ALL_LINGUAS from GNU gettext version
+-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
+-#
+-# Modified to require ngettext
+-# Matthias Clasen <mclasen at redhat.com> 08/06/2004
+-#
+-# We need this here as well, since someone might use autoconf-2.5x
+-# to configure GLib then an older version to configure a package
+-# using AM_GLIB_GNU_GETTEXT
+-AC_PREREQ(2.53)
++_LT_REQUIRED_DARWIN_CHECKS
+
+-dnl
+-dnl We go to great lengths to make sure that aclocal won't
+-dnl try to pull in the installed version of these macros
+-dnl when running aclocal in the glib directory.
+-dnl
+-m4_copy([AC_DEFUN],[glib_DEFUN])
+-m4_copy([AC_REQUIRE],[glib_REQUIRE])
+-dnl
+-dnl At the end, if we're not within glib, we'll define the public
+-dnl definitions in terms of our private definitions.
+-dnl
++AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
++enable_win32_dll=yes, enable_win32_dll=no)
+
+-# GLIB_LC_MESSAGES
+-#--------------------
+-glib_DEFUN([GLIB_LC_MESSAGES],
+- [AC_CHECK_HEADERS([locale.h])
+- if test $ac_cv_header_locale_h = yes; then
+- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+- if test $am_cv_val_LC_MESSAGES = yes; then
+- AC_DEFINE(HAVE_LC_MESSAGES, 1,
+- [Define if your <locale.h> file defines LC_MESSAGES.])
+- fi
+- fi])
++AC_ARG_ENABLE([libtool-lock],
++ [AC_HELP_STRING([--disable-libtool-lock],
++ [avoid locking (might break parallel builds)])])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+-# GLIB_PATH_PROG_WITH_TEST
+-#----------------------------
+-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
+-[# Extract the first word of "$2", so it can be a program name with args.
+-set dummy $2; ac_word=[$]2
+-AC_MSG_CHECKING([for $ac_word])
+-AC_CACHE_VAL(ac_cv_path_$1,
+-[case "[$]$1" in
+- /*)
+- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+- ;;
+- *)
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+- for ac_dir in ifelse([$5], , $PATH, [$5]); do
+- test -z "$ac_dir" && ac_dir=.
+- if test -f $ac_dir/$ac_word; then
+- if [$3]; then
+- ac_cv_path_$1="$ac_dir/$ac_word"
+- break
+- fi
+- fi
- done
- IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
@@ -1046,11 +1852,13 @@
- AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-+ AC_MSG_RESULT($complCFLAGS)
-+
-+ WARN_CFLAGS="$warning_flags $complCFLAGS"
-+ AC_SUBST(WARN_CFLAGS)
- ])
+-])
++AC_ARG_WITH([pic],
++ [AC_HELP_STRING([--with-pic],
++ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
++ [pic_mode="$withval"],
++ [pic_mode=default])
++test -z "$pic_mode" && pic_mode=default
-# GLIB_WITH_NLS
-#-----------------
@@ -1058,41 +1866,27 @@
- dnl NLS is obligatory
- [USE_NLS=yes
- AC_SUBST(USE_NLS)
-+dnl For C++, do basically the same thing.
++# Use C for the default configuration in the libtool script
++tagname=
++AC_LIBTOOL_LANG_C_CONFIG
++_LT_AC_TAGCONFIG
++])# AC_LIBTOOL_SETUP
- gt_cv_have_gettext=no
-+AC_DEFUN([GNOME_CXX_WARNINGS],[
-+ AC_ARG_ENABLE(cxx-warnings,
-+ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
-+ [Turn on compiler warnings.]),,
-+ [enable_cxx_warnings="m4_default([$1],[minimum])"])
- CATOBJEXT=NONE
- XGETTEXT=:
- INTLLIBS=
-+ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
-+ warnCXXFLAGS=
-+ if test "x$GXX" != xyes; then
-+ enable_cxx_warnings=no
-+ fi
-+ if test "x$enable_cxx_warnings" != "xno"; then
-+ if test "x$GXX" = "xyes"; then
-+ case " $CXXFLAGS " in
-+ *[\ \ ]-Wall[\ \ ]*) ;;
-+ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
-+ esac
++# _LT_AC_SYS_COMPILER
++# -------------------
++AC_DEFUN([_LT_AC_SYS_COMPILER],
++[AC_REQUIRE([AC_PROG_CC])dnl
- AC_CHECK_HEADER(libintl.h,
- [gt_cv_func_dgettext_libintl="no"
- libintl_extra_libs=""
-+ ## -W is not all that useful. And it cannot be controlled
-+ ## with individual -Wno-xxx flags, unlike -Wall
-+ if test "x$enable_cxx_warnings" = "xyes"; then
-+ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
-+ fi
-+ fi
-+ fi
-+ AC_MSG_RESULT($warnCXXFLAGS)
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
- #
- # First check in libc
@@ -1120,10 +1914,8 @@
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- fi
-+ AC_ARG_ENABLE(iso-cxx,
-+ AC_HELP_STRING([--enable-iso-cxx],
-+ [Try to warn if code is not ISO C++ ]),,
-+ [enable_iso_cxx=no])
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
- #
- # If we don't have everything we want, check in libintl
@@ -1136,15 +1928,7 @@
- [AC_CHECK_LIB(intl, ngettext,
- [AC_CHECK_LIB(intl, dgettext,
- gt_cv_func_dgettext_libintl=yes)])])
-+ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
-+ complCXXFLAGS=
-+ if test "x$enable_iso_cxx" != "xno"; then
-+ if test "x$GXX" = "xyes"; then
-+ case " $CXXFLAGS " in
-+ *[\ \ ]-ansi[\ \ ]*) ;;
-+ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
-+ esac
-
+-
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
- AC_MSG_CHECKING([if -liconv is needed to use gettext])
- AC_MSG_RESULT([])
@@ -1155,14 +1939,7 @@
- :,-liconv)],
- :,-liconv)
- fi
-+ case " $CXXFLAGS " in
-+ *[\ \ ]-pedantic[\ \ ]*) ;;
-+ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-+ esac
-+ fi
-+ fi
-+ AC_MSG_RESULT($complCXXFLAGS)
-
+-
- #
- # If we found libintl, then check in it for bind_textdomain_codeset();
- # we'll prefer libc if neither have bind_textdomain_codeset(),
@@ -1174,9 +1951,9 @@
- unset ac_cv_func_bind_textdomain_codeset
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- LIBS="$glib_save_LIBS"
-+ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-+ AC_SUBST(WARN_CXXFLAGS)
-+])
++# Allow CC to be a program name with arguments.
++compiler=$CC
++])# _LT_AC_SYS_COMPILER
- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
- gt_cv_func_dgettext_libc=no
@@ -1188,7 +1965,6 @@
- fi
- fi
- fi
-+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
@@ -1254,7 +2030,20 @@
- fi
- fi
- ])
-+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
++AC_DEFUN([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++ case $cc_temp in
++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
- if test "$gt_cv_have_gettext" = "yes" ; then
- AC_DEFINE(ENABLE_NLS, 1,
@@ -1273,14 +2062,18 @@
- XGETTEXT=":"
- fi
- fi
-+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-+# -----------------------------------------------------------
-+# If this macro is not defined by Autoconf, define it here.
-+m4_ifdef([AC_PROVIDE_IFELSE],
-+ [],
-+ [m4_define([AC_PROVIDE_IFELSE],
-+ [m4_ifdef([AC_PROVIDE_$1],
-+ [$2], [$3])])])
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++AC_DEFUN([_LT_COMPILER_BOILERPLATE],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_COMPILER_BOILERPLATE
- # We need to process the po/ directory.
- POSUB=po
@@ -1289,21 +2082,18 @@
- [case "$CONFIG_FILES" in *po/Makefile.in*)
- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
- esac])
-+# AC_PROG_LIBTOOL
-+# ---------------
-+AC_DEFUN([AC_PROG_LIBTOOL],
-+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-+ AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+ [AC_LIBTOOL_CXX],
-+ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-+ ])])
-+dnl And a similar setup for Fortran 77 support
-+ AC_PROVIDE_IFELSE([AC_PROG_F77],
-+ [AC_LIBTOOL_F77],
-+ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-+])])
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm -r conftest*
++])# _LT_LINKER_BOILERPLATE
- dnl These rules are solely for the distribution goal. While doing this
- dnl we only have to keep exactly one list of the available catalogs
@@ -1312,23 +2102,14 @@
- GMOFILES="$GMOFILES $lang.gmo"
- POFILES="$POFILES $lang.po"
- done
-+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-+ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-+ [AC_LIBTOOL_GCJ],
-+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-+ [AC_LIBTOOL_GCJ],
-+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-+ [AC_LIBTOOL_GCJ],
-+ [ifdef([AC_PROG_GCJ],
-+ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-+ ifdef([A][M_PROG_GCJ],
-+ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-+ ifdef([LT_AC_PROG_GCJ],
-+ [define([LT_AC_PROG_GCJ],
-+ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-+])])# AC_PROG_LIBTOOL
++# _LT_REQUIRED_DARWIN_CHECKS
++# --------------------------
++# Check for some things on darwin
++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
++ case $host_os in
++ rhapsody* | darwin*)
++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
- dnl Make all variables we use known to autoconf.
- AC_SUBST(CATALOGS)
@@ -1342,6 +2123,68 @@
- AC_SUBST(POFILES)
- AC_SUBST(POSUB)
- ])
++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
++ [lt_cv_apple_cc_single_mod=no
++ if test -z "${LT_MULTI_MODULE}"; then
++ # By default we will add the -single_module flag. You can override
++ # by either setting the environment variable LT_MULTI_MODULE
++ # non-empty at configure time, or by adding -multi_module to the
++ # link flags.
++ echo "int foo(void){return 1;}" > conftest.c
++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++ -dynamiclib ${wl}-single_module conftest.c
++ if test -f libconftest.dylib; then
++ lt_cv_apple_cc_single_mod=yes
++ rm -rf libconftest.dylib*
++ fi
++ rm conftest.c
++ fi])
++ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
++ [lt_cv_ld_exported_symbols_list],
++ [lt_cv_ld_exported_symbols_list=no
++ save_LDFLAGS=$LDFLAGS
++ echo "_main" > conftest.sym
++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++ [lt_cv_ld_exported_symbols_list=yes],
++ [lt_cv_ld_exported_symbols_list=no])
++ LDFLAGS="$save_LDFLAGS"
++ ])
++ case $host_os in
++ rhapsody* | darwin1.[[0123]])
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++ darwin1.*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ darwin*)
++ # if running on 10.5 or later, the deployment target defaults
++ # to the OS version, if on x86, and 10.4, the deployment
++ # target defaults to 10.4. Don't you love it?
++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[[012]]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ 10.*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ esac
++ ;;
++ esac
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++ _lt_dar_single_mod='$single_module'
++ fi
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++ else
++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++ fi
++ if test "$DSYMUTIL" != ":"; then
++ _lt_dsymutil="~$DSYMUTIL \$lib || :"
++ else
++ _lt_dsymutil=
++ fi
++ ;;
++ esac
++])
-# AM_GLIB_GNU_GETTEXT
-# -------------------
@@ -1359,13 +2202,31 @@
-
- GLIB_LC_MESSAGES
- GLIB_WITH_NLS
-+# _AC_PROG_LIBTOOL
-+# ----------------
-+AC_DEFUN([_AC_PROG_LIBTOOL],
-+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
++# _LT_AC_SYS_LIBPATH_AIX
++# ----------------------
++# Links a minimal program and checks the executable
++# for the system default hardcoded library path. In most cases,
++# this is /usr/lib:/lib, but when the MPI compilers are used
++# the location of the communication and MPI libs are included too.
++# If we don't find anything, use the default library path according
++# to the aix ld manual.
++AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi],[])
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++])# _LT_AC_SYS_LIBPATH_AIX
- if test "$gt_cv_have_gettext" = "yes"; then
- if test "x$ALL_LINGUAS" = "x"; then
@@ -1397,17 +2258,21 @@
- LINGUAS=$NEW_LINGUAS
- AC_MSG_RESULT($LINGUAS)
- fi
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- dnl Construct list of names of catalog files to be constructed.
- if test -n "$LINGUAS"; then
- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
- fi
- fi
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+AC_SUBST(LIBTOOL)dnl
++# _LT_AC_SHELL_INIT(ARG)
++# ----------------------
++AC_DEFUN([_LT_AC_SHELL_INIT],
++[ifdef([AC_DIVERSION_NOTICE],
++ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
++ [AC_DIVERT_PUSH(NOTICE)])
++$1
++AC_DIVERT_POP
++])# _LT_AC_SHELL_INIT
- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
@@ -1420,9 +2285,6 @@
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
- fi
- AC_SUBST(MKINSTALLDIRS)
-+# Prevent multiple expansion
-+define([AC_PROG_LIBTOOL], [])
-+])# _AC_PROG_LIBTOOL
- dnl Generate list of files to be processed by xgettext which will
- dnl be included in po/Makefile.
@@ -1440,6 +2302,14 @@
- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
- < $srcdir/po/POTFILES.in > po/POTFILES
- ])
++# _LT_AC_PROG_ECHO_BACKSLASH
++# --------------------------
++# Add some code to the start of the generated configure script which
++# will find an echo command which doesn't interpret backslashes.
++AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
++[_LT_AC_SHELL_INIT([
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-# -------------------------------
@@ -1455,45 +2325,43 @@
-datarootdir=`eval echo "${datarootdir}"`
-if test "x$CATOBJEXT" = "x.mo" ; then
- localedir=`eval echo "${libdir}/locale"`
--else
++case X$ECHO in
++X*--fallback-echo)
++ # Remove one level of quotation (which was required for Make).
++ ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
++ ;;
++esac
++
++echo=${ECHO-echo}
++if test "X[$]1" = X--no-reexec; then
++ # Discard the --no-reexec flag, and continue.
++ shift
++elif test "X[$]1" = X--fallback-echo; then
++ # Avoid inline document here, it may be left over
++ :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
++ # Yippee, $echo works!
++ :
+ else
- localedir=`eval echo "${datadir}/locale"`
--fi
++ # Restart under the correct shell.
++ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+ fi
-prefix="$glib_save_prefix"
-exec_prefix="$glib_save_exec_prefix"
-datarootdir="$glib_save_datarootdir"
-AC_DEFINE_UNQUOTED($1, "$localedir",
- [Define the location where the catalogs will be installed])
-])
-+# AC_LIBTOOL_SETUP
-+# ----------------
-+AC_DEFUN([AC_LIBTOOL_SETUP],
-+[AC_PREREQ(2.50)dnl
-+AC_REQUIRE([AC_ENABLE_SHARED])dnl
-+AC_REQUIRE([AC_ENABLE_STATIC])dnl
-+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_PROG_LD])dnl
-+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-+AC_REQUIRE([AC_PROG_NM])dnl
-
-+AC_REQUIRE([AC_PROG_LN_S])dnl
-+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-+AC_REQUIRE([AC_OBJEXT])dnl
-+AC_REQUIRE([AC_EXEEXT])dnl
- dnl
+-
+-dnl
-dnl Now the definitions that aclocal will find
-dnl
-ifdef(glib_configure_in,[],[
-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
-])dnl
-+AC_LIBTOOL_SYS_MAX_CMD_LEN
-+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+AC_LIBTOOL_OBJDIR
-
+-
-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
-#
-# Create a temporary file with TEST-FILE as its contents and pass the
@@ -1509,234 +2377,310 @@
-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
-fi])
-+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+_LT_AC_PROG_ECHO_BACKSLASH
-
-+case $host_os in
-+aix3*)
-+ # AIX sometimes has problems with the GCC collect2 program. For some
-+ # reason, if we set the COLLECT_NAMES environment variable, the problems
-+ # vanish in a puff of smoke.
-+ if test "X${COLLECT_NAMES+set}" != Xset; then
-+ COLLECT_NAMES=
-+ export COLLECT_NAMES
-+ fi
-+ ;;
-+esac
-
--# Do all the work for Automake. -*- Autoconf -*-
-+# Sed substitution that helps us do robust quoting. It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e 1s/^X//'
-+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006, 2008 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# Same as above, but do not quote variable references.
-+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-
--# serial 13
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
--# This macro actually does too much. Some checks are only needed if
--# your package does certain things. But this isn't really a big deal.
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
-
--# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
--# AM_INIT_AUTOMAKE([OPTIONS])
--# -----------------------------------------------
--# The call with PACKAGE and VERSION arguments is the old style
--# call (pre autoconf-2.50), which is being phased out. PACKAGE
--# and VERSION should now be passed to AC_INIT and removed from
--# the call to AM_INIT_AUTOMAKE.
--# We support both call styles for the transition. After
--# the next Automake release, Autoconf can make the AC_INIT
--# arguments mandatory, and then we can depend on a new Autoconf
--# release and drop the old call support.
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_PREREQ([2.60])dnl
--dnl Autoconf wants to disallow AM_ names. We explicitly allow
--dnl the ones we care about.
--m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
--AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
--AC_REQUIRE([AC_PROG_INSTALL])dnl
--if test "`cd $srcdir && pwd`" != "`pwd`"; then
-- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-- # is not polluted with repeated "-I."
-- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-- # test to see if srcdir already configured
-- if test -f $srcdir/config.status; then
-- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+-
+-
+-# gnome-common.m4
+-#
+-
+-dnl GNOME_COMMON_INIT
+
+-AC_DEFUN([GNOME_COMMON_INIT],
+-[
+- dnl this macro should come after AC_CONFIG_MACRO_DIR
+- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
++if test "X[$]1" = X--fallback-echo; then
++ # used as fallback echo
++ shift
++ cat <<EOF
++[$]*
++EOF
++ exit 0
++fi
+
+- dnl ensure that when the Automake generated makefile calls aclocal,
+- dnl it honours the $ACLOCAL_FLAGS environment variable
+- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+- if test -n "$ac_macro_dir"; then
+- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
- fi
--fi
-+# Constants:
-+rm="rm -f"
-
--# test whether we have cygpath
--if test -z "$CYGPATH_W"; then
-- if (cygpath --version) >/dev/null 2>/dev/null; then
-- CYGPATH_W='cygpath -w'
-- else
-- CYGPATH_W=echo
-- fi
--fi
--AC_SUBST([CYGPATH_W])
-+# Global variables:
-+default_ofile=libtool
-+can_build_shared=yes
-
--# Define the identity of the package.
--dnl Distinguish between old-style and new-style calls.
--m4_ifval([$2],
--[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-- AC_SUBST([PACKAGE], [$1])dnl
-- AC_SUBST([VERSION], [$2])],
--[_AM_SET_OPTIONS([$1])dnl
--dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
--m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
-- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
-+ltmain="$ac_aux_dir/ltmain.sh"
-+ofile="$default_ofile"
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-
--_AM_IF_OPTION([no-define],,
--[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+- AC_SUBST([ACLOCAL_AMFLAGS])
+-])
++if test -z "$ECHO"; then
++if test "X${echo_test_string+set}" != Xset; then
++# find a string as large as possible, as long as the shell can cope with it
++ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++ if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++ echo_test_string=`eval $cmd` &&
++ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
++ then
++ break
++ fi
++ done
++fi
+
+-AC_DEFUN([GNOME_DEBUG_CHECK],
+-[
+- AC_ARG_ENABLE([debug],
+- AC_HELP_STRING([--enable-debug],
+- [turn on debugging]),,
+- [enable_debug=no])
++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ :
++else
++ # The Solaris, AIX, and Digital Unix default echo programs unquote
++ # backslashes. This makes it impossible to quote backslashes using
++ # echo "$something" | sed 's/\\/\\\\/g'
++ #
++ # So, first we look for a working echo in the user's PATH.
+
+- if test x$enable_debug = xyes ; then
+- AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
+- [Enable additional debugging at the expense of performance and size])
+- fi
+-])
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++ for dir in $PATH /usr/ucb; do
++ IFS="$lt_save_ifs"
++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ echo="$dir/echo"
++ break
++ fi
++ done
++ IFS="$lt_save_ifs"
+
+-dnl GNOME_MAINTAINER_MODE_DEFINES ()
+-dnl define DISABLE_DEPRECATED
+-dnl
+-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
+-[
+- AC_REQUIRE([AM_MAINTAINER_MODE])
-
--# Some tools Automake needs.
--AC_REQUIRE([AM_SANITY_CHECK])dnl
--AC_REQUIRE([AC_ARG_PROGRAM])dnl
--AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
--AM_MISSING_PROG(AUTOCONF, autoconf)
--AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
--AM_MISSING_PROG(AUTOHEADER, autoheader)
--AM_MISSING_PROG(MAKEINFO, makeinfo)
--AM_PROG_INSTALL_SH
--AM_PROG_INSTALL_STRIP
--AC_REQUIRE([AM_PROG_MKDIR_P])dnl
--# We need awk for the "check" target. The system "awk" is bad on
--# some platforms.
--AC_REQUIRE([AC_PROG_AWK])dnl
--AC_REQUIRE([AC_PROG_MAKE_SET])dnl
--AC_REQUIRE([AM_SET_LEADING_DOT])dnl
--_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-- [_AM_PROG_TAR([v7])])])
--_AM_IF_OPTION([no-dependencies],,
--[AC_PROVIDE_IFELSE([AC_PROG_CC],
-- [_AM_DEPENDENCIES(CC)],
-- [define([AC_PROG_CC],
-- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
--AC_PROVIDE_IFELSE([AC_PROG_CXX],
-- [_AM_DEPENDENCIES(CXX)],
-- [define([AC_PROG_CXX],
-- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
--AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-- [_AM_DEPENDENCIES(OBJC)],
-- [define([AC_PROG_OBJC],
-- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
--])
+- if test $USE_MAINTAINER_MODE = yes; then
+- DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED"
+- else
+- DISABLE_DEPRECATED=""
+- fi
+- AC_SUBST(DISABLE_DEPRECATED)
-])
-
+-dnl GNOME_COMPILE_WARNINGS
+-dnl Turn on many useful compiler warnings
+-dnl For now, only works on GCC
+-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
+- dnl ******************************
+- dnl More compiler warnings
+- dnl ******************************
-
--# When config.status generates a header, we must update the stamp-h file.
--# This file resides in the same directory as the config header
--# that is generated. The stamp files are numbered to have different names.
+- AC_ARG_ENABLE(compile-warnings,
+- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
+- [Turn on compiler warnings]),,
+- [enable_compile_warnings="m4_default([$1],[yes])"])
-
--# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
--# loop where config.status creates the headers, so we can generate
--# our stamp files there.
--AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
--[# Compute $1's index in $config_headers.
--_am_arg=$1
--_am_stamp_count=1
--for _am_header in $config_headers :; do
-- case $_am_header in
-- $_am_arg | $_am_arg:* )
-- break ;;
-- * )
-- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-- esac
--done
--echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+- warnCFLAGS=
+- if test "x$GCC" != xyes; then
+- enable_compile_warnings=no
+- fi
-
--# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
+- warning_flags=
+- realsave_CFLAGS="$CFLAGS"
++ if test "X$echo" = Xecho; then
++ # We didn't find a better echo, so look for alternatives.
++ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
++ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ # This shell has a builtin print -r that does the trick.
++ echo='print -r'
++ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
++ test "X$CONFIG_SHELL" != X/bin/ksh; then
++ # If we have ksh, try running configure again with it.
++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++ export ORIGINAL_CONFIG_SHELL
++ CONFIG_SHELL=/bin/ksh
++ export CONFIG_SHELL
++ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
++ else
++ # Try using printf.
++ echo='printf %s\n'
++ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ # Cool, printf works
++ :
++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++ test "X$echo_testing_string" = 'X\t' &&
++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++ export CONFIG_SHELL
++ SHELL="$CONFIG_SHELL"
++ export SHELL
++ echo="$CONFIG_SHELL [$]0 --fallback-echo"
++ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++ test "X$echo_testing_string" = 'X\t' &&
++ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ echo="$CONFIG_SHELL [$]0 --fallback-echo"
++ else
++ # maybe with a smaller string...
++ prev=:
+
+- case "$enable_compile_warnings" in
+- no)
+- warning_flags=
+- ;;
+- minimum)
+- warning_flags="-Wall"
+- ;;
+- yes)
+- warning_flags="-Wall -Wmissing-prototypes"
+- ;;
+- maximum|error)
+- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
+- CFLAGS="$warning_flags $CFLAGS"
+- for option in -Wno-sign-compare; do
+- SAVE_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS $option"
+- AC_MSG_CHECKING([whether gcc understands $option])
+- AC_TRY_COMPILE([], [],
+- has_option=yes,
+- has_option=no,)
+- CFLAGS="$SAVE_CFLAGS"
+- AC_MSG_RESULT($has_option)
+- if test $has_option = yes; then
+- warning_flags="$warning_flags $option"
+- fi
+- unset has_option
+- unset SAVE_CFLAGS
++ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
++ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
++ then
++ break
++ fi
++ prev="$cmd"
+ done
+- unset option
+- if test "$enable_compile_warnings" = "error" ; then
+- warning_flags="$warning_flags -Werror"
+- fi
+- ;;
+- *)
+- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
+- ;;
+- esac
+- CFLAGS="$realsave_CFLAGS"
+- AC_MSG_CHECKING(what warning flags to pass to the C compiler)
+- AC_MSG_RESULT($warning_flags)
+
+- AC_ARG_ENABLE(iso-c,
+- AC_HELP_STRING([--enable-iso-c],
+- [Try to warn if code is not ISO C ]),,
+- [enable_iso_c=no])
-
--# AM_PROG_INSTALL_SH
--# ------------------
--# Define $install_sh.
--AC_DEFUN([AM_PROG_INSTALL_SH],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
--AC_SUBST(install_sh)])
+- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
+- complCFLAGS=
+- if test "x$enable_iso_c" != "xno"; then
+- if test "x$GCC" = "xyes"; then
+- case " $CFLAGS " in
+- *[\ \ ]-ansi[\ \ ]*) ;;
+- *) complCFLAGS="$complCFLAGS -ansi" ;;
+- esac
+- case " $CFLAGS " in
+- *[\ \ ]-pedantic[\ \ ]*) ;;
+- *) complCFLAGS="$complCFLAGS -pedantic" ;;
+- esac
++ if test "$prev" != 'sed 50q "[$]0"'; then
++ echo_test_string=`eval $prev`
++ export echo_test_string
++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
++ else
++ # Oops. We lost completely, so just stick with echo.
++ echo=echo
+ fi
+- fi
+- AC_MSG_RESULT($complCFLAGS)
-
--# isc-posix.m4 serial 2 (gettext-0.11.2)
--dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
+- WARN_CFLAGS="$warning_flags $complCFLAGS"
+- AC_SUBST(WARN_CFLAGS)
+-])
-
--# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
+-dnl For C++, do basically the same thing.
-
--# This test replaces the one in autoconf.
--# Currently this macro should have the same name as the autoconf macro
--# because gettext's gettext.m4 (distributed in the automake package)
--# still uses it. Otherwise, the use in gettext.m4 makes autoheader
--# give these diagnostics:
--# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
--# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
+-AC_DEFUN([GNOME_CXX_WARNINGS],[
+- AC_ARG_ENABLE(cxx-warnings,
+- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
+- [Turn on compiler warnings.]),,
+- [enable_cxx_warnings="m4_default([$1],[minimum])"])
-
--undefine([AC_ISC_POSIX])
+- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
+- warnCXXFLAGS=
+- if test "x$GXX" != xyes; then
+- enable_cxx_warnings=no
+- fi
+- if test "x$enable_cxx_warnings" != "xno"; then
+- if test "x$GXX" = "xyes"; then
+- case " $CXXFLAGS " in
+- *[\ \ ]-Wall[\ \ ]*) ;;
+- *) warnCXXFLAGS="-Wall -Wno-unused" ;;
+- esac
-
--AC_DEFUN([AC_ISC_POSIX],
-- [
-- dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-- AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-- ]
--)
+- ## -W is not all that useful. And it cannot be controlled
+- ## with individual -Wno-xxx flags, unlike -Wall
+- if test "x$enable_cxx_warnings" = "xyes"; then
+- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
+ fi
+ fi
+ fi
+- AC_MSG_RESULT($warnCXXFLAGS)
-
--# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
+- AC_ARG_ENABLE(iso-cxx,
+- AC_HELP_STRING([--enable-iso-cxx],
+- [Try to warn if code is not ISO C++ ]),,
+- [enable_iso_cxx=no])
-
--# serial 2
+- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
+- complCXXFLAGS=
+- if test "x$enable_iso_cxx" != "xno"; then
+- if test "x$GXX" = "xyes"; then
+- case " $CXXFLAGS " in
+- *[\ \ ]-ansi[\ \ ]*) ;;
+- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
+- esac
-
--# Check whether the underlying file-system supports filenames
--# with a leading dot. For instance MS-DOS doesn't.
--AC_DEFUN([AM_SET_LEADING_DOT],
--[rm -rf .tst 2>/dev/null
--mkdir .tst 2>/dev/null
--if test -d .tst; then
-- am__leading_dot=.
--else
-- am__leading_dot=_
--fi
--rmdir .tst 2>/dev/null
--AC_SUBST([am__leading_dot])])
+- case " $CXXFLAGS " in
+- *[\ \ ]-pedantic[\ \ ]*) ;;
+- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
+- esac
+- fi
+- fi
+- AC_MSG_RESULT($complCXXFLAGS)
+-
+- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
+- AC_SUBST(WARN_CXXFLAGS)
+-])
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
-# serial 52 AC_PROG_LIBTOOL
--
--
++fi
++fi
+
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++ECHO=$echo
++if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
++ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
++fi
+
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
@@ -1745,8 +2689,10 @@
- [m4_define([AC_PROVIDE_IFELSE],
- [m4_ifdef([AC_PROVIDE_$1],
- [$2], [$3])])])
--
--
++AC_SUBST(ECHO)
++])])# _LT_AC_PROG_ECHO_BACKSLASH
+
+
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
@@ -1762,7 +2708,14 @@
- [AC_LIBTOOL_F77],
- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
--
++# _LT_AC_LOCK
++# -----------
++AC_DEFUN([_LT_AC_LOCK],
++[AC_ARG_ENABLE([libtool-lock],
++ [AC_HELP_STRING([--disable-libtool-lock],
++ [avoid locking (might break parallel builds)])])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
@@ -1825,10 +2778,108 @@
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
--
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++ia64-*-hpux*)
++ # Find out which ABI we are using.
++ echo 'int i;' > conftest.$ac_ext
++ if AC_TRY_EVAL(ac_compile); then
++ case `/usr/bin/file conftest.$ac_objext` in
++ *ELF-32*)
++ HPUX_IA64_MODE="32"
++ ;;
++ *ELF-64*)
++ HPUX_IA64_MODE="64"
++ ;;
++ esac
++ fi
++ rm -rf conftest*
++ ;;
++*-*-irix6*)
++ # Find out which ABI we are using.
++ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
++ if AC_TRY_EVAL(ac_compile); then
++ if test "$lt_cv_prog_gnu_ld" = yes; then
++ case `/usr/bin/file conftest.$ac_objext` in
++ *32-bit*)
++ LD="${LD-ld} -melf32bsmip"
++ ;;
++ *N32*)
++ LD="${LD-ld} -melf32bmipn32"
++ ;;
++ *64-bit*)
++ LD="${LD-ld} -melf64bmip"
++ ;;
++ esac
++ else
++ case `/usr/bin/file conftest.$ac_objext` in
++ *32-bit*)
++ LD="${LD-ld} -32"
++ ;;
++ *N32*)
++ LD="${LD-ld} -n32"
++ ;;
++ *64-bit*)
++ LD="${LD-ld} -64"
++ ;;
++ esac
++ fi
++ fi
++ rm -rf conftest*
++ ;;
+
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
--
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
++ # Find out which ABI we are using.
++ echo 'int i;' > conftest.$ac_ext
++ if AC_TRY_EVAL(ac_compile); then
++ case `/usr/bin/file conftest.o` in
++ *32-bit*)
++ case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_i386_fbsd"
++ ;;
++ x86_64-*linux*)
++ LD="${LD-ld} -m elf_i386"
++ ;;
++ ppc64-*linux*|powerpc64-*linux*)
++ LD="${LD-ld} -m elf32ppclinux"
++ ;;
++ s390x-*linux*)
++ LD="${LD-ld} -m elf_s390"
++ ;;
++ sparc64-*linux*)
++ LD="${LD-ld} -m elf32_sparc"
++ ;;
++ esac
++ ;;
++ *64-bit*)
++ case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_x86_64_fbsd"
++ ;;
++ x86_64-*linux*)
++ LD="${LD-ld} -m elf_x86_64"
++ ;;
++ ppc*-*linux*|powerpc*-*linux*)
++ LD="${LD-ld} -m elf64ppc"
++ ;;
++ s390*-*linux*)
++ LD="${LD-ld} -m elf64_s390"
++ ;;
++ sparc*-*linux*)
++ LD="${LD-ld} -m elf64_sparc"
++ ;;
++ esac
++ ;;
++ esac
++ fi
++ rm -rf conftest*
++ ;;
+
-case $host_os in
-aix3*)
- # AIX sometimes has problems with the GCC collect2 program. For some
@@ -1837,28 +2888,110 @@
- if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
-- fi
-- ;;
--esac
--
++*-*-sco3.2v5*)
++ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++ SAVE_CFLAGS="$CFLAGS"
++ CFLAGS="$CFLAGS -belf"
++ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
++ [AC_LANG_PUSH(C)
++ AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
++ AC_LANG_POP])
++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++ CFLAGS="$SAVE_CFLAGS"
++ fi
++ ;;
++sparc*-*solaris*)
++ # Find out which ABI we are using.
++ echo 'int i;' > conftest.$ac_ext
++ if AC_TRY_EVAL(ac_compile); then
++ case `/usr/bin/file conftest.o` in
++ *64-bit*)
++ case $lt_cv_prog_gnu_ld in
++ yes*) LD="${LD-ld} -m elf64_sparc" ;;
++ *)
++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++ LD="${LD-ld} -64"
++ fi
++ ;;
++ esac
++ ;;
++ esac
+ fi
++ rm -rf conftest*
++ ;;
++
++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
++[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
++ AC_CHECK_TOOL(AS, as, false)
++ AC_CHECK_TOOL(OBJDUMP, objdump, false)
+ ;;
++ ])
+ esac
+
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
--
++need_locks="$enable_libtool_lock"
+
-# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
--
++])# _LT_AC_LOCK
+
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
--
+
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
--
++# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
++# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
++# ----------------------------------------------------------------
++# Check whether the given compiler option works
++AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
++[AC_REQUIRE([LT_AC_PROG_SED])
++AC_CACHE_CHECK([$1], [$2],
++ [$2=no
++ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++ lt_compiler_flag="$3"
++ # Insert the option either (1) after the last *FLAGS variable, or
++ # (2) before a word containing "conftest.", or (3) at the end.
++ # Note that $ac_compile itself does not contain backslashes and begins
++ # with a dollar sign (not a hyphen), so the echo should work correctly.
++ # The option is referenced via a variable to avoid confusing sed.
++ lt_compile=`echo "$ac_compile" | $SED \
++ -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++ (eval "$lt_compile" 2>conftest.err)
++ ac_status=$?
++ cat conftest.err >&AS_MESSAGE_LOG_FD
++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++ 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.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
++ $2=yes
++ fi
++ fi
++ $rm conftest*
++])
+
-# Constants:
-rm="rm -f"
--
++if test x"[$]$2" = xyes; then
++ ifelse([$5], , :, [$5])
++else
++ ifelse([$6], , :, [$6])
++fi
++])# AC_LIBTOOL_COMPILER_OPTION
+
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
@@ -1869,20 +3002,1814 @@
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
--
+
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-+AC_CHECK_TOOL(AR, ar, false)
-+AC_CHECK_TOOL(RANLIB, ranlib, :)
-+AC_CHECK_TOOL(STRIP, strip, :)
-
- old_CC="$CC"
- old_CFLAGS="$CFLAGS"
-@@ -2733,6 +2386,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
++# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
++# [ACTION-SUCCESS], [ACTION-FAILURE])
++# ------------------------------------------------------------
++# Check whether the given compiler option works
++AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
++ [$2=no
++ save_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS $3"
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
++ 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
++ if test -s conftest.err; then
++ # Append any errors to the config.log.
++ cat conftest.err 1>&AS_MESSAGE_LOG_FD
++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ $2=yes
++ fi
++ else
++ $2=yes
++ fi
++ fi
++ $rm -r conftest*
++ LDFLAGS="$save_LDFLAGS"
++])
+
+-old_CC="$CC"
+-old_CFLAGS="$CFLAGS"
++if test x"[$]$2" = xyes; then
++ ifelse([$4], , :, [$4])
++else
++ ifelse([$5], , :, [$5])
++fi
++])# AC_LIBTOOL_LINKER_OPTION
+
+-# Set sane defaults for various variables
+-test -z "$AR" && AR=ar
+-test -z "$AR_FLAGS" && AR_FLAGS=cru
+-test -z "$AS" && AS=as
+-test -z "$CC" && CC=cc
+-test -z "$LTCC" && LTCC=$CC
+-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+-test -z "$DLLTOOL" && DLLTOOL=dlltool
+-test -z "$LD" && LD=ld
+-test -z "$LN_S" && LN_S="ln -s"
+-test -z "$MAGIC_CMD" && MAGIC_CMD=file
+-test -z "$NM" && NM=nm
+-test -z "$SED" && SED=sed
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-test -z "$RANLIB" && RANLIB=:
+-test -z "$STRIP" && STRIP=:
+-test -z "$ac_objext" && ac_objext=o
+
+-# Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+-old_postinstall_cmds='chmod 644 $oldlib'
+-old_postuninstall_cmds=
++# AC_LIBTOOL_SYS_MAX_CMD_LEN
++# --------------------------
++AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
++[# find the maximum length of command line arguments
++AC_MSG_CHECKING([the maximum length of command line arguments])
++AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
++ i=0
++ teststring="ABCD"
+
+-if test -n "$RANLIB"; then
+- case $host_os in
+- openbsd*)
+- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++ case $build_os in
++ msdosdjgpp*)
++ # On DJGPP, this test can blow up pretty badly due to problems in libc
++ # (any single argument exceeding 2000 bytes causes a buffer overrun
++ # during glob expansion). Even if it were fixed, the result of this
++ # check would be larger than it should be.
++ lt_cv_sys_max_cmd_len=12288; # 12K is about right
+ ;;
+- *)
+- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
++
++ gnu*)
++ # Under GNU Hurd, this test is not required because there is
++ # no limit to the length of command line arguments.
++ # Libtool will interpret -1 as no limit whatsoever
++ lt_cv_sys_max_cmd_len=-1;
+ ;;
+- esac
+- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+-fi
+
+-_LT_CC_BASENAME([$compiler])
++ cygwin* | mingw*)
++ # On Win9x/ME, this test blows up -- it succeeds, but takes
++ # about 5 minutes as the teststring grows exponentially.
++ # Worse, since 9x/ME are not pre-emptively multitasking,
++ # you end up with a "frozen" computer, even though with patience
++ # the test eventually succeeds (with a max line length of 256k).
++ # Instead, let's just punt: use the minimum linelength reported by
++ # all of the supported platforms: 8192 (on NT/2K/XP).
++ lt_cv_sys_max_cmd_len=8192;
++ ;;
+
+-# Only perform the check for file, if the check method requires it
+-case $deplibs_check_method in
+-file_magic*)
+- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+- AC_PATH_MAGIC
+- fi
+- ;;
+-esac
++ amigaos*)
++ # On AmigaOS with pdksh, this test takes hours, literally.
++ # So we just punt and use a minimum line length of 8192.
++ lt_cv_sys_max_cmd_len=8192;
++ ;;
+
+-_LT_REQUIRED_DARWIN_CHECKS
++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++ # This has been around since 386BSD, at least. Likely further.
++ if test -x /sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++ elif test -x /usr/sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++ else
++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
++ fi
++ # And add a safety zone
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ ;;
+
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-enable_win32_dll=yes, enable_win32_dll=no)
++ interix*)
++ # We know the value 262144 and hardcode it with a safety zone (like BSD)
++ lt_cv_sys_max_cmd_len=196608
++ ;;
+
+-AC_ARG_ENABLE([libtool-lock],
+- [AC_HELP_STRING([--disable-libtool-lock],
+- [avoid locking (might break parallel builds)])])
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++ osf*)
++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++ # nice to cause kernel panics so lets avoid the loop below.
++ # First set a reasonable default.
++ lt_cv_sys_max_cmd_len=16384
++ #
++ if test -x /sbin/sysconfig; then
++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++ *1*) lt_cv_sys_max_cmd_len=-1 ;;
++ esac
++ fi
++ ;;
++ sco3.2v5*)
++ lt_cv_sys_max_cmd_len=102400
++ ;;
++ sysv5* | sco5v6* | sysv4.2uw2*)
++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++ if test -n "$kargmax"; then
++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
++ else
++ lt_cv_sys_max_cmd_len=32768
++ fi
++ ;;
++ *)
++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++ if test -n "$lt_cv_sys_max_cmd_len"; then
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ else
++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++ = "XX$teststring") >/dev/null 2>&1 &&
++ new_result=`expr "X$teststring" : ".*" 2>&1` &&
++ lt_cv_sys_max_cmd_len=$new_result &&
++ test $i != 17 # 1/2 MB should be enough
++ do
++ i=`expr $i + 1`
++ teststring=$teststring$teststring
++ done
++ teststring=
++ # Add a significant safety factor because C++ compilers can tack on massive
++ # amounts of additional arguments before passing them to the linker.
++ # It appears as though 1/2 is a usable value.
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ fi
++ ;;
++ esac
++])
++if test -n $lt_cv_sys_max_cmd_len ; then
++ AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
++else
++ AC_MSG_RESULT(none)
++fi
++])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+
+-AC_ARG_WITH([pic],
+- [AC_HELP_STRING([--with-pic],
+- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+- [pic_mode="$withval"],
+- [pic_mode=default])
+-test -z "$pic_mode" && pic_mode=default
+
+-# Use C for the default configuration in the libtool script
+-tagname=
+-AC_LIBTOOL_LANG_C_CONFIG
+-_LT_AC_TAGCONFIG
+-])# AC_LIBTOOL_SETUP
++# _LT_AC_CHECK_DLFCN
++# ------------------
++AC_DEFUN([_LT_AC_CHECK_DLFCN],
++[AC_CHECK_HEADERS(dlfcn.h)dnl
++])# _LT_AC_CHECK_DLFCN
+
+
+-# _LT_AC_SYS_COMPILER
+-# -------------------
+-AC_DEFUN([_LT_AC_SYS_COMPILER],
+-[AC_REQUIRE([AC_PROG_CC])dnl
++# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
++# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
++# ---------------------------------------------------------------------
++AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++if test "$cross_compiling" = yes; then :
++ [$4]
++else
++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++ lt_status=$lt_dlunknown
++ cat > conftest.$ac_ext <<EOF
++[#line __oline__ "configure"
++#include "confdefs.h"
+
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
+
+-# If no C compiler flags were specified, use CFLAGS.
+-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++#include <stdio.h>
+
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
+-])# _LT_AC_SYS_COMPILER
++#ifdef RTLD_GLOBAL
++# define LT_DLGLOBAL RTLD_GLOBAL
++#else
++# ifdef DL_GLOBAL
++# define LT_DLGLOBAL DL_GLOBAL
++# else
++# define LT_DLGLOBAL 0
++# endif
++#endif
+
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++ find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++# ifdef RTLD_LAZY
++# define LT_DLLAZY_OR_NOW RTLD_LAZY
++# else
++# ifdef DL_LAZY
++# define LT_DLLAZY_OR_NOW DL_LAZY
++# else
++# ifdef RTLD_NOW
++# define LT_DLLAZY_OR_NOW RTLD_NOW
++# else
++# ifdef DL_NOW
++# define LT_DLLAZY_OR_NOW DL_NOW
++# else
++# define LT_DLLAZY_OR_NOW 0
++# endif
++# endif
++# endif
++# endif
++#endif
+
+-# _LT_CC_BASENAME(CC)
+-# -------------------
+-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+-AC_DEFUN([_LT_CC_BASENAME],
+-[for cc_temp in $1""; do
+- case $cc_temp in
+- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+- \-*) ;;
+- *) break;;
+- esac
+-done
+-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+-])
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
+
++void fnord() { int i=42;}
++int main ()
++{
++ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++ int status = $lt_dlunknown;
+
+-# _LT_COMPILER_BOILERPLATE
+-# ------------------------
+-# Check for compiler boilerplate output or warnings with
+-# the simple compiler test code.
+-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+-[AC_REQUIRE([LT_AC_PROG_SED])dnl
+-ac_outfile=conftest.$ac_objext
+-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_compiler_boilerplate=`cat conftest.err`
+-$rm conftest*
+-])# _LT_COMPILER_BOILERPLATE
++ if (self)
++ {
++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++ /* dlclose (self); */
++ }
++ else
++ puts (dlerror ());
++
++ exit (status);
++}]
++EOF
++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
++ lt_status=$?
++ case x$lt_status in
++ x$lt_dlno_uscore) $1 ;;
++ x$lt_dlneed_uscore) $2 ;;
++ x$lt_dlunknown|x*) $3 ;;
++ esac
++ else :
++ # compilation failed
++ $3
++ fi
++fi
++rm -fr conftest*
++])# _LT_AC_TRY_DLOPEN_SELF
+
+
+-# _LT_LINKER_BOILERPLATE
++# AC_LIBTOOL_DLOPEN_SELF
+ # ----------------------
+-# Check for linker boilerplate output or warnings with
+-# the simple link test code.
+-AC_DEFUN([_LT_LINKER_BOILERPLATE],
+-[AC_REQUIRE([LT_AC_PROG_SED])dnl
+-ac_outfile=conftest.$ac_objext
+-echo "$lt_simple_link_test_code" >conftest.$ac_ext
+-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_linker_boilerplate=`cat conftest.err`
+-$rm -r conftest*
+-])# _LT_LINKER_BOILERPLATE
++AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++if test "x$enable_dlopen" != xyes; then
++ enable_dlopen=unknown
++ enable_dlopen_self=unknown
++ enable_dlopen_self_static=unknown
++else
++ lt_cv_dlopen=no
++ lt_cv_dlopen_libs=
+
+-# _LT_REQUIRED_DARWIN_CHECKS
+-# --------------------------
+-# Check for some things on darwin
+-AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+ case $host_os in
+- rhapsody* | darwin*)
+- AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+- AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
++ beos*)
++ lt_cv_dlopen="load_add_on"
++ lt_cv_dlopen_libs=
++ lt_cv_dlopen_self=yes
++ ;;
+
+- AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+- [lt_cv_apple_cc_single_mod=no
+- if test -z "${LT_MULTI_MODULE}"; then
+- # By default we will add the -single_module flag. You can override
+- # by either setting the environment variable LT_MULTI_MODULE
+- # non-empty at configure time, or by adding -multi_module to the
+- # link flags.
+- echo "int foo(void){return 1;}" > conftest.c
+- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+- -dynamiclib ${wl}-single_module conftest.c
+- if test -f libconftest.dylib; then
+- lt_cv_apple_cc_single_mod=yes
+- rm -rf libconftest.dylib*
+- fi
+- rm conftest.c
+- fi])
+- AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+- [lt_cv_ld_exported_symbols_list],
+- [lt_cv_ld_exported_symbols_list=no
+- save_LDFLAGS=$LDFLAGS
+- echo "_main" > conftest.sym
+- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+- [lt_cv_ld_exported_symbols_list=yes],
+- [lt_cv_ld_exported_symbols_list=no])
+- LDFLAGS="$save_LDFLAGS"
++ mingw* | pw32*)
++ lt_cv_dlopen="LoadLibrary"
++ lt_cv_dlopen_libs=
++ ;;
++
++ cygwin*)
++ lt_cv_dlopen="dlopen"
++ lt_cv_dlopen_libs=
++ ;;
++
++ darwin*)
++ # if libdl is installed we need to link against it
++ AC_CHECK_LIB([dl], [dlopen],
++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
++ lt_cv_dlopen="dyld"
++ lt_cv_dlopen_libs=
++ lt_cv_dlopen_self=yes
+ ])
+- case $host_os in
+- rhapsody* | darwin1.[[0123]])
+- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+- darwin1.*)
+- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+- darwin*)
+- # if running on 10.5 or later, the deployment target defaults
+- # to the OS version, if on x86, and 10.4, the deployment
+- # target defaults to 10.4. Don't you love it?
+- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+- 10.[[012]]*)
+- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+- 10.*)
+- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+- esac
+- ;;
+- esac
+- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+- _lt_dar_single_mod='$single_module'
+- fi
+- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+- else
+- _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+- fi
+- if test "$DSYMUTIL" != ":"; then
+- _lt_dsymutil="~$DSYMUTIL \$lib || :"
+- else
+- _lt_dsymutil=
+- fi
++ ;;
++
++ *)
++ AC_CHECK_FUNC([shl_load],
++ [lt_cv_dlopen="shl_load"],
++ [AC_CHECK_LIB([dld], [shl_load],
++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
++ [AC_CHECK_FUNC([dlopen],
++ [lt_cv_dlopen="dlopen"],
++ [AC_CHECK_LIB([dl], [dlopen],
++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++ [AC_CHECK_LIB([svld], [dlopen],
++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++ [AC_CHECK_LIB([dld], [dld_link],
++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
++ ])
++ ])
++ ])
++ ])
++ ])
+ ;;
+ esac
+-])
+
+-# _LT_AC_SYS_LIBPATH_AIX
+-# ----------------------
+-# Links a minimal program and checks the executable
+-# for the system default hardcoded library path. In most cases,
+-# this is /usr/lib:/lib, but when the MPI compilers are used
+-# the location of the communication and MPI libs are included too.
+-# If we don't find anything, use the default library path according
+-# to the aix ld manual.
+-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+-[AC_REQUIRE([LT_AC_PROG_SED])dnl
+-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+-lt_aix_libpath_sed='
+- /Import File Strings/,/^$/ {
+- /^0/ {
+- s/^0 *\(.*\)$/\1/
+- p
+- }
+- }'
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then
+- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-fi],[])
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+-])# _LT_AC_SYS_LIBPATH_AIX
++ if test "x$lt_cv_dlopen" != xno; then
++ enable_dlopen=yes
++ else
++ enable_dlopen=no
++ fi
+
++ case $lt_cv_dlopen in
++ dlopen)
++ save_CPPFLAGS="$CPPFLAGS"
++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+-# _LT_AC_SHELL_INIT(ARG)
+-# ----------------------
+-AC_DEFUN([_LT_AC_SHELL_INIT],
+-[ifdef([AC_DIVERSION_NOTICE],
+- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+- [AC_DIVERT_PUSH(NOTICE)])
+-$1
+-AC_DIVERT_POP
+-])# _LT_AC_SHELL_INIT
++ save_LDFLAGS="$LDFLAGS"
++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
++ save_LIBS="$LIBS"
++ LIBS="$lt_cv_dlopen_libs $LIBS"
+
+-# _LT_AC_PROG_ECHO_BACKSLASH
+-# --------------------------
+-# Add some code to the start of the generated configure script which
+-# will find an echo command which doesn't interpret backslashes.
+-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+-[_LT_AC_SHELL_INIT([
+-# Check that we are running under the correct shell.
+-SHELL=${CONFIG_SHELL-/bin/sh}
+-
+-case X$ECHO in
+-X*--fallback-echo)
+- # Remove one level of quotation (which was required for Make).
+- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+- ;;
+-esac
++ AC_CACHE_CHECK([whether a program can dlopen itself],
++ lt_cv_dlopen_self, [dnl
++ _LT_AC_TRY_DLOPEN_SELF(
++ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
++ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
++ ])
+
+-echo=${ECHO-echo}
+-if test "X[$]1" = X--no-reexec; then
+- # Discard the --no-reexec flag, and continue.
+- shift
+-elif test "X[$]1" = X--fallback-echo; then
+- # Avoid inline document here, it may be left over
+- :
+-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+- # Yippee, $echo works!
+- :
+-else
+- # Restart under the correct shell.
+- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+-fi
++ if test "x$lt_cv_dlopen_self" = xyes; then
++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
++ AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
++ lt_cv_dlopen_self_static, [dnl
++ _LT_AC_TRY_DLOPEN_SELF(
++ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
++ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
++ ])
++ fi
+
+-if test "X[$]1" = X--fallback-echo; then
+- # used as fallback echo
+- shift
+- cat <<EOF
+-[$]*
+-EOF
+- exit 0
+-fi
++ CPPFLAGS="$save_CPPFLAGS"
++ LDFLAGS="$save_LDFLAGS"
++ LIBS="$save_LIBS"
++ ;;
++ esac
+
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++ case $lt_cv_dlopen_self in
++ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++ *) enable_dlopen_self=unknown ;;
++ esac
+
+-if test -z "$ECHO"; then
+-if test "X${echo_test_string+set}" != Xset; then
+-# find a string as large as possible, as long as the shell can cope with it
+- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+- if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+- echo_test_string=`eval $cmd` &&
+- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+- then
+- break
+- fi
+- done
++ case $lt_cv_dlopen_self_static in
++ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++ *) enable_dlopen_self_static=unknown ;;
++ esac
+ fi
++])# AC_LIBTOOL_DLOPEN_SELF
+
+-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- :
+-else
+- # The Solaris, AIX, and Digital Unix default echo programs unquote
+- # backslashes. This makes it impossible to quote backslashes using
+- # echo "$something" | sed 's/\\/\\\\/g'
+- #
+- # So, first we look for a working echo in the user's PATH.
+
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- for dir in $PATH /usr/ucb; do
+- IFS="$lt_save_ifs"
+- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- echo="$dir/echo"
+- break
+- fi
+- done
+- IFS="$lt_save_ifs"
++# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
++# ---------------------------------
++# Check to see if options -c and -o are simultaneously supported by compiler
++AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
++ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
++ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
++ $rm -r conftest 2>/dev/null
++ mkdir conftest
++ cd conftest
++ mkdir out
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+- if test "X$echo" = Xecho; then
+- # We didn't find a better echo, so look for alternatives.
+- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- # This shell has a builtin print -r that does the trick.
+- echo='print -r'
+- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+- test "X$CONFIG_SHELL" != X/bin/ksh; then
+- # If we have ksh, try running configure again with it.
+- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+- export ORIGINAL_CONFIG_SHELL
+- CONFIG_SHELL=/bin/ksh
+- export CONFIG_SHELL
+- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+- else
+- # Try using printf.
+- echo='printf %s\n'
+- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- # Cool, printf works
+- :
+- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+- test "X$echo_testing_string" = 'X\t' &&
+- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+- export CONFIG_SHELL
+- SHELL="$CONFIG_SHELL"
+- export SHELL
+- echo="$CONFIG_SHELL [$]0 --fallback-echo"
+- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+- test "X$echo_testing_string" = 'X\t' &&
+- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- echo="$CONFIG_SHELL [$]0 --fallback-echo"
+- else
+- # maybe with a smaller string...
+- prev=:
++ lt_compiler_flag="-o out/conftest2.$ac_objext"
++ # Insert the option either (1) after the last *FLAGS variable, or
++ # (2) before a word containing "conftest.", or (3) at the end.
++ # Note that $ac_compile itself does not contain backslashes and begins
++ # with a dollar sign (not a hyphen), so the echo should work correctly.
++ lt_compile=`echo "$ac_compile" | $SED \
++ -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++ (eval "$lt_compile" 2>out/conftest.err)
++ ac_status=$?
++ cat out/conftest.err >&AS_MESSAGE_LOG_FD
++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++ if (exit $ac_status) && test -s out/conftest2.$ac_objext
++ then
++ # The compiler can only warn and ignore the option if not recognized
++ # So say no if there are warnings
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++ fi
++ fi
++ chmod u+w . 2>&AS_MESSAGE_LOG_FD
++ $rm conftest*
++ # SGI C++ compiler will create directory out/ii_files/ for
++ # template instantiation
++ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++ $rm out/* && rmdir out
++ cd ..
++ rmdir conftest
++ $rm conftest*
++])
++])# AC_LIBTOOL_PROG_CC_C_O
+
+- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+- then
+- break
+- fi
+- prev="$cmd"
+- done
+
+- if test "$prev" != 'sed 50q "[$]0"'; then
+- echo_test_string=`eval $prev`
+- export echo_test_string
+- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+- else
+- # Oops. We lost completely, so just stick with echo.
+- echo=echo
+- fi
+- fi
+- fi
++# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
++# -----------------------------------------
++# Check to see if we can do hard links to lock some files if needed
++AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
++[AC_REQUIRE([_LT_AC_LOCK])dnl
++
++hard_links="nottested"
++if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
++ # do not overwrite the value of need_locks provided by the user
++ AC_MSG_CHECKING([if we can lock with hard links])
++ hard_links=yes
++ $rm conftest*
++ ln conftest.a conftest.b 2>/dev/null && hard_links=no
++ touch conftest.a
++ ln conftest.a conftest.b 2>&5 || hard_links=no
++ ln conftest.a conftest.b 2>/dev/null && hard_links=no
++ AC_MSG_RESULT([$hard_links])
++ if test "$hard_links" = no; then
++ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
++ need_locks=warn
+ fi
++else
++ need_locks=no
+ fi
+-fi
++])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+
+-# Copy echo and quote the copy suitably for passing to libtool from
+-# the Makefile, instead of quoting the original, which is used later.
+-ECHO=$echo
+-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
++
++# AC_LIBTOOL_OBJDIR
++# -----------------
++AC_DEFUN([AC_LIBTOOL_OBJDIR],
++[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
++[rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++ lt_cv_objdir=.libs
++else
++ # MS-DOS does not allow filenames that begin with a dot.
++ lt_cv_objdir=_libs
+ fi
++rmdir .libs 2>/dev/null])
++objdir=$lt_cv_objdir
++])# AC_LIBTOOL_OBJDIR
+
+-AC_SUBST(ECHO)
+-])])# _LT_AC_PROG_ECHO_BACKSLASH
+-
+-
+-# _LT_AC_LOCK
+-# -----------
+-AC_DEFUN([_LT_AC_LOCK],
+-[AC_ARG_ENABLE([libtool-lock],
+- [AC_HELP_STRING([--disable-libtool-lock],
+- [avoid locking (might break parallel builds)])])
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+-
+-# Some flags need to be propagated to the compiler or linker for good
+-# libtool support.
+-case $host in
+-ia64-*-hpux*)
+- # Find out which ABI we are using.
+- echo 'int i;' > conftest.$ac_ext
+- if AC_TRY_EVAL(ac_compile); then
+- case `/usr/bin/file conftest.$ac_objext` in
+- *ELF-32*)
+- HPUX_IA64_MODE="32"
+- ;;
+- *ELF-64*)
+- HPUX_IA64_MODE="64"
+- ;;
+- esac
+- fi
+- rm -rf conftest*
+- ;;
+-*-*-irix6*)
+- # Find out which ABI we are using.
+- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+- if AC_TRY_EVAL(ac_compile); then
+- if test "$lt_cv_prog_gnu_ld" = yes; then
+- case `/usr/bin/file conftest.$ac_objext` in
+- *32-bit*)
+- LD="${LD-ld} -melf32bsmip"
+- ;;
+- *N32*)
+- LD="${LD-ld} -melf32bmipn32"
+- ;;
+- *64-bit*)
+- LD="${LD-ld} -melf64bmip"
+- ;;
+- esac
+- else
+- case `/usr/bin/file conftest.$ac_objext` in
+- *32-bit*)
+- LD="${LD-ld} -32"
+- ;;
+- *N32*)
+- LD="${LD-ld} -n32"
+- ;;
+- *64-bit*)
+- LD="${LD-ld} -64"
+- ;;
+- esac
+- fi
+- fi
+- rm -rf conftest*
+- ;;
+
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+-s390*-*linux*|sparc*-*linux*)
+- # Find out which ABI we are using.
+- echo 'int i;' > conftest.$ac_ext
+- if AC_TRY_EVAL(ac_compile); then
+- case `/usr/bin/file conftest.o` in
+- *32-bit*)
+- case $host in
+- x86_64-*kfreebsd*-gnu)
+- LD="${LD-ld} -m elf_i386_fbsd"
+- ;;
+- x86_64-*linux*)
+- LD="${LD-ld} -m elf_i386"
+- ;;
+- ppc64-*linux*|powerpc64-*linux*)
+- LD="${LD-ld} -m elf32ppclinux"
+- ;;
+- s390x-*linux*)
+- LD="${LD-ld} -m elf_s390"
+- ;;
+- sparc64-*linux*)
+- LD="${LD-ld} -m elf32_sparc"
+- ;;
+- esac
+- ;;
+- *64-bit*)
+- libsuff=64
+- case $host in
+- x86_64-*kfreebsd*-gnu)
+- LD="${LD-ld} -m elf_x86_64_fbsd"
+- ;;
+- x86_64-*linux*)
+- LD="${LD-ld} -m elf_x86_64"
+- ;;
+- ppc*-*linux*|powerpc*-*linux*)
+- LD="${LD-ld} -m elf64ppc"
+- ;;
+- s390*-*linux*)
+- LD="${LD-ld} -m elf64_s390"
+- ;;
+- sparc*-*linux*)
+- LD="${LD-ld} -m elf64_sparc"
+- ;;
+- esac
+- ;;
+- esac
+- fi
+- rm -rf conftest*
+- ;;
++# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
++# ----------------------------------------------
++# Check hardcoding attributes.
++AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
++[AC_MSG_CHECKING([how to hardcode library paths into programs])
++_LT_AC_TAGVAR(hardcode_action, $1)=
++if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
++ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+-*-*-sco3.2v5*)
+- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+- SAVE_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -belf"
+- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+- [AC_LANG_PUSH(C)
+- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+- AC_LANG_POP])
+- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+- CFLAGS="$SAVE_CFLAGS"
+- fi
+- ;;
+-sparc*-*solaris*)
+- # Find out which ABI we are using.
+- echo 'int i;' > conftest.$ac_ext
+- if AC_TRY_EVAL(ac_compile); then
+- case `/usr/bin/file conftest.o` in
+- *64-bit*)
+- case $lt_cv_prog_gnu_ld in
+- yes*) LD="${LD-ld} -m elf64_sparc" ;;
+- *)
+- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+- LD="${LD-ld} -64"
+- fi
+- ;;
+- esac
+- ;;
+- esac
++ # We can hardcode non-existant directories.
++ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
++ # If the only mechanism to avoid hardcoding is shlibpath_var, we
++ # have to relink, otherwise we might link with an installed library
++ # when we should be linking with a yet-to-be-installed one
++ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
++ test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
++ # Linking always hardcodes the temporary library directory.
++ _LT_AC_TAGVAR(hardcode_action, $1)=relink
++ else
++ # We can link without hardcoding, and we can hardcode nonexisting dirs.
++ _LT_AC_TAGVAR(hardcode_action, $1)=immediate
+ fi
+- rm -rf conftest*
+- ;;
+-
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+- AC_CHECK_TOOL(AS, as, false)
+- AC_CHECK_TOOL(OBJDUMP, objdump, false)
+- ;;
+- ])
+-esac
+-
+-need_locks="$enable_libtool_lock"
+-
+-])# _LT_AC_LOCK
++else
++ # We cannot hardcode anything, or else we can only hardcode existing
++ # directories.
++ _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
++fi
++AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+
++if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
++ # Fast installation is not supported
++ enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++ test "$enable_shared" = no; then
++ # Fast installation is not necessary
++ enable_fast_install=needless
++fi
++])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
+
+-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+-# ----------------------------------------------------------------
+-# Check whether the given compiler option works
+-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+-[AC_REQUIRE([LT_AC_PROG_SED])
+-AC_CACHE_CHECK([$1], [$2],
+- [$2=no
+- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+- lt_compiler_flag="$3"
+- # Insert the option either (1) after the last *FLAGS variable, or
+- # (2) before a word containing "conftest.", or (3) at the end.
+- # Note that $ac_compile itself does not contain backslashes and begins
+- # with a dollar sign (not a hyphen), so the echo should work correctly.
+- # The option is referenced via a variable to avoid confusing sed.
+- lt_compile=`echo "$ac_compile" | $SED \
+- -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+- (eval "$lt_compile" 2>conftest.err)
+- ac_status=$?
+- cat conftest.err >&AS_MESSAGE_LOG_FD
+- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+- 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.
+- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+- $2=yes
+- fi
+- fi
+- $rm conftest*
+-])
+
+-if test x"[$]$2" = xyes; then
+- ifelse([$5], , :, [$5])
++# AC_LIBTOOL_SYS_LIB_STRIP
++# ------------------------
++AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
++[striplib=
++old_striplib=
++AC_MSG_CHECKING([whether stripping libraries is possible])
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++ AC_MSG_RESULT([yes])
+ else
+- ifelse([$6], , :, [$6])
++# FIXME - insert some real tests, host_os isn't really good enough
++ case $host_os in
++ darwin*)
++ if test -n "$STRIP" ; then
++ striplib="$STRIP -x"
++ old_striplib="$STRIP -S"
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
+ fi
+-])# AC_LIBTOOL_COMPILER_OPTION
++ ;;
++ *)
++ AC_MSG_RESULT([no])
++ ;;
++ esac
++fi
++])# AC_LIBTOOL_SYS_LIB_STRIP
+
+
+-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+-# [ACTION-SUCCESS], [ACTION-FAILURE])
+-# ------------------------------------------------------------
+-# Check whether the given compiler option works
+-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
++# AC_LIBTOOL_SYS_DYNAMIC_LINKER
++# -----------------------------
++# PORTME Fill in your ld.so characteristics
++AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+ [AC_REQUIRE([LT_AC_PROG_SED])dnl
+-AC_CACHE_CHECK([$1], [$2],
+- [$2=no
+- save_LDFLAGS="$LDFLAGS"
+- LDFLAGS="$LDFLAGS $3"
+- echo "$lt_simple_link_test_code" > conftest.$ac_ext
+- 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
+- if test -s conftest.err; then
+- # Append any errors to the config.log.
+- cat conftest.err 1>&AS_MESSAGE_LOG_FD
+- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+- if diff conftest.exp conftest.er2 >/dev/null; then
+- $2=yes
+- fi
+- else
+- $2=yes
+- fi
+- fi
+- $rm -r conftest*
+- LDFLAGS="$save_LDFLAGS"
+-])
+-
+-if test x"[$]$2" = xyes; then
+- ifelse([$4], , :, [$4])
++AC_MSG_CHECKING([dynamic linker characteristics])
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++m4_if($1,[],[
++if test "$GCC" = yes; then
++ case $host_os in
++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++ *) lt_awk_arg="/^libraries:/" ;;
++ esac
++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
++ # if the path contains ";" then we assume it to be the separator
++ # otherwise default to the standard path separator (i.e. ":") - it is
++ # assumed that no part of a normal pathname contains ";" but that should
++ # okay in the real world where ";" in dirpaths is itself problematic.
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
++ # Ok, now we have the path, separated by spaces, we can step through it
++ # and add multilib dir if necessary.
++ lt_tmp_lt_search_path_spec=
++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++ for lt_sys_path in $lt_search_path_spec; do
++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++ else
++ test -d "$lt_sys_path" && \
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++ fi
++ done
++ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++ lt_foo="";
++ lt_count=0;
++ for (lt_i = NF; lt_i > 0; lt_i--) {
++ if ($lt_i != "" && $lt_i != ".") {
++ if ($lt_i == "..") {
++ lt_count++;
++ } else {
++ if (lt_count == 0) {
++ lt_foo="/" $lt_i lt_foo;
++ } else {
++ lt_count--;
++ }
++ }
++ }
++ }
++ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
++ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
++}'`
++ sys_lib_search_path_spec=`echo $lt_search_path_spec`
+ else
+- ifelse([$5], , :, [$5])
+-fi
+-])# AC_LIBTOOL_LINKER_OPTION
++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi])
++need_lib_prefix=unknown
++hardcode_into_libs=no
+
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
+
+-# AC_LIBTOOL_SYS_MAX_CMD_LEN
+-# --------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+-[# find the maximum length of command line arguments
+-AC_MSG_CHECKING([the maximum length of command line arguments])
+-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+- i=0
+- teststring="ABCD"
++case $host_os in
++aix3*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++ shlibpath_var=LIBPATH
+
+- case $build_os in
+- msdosdjgpp*)
+- # On DJGPP, this test can blow up pretty badly due to problems in libc
+- # (any single argument exceeding 2000 bytes causes a buffer overrun
+- # during glob expansion). Even if it were fixed, the result of this
+- # check would be larger than it should be.
+- lt_cv_sys_max_cmd_len=12288; # 12K is about right
+- ;;
++ # AIX 3 has no versioning support, so we append a major version to the name.
++ soname_spec='${libname}${release}${shared_ext}$major'
++ ;;
+
+- gnu*)
+- # Under GNU Hurd, this test is not required because there is
+- # no limit to the length of command line arguments.
+- # Libtool will interpret -1 as no limit whatsoever
+- lt_cv_sys_max_cmd_len=-1;
+- ;;
++aix[[4-9]]*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ hardcode_into_libs=yes
++ if test "$host_cpu" = ia64; then
++ # AIX 5 supports IA64
++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ else
++ # With GCC up to 2.95.x, collect2 would create an import file
++ # for dependence libraries. The import file would start with
++ # the line `#! .'. This would cause the generated library to
++ # depend on `.', always an invalid library. This was fixed in
++ # development snapshots of GCC prior to 3.0.
++ case $host_os in
++ aix4 | aix4.[[01]] | aix4.[[01]].*)
++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++ echo ' yes '
++ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++ :
++ else
++ can_build_shared=no
++ fi
++ ;;
++ esac
++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++ # soname into executable. Probably we can add versioning support to
++ # collect2, so additional links can be useful in future.
++ if test "$aix_use_runtimelinking" = yes; then
++ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++ # instead of lib<name>.a to let people know that these are not
++ # typical AIX shared libraries.
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ else
++ # We preserve .a as extension for shared libraries through AIX4.2
++ # and later when we are not doing run time linking.
++ library_names_spec='${libname}${release}.a $libname.a'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ fi
++ shlibpath_var=LIBPATH
++ fi
++ ;;
+
+- cygwin* | mingw*)
+- # On Win9x/ME, this test blows up -- it succeeds, but takes
+- # about 5 minutes as the teststring grows exponentially.
+- # Worse, since 9x/ME are not pre-emptively multitasking,
+- # you end up with a "frozen" computer, even though with patience
+- # the test eventually succeeds (with a max line length of 256k).
+- # Instead, let's just punt: use the minimum linelength reported by
+- # all of the supported platforms: 8192 (on NT/2K/XP).
+- lt_cv_sys_max_cmd_len=8192;
+- ;;
++amigaos*)
++ library_names_spec='$libname.ixlibrary $libname.a'
++ # Create ${libname}_ixlibrary.a entries in /sys/libs.
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++ ;;
+
+- amigaos*)
+- # On AmigaOS with pdksh, this test takes hours, literally.
+- # So we just punt and use a minimum line length of 8192.
+- lt_cv_sys_max_cmd_len=8192;
+- ;;
++beos*)
++ library_names_spec='${libname}${shared_ext}'
++ dynamic_linker="$host_os ld.so"
++ shlibpath_var=LIBRARY_PATH
++ ;;
+
+- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+- # This has been around since 386BSD, at least. Likely further.
+- if test -x /sbin/sysctl; then
+- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+- elif test -x /usr/sbin/sysctl; then
+- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+- else
+- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
+- fi
+- # And add a safety zone
+- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+- ;;
++bsdi[[45]]*)
++ version_type=linux
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++ # the default ld.so.conf also contains /usr/contrib/lib and
++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++ # libtool to hard-code these into programs
++ ;;
+
+- interix*)
+- # We know the value 262144 and hardcode it with a safety zone (like BSD)
+- lt_cv_sys_max_cmd_len=196608
+- ;;
++cygwin* | mingw* | pw32*)
++ version_type=windows
++ shrext_cmds=".dll"
++ need_version=no
++ need_lib_prefix=no
+
+- osf*)
+- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+- # nice to cause kernel panics so lets avoid the loop below.
+- # First set a reasonable default.
+- lt_cv_sys_max_cmd_len=16384
+- #
+- if test -x /sbin/sysconfig; then
+- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+- *1*) lt_cv_sys_max_cmd_len=-1 ;;
+- esac
+- fi
+- ;;
+- sco3.2v5*)
+- lt_cv_sys_max_cmd_len=102400
+- ;;
+- sysv5* | sco5v6* | sysv4.2uw2*)
+- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+- if test -n "$kargmax"; then
+- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
+- else
+- lt_cv_sys_max_cmd_len=32768
+- fi
++ case $GCC,$host_os in
++ yes,cygwin* | yes,mingw* | yes,pw32*)
++ library_names_spec='$libname.dll.a'
++ # DLL is installed to $(libdir)/../bin by postinstall_cmds
++ postinstall_cmds='base_file=`basename \${file}`~
++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++ dldir=$destdir/`dirname \$dlpath`~
++ test -d \$dldir || mkdir -p \$dldir~
++ $install_prog $dir/$dlname \$dldir/$dlname~
++ chmod a+x \$dldir/$dlname'
++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++ dlpath=$dir/\$dldll~
++ $rm \$dlpath'
++ shlibpath_overrides_runpath=yes
++
++ case $host_os in
++ cygwin*)
++ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++ ;;
++ mingw*)
++ # MinGW DLLs use traditional 'lib' prefix
++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
++ # It is most probably a Windows format PATH printed by
++ # mingw gcc, but we are running on Cygwin. Gcc prints its search
++ # path with ; separators, and with drive letters. We can handle the
++ # drive letters (cygwin fileutils understands them), so leave them,
++ # especially as we might pass files found there to a mingw objdump,
++ # which wouldn't understand a cygwinified path. Ahh.
++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
++ ;;
++ pw32*)
++ # pw32 DLLs use 'pw' prefix rather than 'lib'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++ ;;
++ esac
+ ;;
++
+ *)
+- lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+- if test -n "$lt_cv_sys_max_cmd_len"; then
+- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+- else
+- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+- = "XX$teststring") >/dev/null 2>&1 &&
+- new_result=`expr "X$teststring" : ".*" 2>&1` &&
+- lt_cv_sys_max_cmd_len=$new_result &&
+- test $i != 17 # 1/2 MB should be enough
+- do
+- i=`expr $i + 1`
+- teststring=$teststring$teststring
+- done
+- teststring=
+- # Add a significant safety factor because C++ compilers can tack on massive
+- # amounts of additional arguments before passing them to the linker.
+- # It appears as though 1/2 is a usable value.
+- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+- fi
++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ ;;
+ esac
+-])
+-if test -n $lt_cv_sys_max_cmd_len ; then
+- AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+-else
+- AC_MSG_RESULT(none)
+-fi
+-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+-
+-
+-# _LT_AC_CHECK_DLFCN
+-# ------------------
+-AC_DEFUN([_LT_AC_CHECK_DLFCN],
+-[AC_CHECK_HEADERS(dlfcn.h)dnl
+-])# _LT_AC_CHECK_DLFCN
+-
+-
+-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ---------------------------------------------------------------------
+-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+-if test "$cross_compiling" = yes; then :
+- [$4]
+-else
+- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+- lt_status=$lt_dlunknown
+- cat > conftest.$ac_ext <<EOF
+-[#line __oline__ "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+-
+-#include <stdio.h>
+-
+-#ifdef RTLD_GLOBAL
+-# define LT_DLGLOBAL RTLD_GLOBAL
+-#else
+-# ifdef DL_GLOBAL
+-# define LT_DLGLOBAL DL_GLOBAL
+-# else
+-# define LT_DLGLOBAL 0
+-# endif
+-#endif
++ dynamic_linker='Win32 ld.exe'
++ # FIXME: first we should search . and the directory the executable is in
++ shlibpath_var=PATH
++ ;;
+
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+- find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-# ifdef RTLD_LAZY
+-# define LT_DLLAZY_OR_NOW RTLD_LAZY
+-# else
+-# ifdef DL_LAZY
+-# define LT_DLLAZY_OR_NOW DL_LAZY
+-# else
+-# ifdef RTLD_NOW
+-# define LT_DLLAZY_OR_NOW RTLD_NOW
+-# else
+-# ifdef DL_NOW
+-# define LT_DLLAZY_OR_NOW DL_NOW
+-# else
+-# define LT_DLLAZY_OR_NOW 0
+-# endif
+-# endif
+-# endif
+-# endif
+-#endif
++darwin* | rhapsody*)
++ dynamic_linker="$host_os dyld"
++ version_type=darwin
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++ soname_spec='${libname}${release}${major}$shared_ext'
++ shlibpath_overrides_runpath=yes
++ shlibpath_var=DYLD_LIBRARY_PATH
++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++ m4_if([$1], [],[
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
++ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++ ;;
+
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
++dgux*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
+
+-void fnord() { int i=42;}
+-int main ()
+-{
+- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+- int status = $lt_dlunknown;
++freebsd1*)
++ dynamic_linker=no
++ ;;
+
+- if (self)
+- {
+- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+- /* dlclose (self); */
+- }
++freebsd* | dragonfly*)
++ # DragonFly does not have aout. When/if they implement a new
++ # versioning mechanism, adjust this.
++ if test -x /usr/bin/objformat; then
++ objformat=`/usr/bin/objformat`
+ else
+- puts (dlerror ());
+-
+- exit (status);
+-}]
+-EOF
+- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+- lt_status=$?
+- case x$lt_status in
+- x$lt_dlno_uscore) $1 ;;
+- x$lt_dlneed_uscore) $2 ;;
+- x$lt_dlunknown|x*) $3 ;;
++ case $host_os in
++ freebsd[[123]]*) objformat=aout ;;
++ *) objformat=elf ;;
+ esac
+- else :
+- # compilation failed
+- $3
+ fi
+-fi
+-rm -fr conftest*
+-])# _LT_AC_TRY_DLOPEN_SELF
+-
+-
+-# AC_LIBTOOL_DLOPEN_SELF
+-# ----------------------
+-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+-if test "x$enable_dlopen" != xyes; then
+- enable_dlopen=unknown
+- enable_dlopen_self=unknown
+- enable_dlopen_self_static=unknown
+-else
+- lt_cv_dlopen=no
+- lt_cv_dlopen_libs=
+-
++ version_type=freebsd-$objformat
++ case $version_type in
++ freebsd-elf*)
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ need_version=no
++ need_lib_prefix=no
++ ;;
++ freebsd-*)
++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++ need_version=yes
++ ;;
++ esac
++ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- beos*)
+- lt_cv_dlopen="load_add_on"
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=yes
++ freebsd2*)
++ shlibpath_overrides_runpath=yes
+ ;;
++ freebsd3.[[01]]* | freebsdelf3.[[01]]*)
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
++ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
++ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++ *) # from 4.6 on, and DragonFly
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
++ esac
++ ;;
+
+- mingw* | pw32*)
+- lt_cv_dlopen="LoadLibrary"
+- lt_cv_dlopen_libs=
+- ;;
++gnu*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ ;;
+
+- cygwin*)
+- lt_cv_dlopen="dlopen"
+- lt_cv_dlopen_libs=
+- ;;
++hpux9* | hpux10* | hpux11*)
++ # Give a soname corresponding to the major version so that dld.sl refuses to
++ # link against other versions.
++ version_type=sunos
++ need_lib_prefix=no
++ need_version=no
++ case $host_cpu in
++ ia64*)
++ shrext_cmds='.so'
++ hardcode_into_libs=yes
++ dynamic_linker="$host_os dld.so"
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ if test "X$HPUX_IA64_MODE" = X32; then
++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++ else
++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++ fi
++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++ ;;
++ hppa*64*)
++ shrext_cmds='.sl'
++ hardcode_into_libs=yes
++ dynamic_linker="$host_os dld.sl"
++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++ ;;
++ *)
++ shrext_cmds='.sl'
++ dynamic_linker="$host_os dld.sl"
++ shlibpath_var=SHLIB_PATH
++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ ;;
++ esac
++ # HP-UX runs *really* slowly unless shared libraries are mode 555.
++ postinstall_cmds='chmod 555 $lib'
++ ;;
+
+- darwin*)
+- # if libdl is installed we need to link against it
+- AC_CHECK_LIB([dl], [dlopen],
+- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+- lt_cv_dlopen="dyld"
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=yes
+- ])
+- ;;
++interix[[3-9]]*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
+
++irix5* | irix6* | nonstopux*)
++ case $host_os in
++ nonstopux*) version_type=nonstopux ;;
++ *)
++ if test "$lt_cv_prog_gnu_ld" = yes; then
++ version_type=linux
++ else
++ version_type=irix
++ fi ;;
++ esac
++ need_lib_prefix=no
++ need_version=no
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++ case $host_os in
++ irix5* | nonstopux*)
++ libsuff= shlibsuff=
++ ;;
+ *)
+- AC_CHECK_FUNC([shl_load],
+- [lt_cv_dlopen="shl_load"],
+- [AC_CHECK_LIB([dld], [shl_load],
+- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+- [AC_CHECK_FUNC([dlopen],
+- [lt_cv_dlopen="dlopen"],
+- [AC_CHECK_LIB([dl], [dlopen],
+- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+- [AC_CHECK_LIB([svld], [dlopen],
+- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+- [AC_CHECK_LIB([dld], [dld_link],
+- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+- ])
+- ])
+- ])
+- ])
+- ])
++ case $LD in # libtool.m4 will add one of these switches to LD
++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++ libsuff= shlibsuff= libmagic=32-bit;;
++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++ libsuff=32 shlibsuff=N32 libmagic=N32;;
++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++ libsuff=64 shlibsuff=64 libmagic=64-bit;;
++ *) libsuff= shlibsuff= libmagic=never-match;;
++ esac
+ ;;
+ esac
++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++ shlibpath_overrides_runpath=no
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++ hardcode_into_libs=yes
++ ;;
+
+- if test "x$lt_cv_dlopen" != xno; then
+- enable_dlopen=yes
+- else
+- enable_dlopen=no
+- fi
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++ dynamic_linker=no
++ ;;
+
+- case $lt_cv_dlopen in
+- dlopen)
+- save_CPPFLAGS="$CPPFLAGS"
+- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ # This implies no fast_install, which is unacceptable.
++ # Some rework will be needed to allow for fast_install
++ # before this can be enabled.
++ hardcode_into_libs=yes
+
+- save_LDFLAGS="$LDFLAGS"
+- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++ # Append ld.so.conf contents to the search path
++ if test -f /etc/ld.so.conf; then
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ fi
+
+- save_LIBS="$LIBS"
+- LIBS="$lt_cv_dlopen_libs $LIBS"
++ # We used to test for /lib/ld.so.1 and disable shared libraries on
++ # powerpc, because MkLinux only supported shared libraries with the
++ # GNU dynamic linker. Since this was broken with cross compilers,
++ # most powerpc-linux boxes support dynamic linking these days and
++ # people can always --disable-shared, the test was removed, and we
++ # assume the GNU/Linux dynamic linker is in use.
++ dynamic_linker='GNU/Linux ld.so'
++ ;;
+
+- AC_CACHE_CHECK([whether a program can dlopen itself],
+- lt_cv_dlopen_self, [dnl
+- _LT_AC_TRY_DLOPEN_SELF(
+- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+- ])
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
@@ -1894,20 +4821,2765 @@
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
+- if test "x$lt_cv_dlopen_self" = xyes; then
+- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+- AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+- lt_cv_dlopen_self_static, [dnl
+- _LT_AC_TRY_DLOPEN_SELF(
+- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
+- ])
+- fi
++netbsd*)
++ version_type=sunos
++ need_lib_prefix=no
++ need_version=no
++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++ dynamic_linker='NetBSD (a.out) ld.so'
++ else
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='NetBSD ld.elf_so'
++ fi
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
+
+- CPPFLAGS="$save_CPPFLAGS"
+- LDFLAGS="$save_LDFLAGS"
+- LIBS="$save_LIBS"
+- ;;
+- esac
++newsos6)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ ;;
+
+- case $lt_cv_dlopen_self in
+- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+- *) enable_dlopen_self=unknown ;;
+- esac
++nto-qnx*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ ;;
+
+- case $lt_cv_dlopen_self_static in
+- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+- *) enable_dlopen_self_static=unknown ;;
++openbsd*)
++ version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
++ need_lib_prefix=no
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
+ esac
+-fi
+-])# AC_LIBTOOL_DLOPEN_SELF
+-
+-
+-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+-# ---------------------------------
+-# Check to see if options -c and -o are simultaneously supported by compiler
+-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+-[AC_REQUIRE([LT_AC_PROG_SED])dnl
+-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+- $rm -r conftest 2>/dev/null
+- mkdir conftest
+- cd conftest
+- mkdir out
+- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+- lt_compiler_flag="-o out/conftest2.$ac_objext"
+- # Insert the option either (1) after the last *FLAGS variable, or
+- # (2) before a word containing "conftest.", or (3) at the end.
+- # Note that $ac_compile itself does not contain backslashes and begins
+- # with a dollar sign (not a hyphen), so the echo should work correctly.
+- lt_compile=`echo "$ac_compile" | $SED \
+- -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+- (eval "$lt_compile" 2>out/conftest.err)
+- ac_status=$?
+- cat out/conftest.err >&AS_MESSAGE_LOG_FD
+- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+- if (exit $ac_status) && test -s out/conftest2.$ac_objext
+- then
+- # The compiler can only warn and ignore the option if not recognized
+- # So say no if there are warnings
+- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+- fi
+- fi
+- chmod u+w . 2>&AS_MESSAGE_LOG_FD
+- $rm conftest*
+- # SGI C++ compiler will create directory out/ii_files/ for
+- # template instantiation
+- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+- $rm out/* && rmdir out
+- cd ..
+- rmdir conftest
+- $rm conftest*
+-])
+-])# AC_LIBTOOL_PROG_CC_C_O
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ case $host_os in
++ openbsd2.[[89]] | openbsd2.[[89]].*)
++ shlibpath_overrides_runpath=no
++ ;;
++ *)
++ shlibpath_overrides_runpath=yes
++ ;;
++ esac
++ else
++ shlibpath_overrides_runpath=yes
++ fi
++ ;;
+
++os2*)
++ libname_spec='$name'
++ shrext_cmds=".dll"
++ need_lib_prefix=no
++ library_names_spec='$libname${shared_ext} $libname.a'
++ dynamic_linker='OS/2 ld.exe'
++ shlibpath_var=LIBPATH
++ ;;
+
+-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+-# -----------------------------------------
+-# Check to see if we can do hard links to lock some files if needed
+-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+-[AC_REQUIRE([_LT_AC_LOCK])dnl
++osf3* | osf4* | osf5*)
++ version_type=osf
++ need_lib_prefix=no
++ need_version=no
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++ ;;
+
+-hard_links="nottested"
+-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+- # do not overwrite the value of need_locks provided by the user
+- AC_MSG_CHECKING([if we can lock with hard links])
+- hard_links=yes
+- $rm conftest*
+- ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- touch conftest.a
+- ln conftest.a conftest.b 2>&5 || hard_links=no
+- ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- AC_MSG_RESULT([$hard_links])
+- if test "$hard_links" = no; then
+- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+- need_locks=warn
+- fi
+-else
+- need_locks=no
+-fi
+-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
++rdos*)
++ dynamic_linker=no
++ ;;
+
++solaris*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ # ldd complains unless libraries are executable
++ postinstall_cmds='chmod +x $lib'
++ ;;
+
+-# AC_LIBTOOL_OBJDIR
+-# -----------------
+-AC_DEFUN([AC_LIBTOOL_OBJDIR],
+-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+-[rm -f .libs 2>/dev/null
+-mkdir .libs 2>/dev/null
+-if test -d .libs; then
+- lt_cv_objdir=.libs
+-else
+- # MS-DOS does not allow filenames that begin with a dot.
+- lt_cv_objdir=_libs
+-fi
+-rmdir .libs 2>/dev/null])
+-objdir=$lt_cv_objdir
+-])# AC_LIBTOOL_OBJDIR
++sunos4*)
++ version_type=sunos
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ if test "$with_gnu_ld" = yes; then
++ need_lib_prefix=no
++ fi
++ need_version=yes
++ ;;
+
++sysv4 | sysv4.3*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ case $host_vendor in
++ sni)
++ shlibpath_overrides_runpath=no
++ need_lib_prefix=no
++ export_dynamic_flag_spec='${wl}-Blargedynsym'
++ runpath_var=LD_RUN_PATH
++ ;;
++ siemens)
++ need_lib_prefix=no
++ ;;
++ motorola)
++ need_lib_prefix=no
++ need_version=no
++ shlibpath_overrides_runpath=no
++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++ ;;
++ esac
++ ;;
+
+-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+-# ----------------------------------------------
+-# Check hardcoding attributes.
+-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
+-[AC_MSG_CHECKING([how to hardcode library paths into programs])
+-_LT_AC_TAGVAR(hardcode_action, $1)=
+-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+- test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
+- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
++sysv4*MP*)
++ if test -d /usr/nec ;then
++ version_type=linux
++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++ soname_spec='$libname${shared_ext}.$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ fi
++ ;;
+
+- # We can hardcode non-existant directories.
+- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+- # If the only mechanism to avoid hardcoding is shlibpath_var, we
+- # have to relink, otherwise we might link with an installed library
+- # when we should be linking with a yet-to-be-installed one
+- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+- # Linking always hardcodes the temporary library directory.
+- _LT_AC_TAGVAR(hardcode_action, $1)=relink
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ version_type=freebsd-elf
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ if test "$with_gnu_ld" = yes; then
++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++ shlibpath_overrides_runpath=no
+ else
+- # We can link without hardcoding, and we can hardcode nonexisting dirs.
+- _LT_AC_TAGVAR(hardcode_action, $1)=immediate
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
++ esac
+ fi
+-else
+- # We cannot hardcode anything, or else we can only hardcode existing
+- # directories.
+- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+-fi
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
++ sys_lib_dlsearch_path_spec='/usr/lib'
++ ;;
+
+-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+- # Fast installation is not supported
+- enable_fast_install=no
+-elif test "$shlibpath_overrides_runpath" = yes ||
+- test "$enable_shared" = no; then
+- # Fast installation is not necessary
+- enable_fast_install=needless
+-fi
+-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
++uts4*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
+
++*)
++ dynamic_linker=no
++ ;;
++esac
++AC_MSG_RESULT([$dynamic_linker])
++test "$dynamic_linker" = no && can_build_shared=no
+
+-# AC_LIBTOOL_SYS_LIB_STRIP
+-# ------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+-[striplib=
+-old_striplib=
+-AC_MSG_CHECKING([whether stripping libraries is possible])
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+- AC_MSG_RESULT([yes])
+-else
+-# FIXME - insert some real tests, host_os isn't really good enough
+- case $host_os in
+- darwin*)
+- if test -n "$STRIP" ; then
+- striplib="$STRIP -x"
+- old_striplib="$STRIP -S"
+- AC_MSG_RESULT([yes])
+- else
+- AC_MSG_RESULT([no])
+-fi
+- ;;
+- *)
+- AC_MSG_RESULT([no])
+- ;;
+- esac
++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -3514,7 +3179,7 @@
- lt_cv_deplibs_check_method=pass_all
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+-])# AC_LIBTOOL_SYS_LIB_STRIP
++])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+
+
+-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+-# -----------------------------
+-# PORTME Fill in your ld.so characteristics
+-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
++# _LT_AC_TAGCONFIG
++# ----------------
++AC_DEFUN([_LT_AC_TAGCONFIG],
+ [AC_REQUIRE([LT_AC_PROG_SED])dnl
+-AC_MSG_CHECKING([dynamic linker characteristics])
+-library_names_spec=
+-libname_spec='lib$name'
+-soname_spec=
+-shrext_cmds=".so"
+-postinstall_cmds=
+-postuninstall_cmds=
+-finish_cmds=
+-finish_eval=
+-shlibpath_var=
+-shlibpath_overrides_runpath=unknown
+-version_type=none
+-dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-m4_if($1,[],[
+-if test "$GCC" = yes; then
+- case $host_os in
+- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+- *) lt_awk_arg="/^libraries:/" ;;
+- esac
+- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+- # if the path contains ";" then we assume it to be the separator
+- # otherwise default to the standard path separator (i.e. ":") - it is
+- # assumed that no part of a normal pathname contains ";" but that should
+- # okay in the real world where ";" in dirpaths is itself problematic.
+- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+- else
+- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++AC_ARG_WITH([tags],
++ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
++ [include additional configurations @<:@automatic@:>@])],
++ [tagnames="$withval"])
++
++if test -f "$ltmain" && test -n "$tagnames"; then
++ if test ! -f "${ofile}"; then
++ AC_MSG_WARN([output file `$ofile' does not exist])
+ fi
+- # Ok, now we have the path, separated by spaces, we can step through it
+- # and add multilib dir if necessary.
+- lt_tmp_lt_search_path_spec=
+- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+- for lt_sys_path in $lt_search_path_spec; do
+- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++
++ if test -z "$LTCC"; then
++ eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
++ if test -z "$LTCC"; then
++ AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+ else
+- test -d "$lt_sys_path" && \
+- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+ fi
+- done
+- lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+-BEGIN {RS=" "; FS="/|\n";} {
+- lt_foo="";
+- lt_count=0;
+- for (lt_i = NF; lt_i > 0; lt_i--) {
+- if ($lt_i != "" && $lt_i != ".") {
+- if ($lt_i == "..") {
+- lt_count++;
+- } else {
+- if (lt_count == 0) {
+- lt_foo="/" $lt_i lt_foo;
+- } else {
+- lt_count--;
+- }
+- }
+- }
+- }
+- if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+- if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+-}'`
+- sys_lib_search_path_spec=`echo $lt_search_path_spec`
+-else
+- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi])
+-need_lib_prefix=unknown
+-hardcode_into_libs=no
+-
+-# when you set need_version to no, make sure it does not cause -set_version
+-# flags to be left without arguments
+-need_version=unknown
+-
+-case $host_os in
+-aix3*)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+- shlibpath_var=LIBPATH
++ fi
++ if test -z "$LTCFLAGS"; then
++ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++ fi
+
+- # AIX 3 has no versioning support, so we append a major version to the name.
+- soname_spec='${libname}${release}${shared_ext}$major'
+- ;;
++ # Extract list of available tagged configurations in $ofile.
++ # Note that this assumes the entire list is on one line.
++ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+
+-aix[[4-9]]*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- hardcode_into_libs=yes
+- if test "$host_cpu" = ia64; then
+- # AIX 5 supports IA64
+- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- else
+- # With GCC up to 2.95.x, collect2 would create an import file
+- # for dependence libraries. The import file would start with
+- # the line `#! .'. This would cause the generated library to
+- # depend on `.', always an invalid library. This was fixed in
+- # development snapshots of GCC prior to 3.0.
+- case $host_os in
+- aix4 | aix4.[[01]] | aix4.[[01]].*)
+- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+- echo ' yes '
+- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+- :
+- else
+- can_build_shared=no
+- fi
+- ;;
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for tagname in $tagnames; do
++ IFS="$lt_save_ifs"
++ # Check whether tagname contains only valid characters
++ case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
++ "") ;;
++ *) AC_MSG_ERROR([invalid tag name: $tagname])
++ ;;
+ esac
+- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+- # soname into executable. Probably we can add versioning support to
+- # collect2, so additional links can be useful in future.
+- if test "$aix_use_runtimelinking" = yes; then
+- # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+- # instead of lib<name>.a to let people know that these are not
+- # typical AIX shared libraries.
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- else
+- # We preserve .a as extension for shared libraries through AIX4.2
+- # and later when we are not doing run time linking.
+- library_names_spec='${libname}${release}.a $libname.a'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- fi
+- shlibpath_var=LIBPATH
+- fi
+- ;;
+
+-amigaos*)
+- library_names_spec='$libname.ixlibrary $libname.a'
+- # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+- ;;
++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
++ then
++ AC_MSG_ERROR([tag name \"$tagname\" already exists])
++ fi
+
+-beos*)
+- library_names_spec='${libname}${shared_ext}'
+- dynamic_linker="$host_os ld.so"
+- shlibpath_var=LIBRARY_PATH
+- ;;
++ # Update the list of available tags.
++ if test -n "$tagname"; then
++ echo appending configuration tag \"$tagname\" to $ofile
+
+-bsdi[[45]]*)
+- version_type=linux
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+- shlibpath_var=LD_LIBRARY_PATH
+- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+- # the default ld.so.conf also contains /usr/contrib/lib and
+- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+- # libtool to hard-code these into programs
+- ;;
++ case $tagname in
++ CXX)
++ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
++ AC_LIBTOOL_LANG_CXX_CONFIG
++ else
++ tagname=""
++ fi
++ ;;
+
+-cygwin* | mingw* | pw32*)
+- version_type=windows
+- shrext_cmds=".dll"
+- need_version=no
+- need_lib_prefix=no
++ F77)
++ if test -n "$F77" && test "X$F77" != "Xno"; then
++ AC_LIBTOOL_LANG_F77_CONFIG
++ else
++ tagname=""
++ fi
++ ;;
+
+- case $GCC,$host_os in
+- yes,cygwin* | yes,mingw* | yes,pw32*)
+- library_names_spec='$libname.dll.a'
+- # DLL is installed to $(libdir)/../bin by postinstall_cmds
+- postinstall_cmds='base_file=`basename \${file}`~
+- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+- dldir=$destdir/`dirname \$dlpath`~
+- test -d \$dldir || mkdir -p \$dldir~
+- $install_prog $dir/$dlname \$dldir/$dlname~
+- chmod a+x \$dldir/$dlname'
+- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+- dlpath=$dir/\$dldll~
+- $rm \$dlpath'
+- shlibpath_overrides_runpath=yes
++ GCJ)
++ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
++ AC_LIBTOOL_LANG_GCJ_CONFIG
++ else
++ tagname=""
++ fi
++ ;;
+
+- case $host_os in
+- cygwin*)
+- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+- ;;
+- mingw*)
+- # MinGW DLLs use traditional 'lib' prefix
+- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
+- # It is most probably a Windows format PATH printed by
+- # mingw gcc, but we are running on Cygwin. Gcc prints its search
+- # path with ; separators, and with drive letters. We can handle the
+- # drive letters (cygwin fileutils understands them), so leave them,
+- # especially as we might pass files found there to a mingw objdump,
+- # which wouldn't understand a cygwinified path. Ahh.
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+- else
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+- fi
+- ;;
+- pw32*)
+- # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+- ;;
+- esac
+- ;;
+-
+- *)
+- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+- ;;
+- esac
+- dynamic_linker='Win32 ld.exe'
+- # FIXME: first we should search . and the directory the executable is in
+- shlibpath_var=PATH
+- ;;
+-
+-darwin* | rhapsody*)
+- dynamic_linker="$host_os dyld"
+- version_type=darwin
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+- soname_spec='${libname}${release}${major}$shared_ext'
+- shlibpath_overrides_runpath=yes
+- shlibpath_var=DYLD_LIBRARY_PATH
+- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+- m4_if([$1], [],[
+- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+- ;;
++ RC)
++ AC_LIBTOOL_LANG_RC_CONFIG
++ ;;
+
+-dgux*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- ;;
++ *)
++ AC_MSG_ERROR([Unsupported tag name: $tagname])
++ ;;
++ esac
+
+-freebsd1*)
+- dynamic_linker=no
+- ;;
++ # Append the new tag name to the list of available tags.
++ if test -n "$tagname" ; then
++ available_tags="$available_tags $tagname"
++ fi
++ fi
++ done
++ IFS="$lt_save_ifs"
+
+-freebsd* | dragonfly*)
+- # DragonFly does not have aout. When/if they implement a new
+- # versioning mechanism, adjust this.
+- if test -x /usr/bin/objformat; then
+- objformat=`/usr/bin/objformat`
++ # Now substitute the updated list of available tags.
++ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
++ mv "${ofile}T" "$ofile"
++ chmod +x "$ofile"
+ else
+- case $host_os in
+- freebsd[[123]]*) objformat=aout ;;
+- *) objformat=elf ;;
+- esac
++ rm -f "${ofile}T"
++ AC_MSG_ERROR([unable to update list of available tagged configurations.])
+ fi
+- version_type=freebsd-$objformat
+- case $version_type in
+- freebsd-elf*)
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+- need_version=no
+- need_lib_prefix=no
+- ;;
+- freebsd-*)
+- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+- need_version=yes
+- ;;
+- esac
+- shlibpath_var=LD_LIBRARY_PATH
+- case $host_os in
+- freebsd2*)
+- shlibpath_overrides_runpath=yes
+- ;;
+- freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+- shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
+- ;;
+- freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+- freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- ;;
+- *) # from 4.6 on, and DragonFly
+- shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
+- ;;
+- esac
+- ;;
++fi
++])# _LT_AC_TAGCONFIG
+
+-gnu*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- hardcode_into_libs=yes
+- ;;
+
+-hpux9* | hpux10* | hpux11*)
+- # Give a soname corresponding to the major version so that dld.sl refuses to
+- # link against other versions.
+- version_type=sunos
+- need_lib_prefix=no
+- need_version=no
+- case $host_cpu in
+- ia64*)
+- shrext_cmds='.so'
+- hardcode_into_libs=yes
+- dynamic_linker="$host_os dld.so"
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- if test "X$HPUX_IA64_MODE" = X32; then
+- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+- else
+- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+- fi
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+- ;;
+- hppa*64*)
+- shrext_cmds='.sl'
+- hardcode_into_libs=yes
+- dynamic_linker="$host_os dld.sl"
+- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+- ;;
+- *)
+- shrext_cmds='.sl'
+- dynamic_linker="$host_os dld.sl"
+- shlibpath_var=SHLIB_PATH
+- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- ;;
+- esac
+- # HP-UX runs *really* slowly unless shared libraries are mode 555.
+- postinstall_cmds='chmod 555 $lib'
+- ;;
++# AC_LIBTOOL_DLOPEN
++# -----------------
++# enable checks for dlopen support
++AC_DEFUN([AC_LIBTOOL_DLOPEN],
++ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
++])# AC_LIBTOOL_DLOPEN
+
+-interix[[3-9]]*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- ;;
+
+-irix5* | irix6* | nonstopux*)
+- case $host_os in
+- nonstopux*) version_type=nonstopux ;;
+- *)
+- if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
+- else
+- version_type=irix
+- fi ;;
+- esac
+- need_lib_prefix=no
+- need_version=no
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+- case $host_os in
+- irix5* | nonstopux*)
+- libsuff= shlibsuff=
+- ;;
+- *)
+- case $LD in # libtool.m4 will add one of these switches to LD
+- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+- libsuff= shlibsuff= libmagic=32-bit;;
+- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+- libsuff=32 shlibsuff=N32 libmagic=N32;;
+- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+- libsuff=64 shlibsuff=64 libmagic=64-bit;;
+- *) libsuff= shlibsuff= libmagic=never-match;;
+- esac
+- ;;
+- esac
+- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+- shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+- hardcode_into_libs=yes
+- ;;
++# AC_LIBTOOL_WIN32_DLL
++# --------------------
++# declare package support for building win32 DLLs
++AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
++[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
++])# AC_LIBTOOL_WIN32_DLL
+
+-# No shared lib support for Linux oldld, aout, or coff.
+-linux*oldld* | linux*aout* | linux*coff*)
+- dynamic_linker=no
+- ;;
+
+-# This must be Linux ELF.
+-linux* | k*bsd*-gnu)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- # This implies no fast_install, which is unacceptable.
+- # Some rework will be needed to allow for fast_install
+- # before this can be enabled.
+- hardcode_into_libs=yes
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++# AC_ENABLE_SHARED([DEFAULT])
++# ---------------------------
++# implement the --enable-shared flag
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_SHARED],
++[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([shared],
++ [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
++ [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
++ [p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_shared=yes ;;
++ no) enable_shared=no ;;
++ *)
++ enable_shared=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_shared=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac],
++ [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
++])# AC_ENABLE_SHARED
+
+- # Append ld.so.conf contents to the search path
+- if test -f /etc/ld.so.conf; then
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+- fi
+
+- # We used to test for /lib/ld.so.1 and disable shared libraries on
+- # powerpc, because MkLinux only supported shared libraries with the
+- # GNU dynamic linker. Since this was broken with cross compilers,
+- # most powerpc-linux boxes support dynamic linking these days and
+- # people can always --disable-shared, the test was removed, and we
+- # assume the GNU/Linux dynamic linker is in use.
+- dynamic_linker='GNU/Linux ld.so'
+- ;;
++# AC_DISABLE_SHARED
++# -----------------
++# set the default shared flag to --disable-shared
++AC_DEFUN([AC_DISABLE_SHARED],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_SHARED(no)
++])# AC_DISABLE_SHARED
+
+-netbsd*)
+- version_type=sunos
+- need_lib_prefix=no
+- need_version=no
+- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+- dynamic_linker='NetBSD (a.out) ld.so'
+- else
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- dynamic_linker='NetBSD ld.elf_so'
+- fi
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
+- ;;
+
+-newsos6)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- ;;
++# AC_ENABLE_STATIC([DEFAULT])
++# ---------------------------
++# implement the --enable-static flag
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_STATIC],
++[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([static],
++ [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
++ [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
++ [p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_static=yes ;;
++ no) enable_static=no ;;
++ *)
++ enable_static=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_static=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac],
++ [enable_static=]AC_ENABLE_STATIC_DEFAULT)
++])# AC_ENABLE_STATIC
+
+-nto-qnx*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- ;;
+
+-openbsd*)
+- version_type=sunos
+- sys_lib_dlsearch_path_spec="/usr/lib"
+- need_lib_prefix=no
+- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+- case $host_os in
+- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+- *) need_version=no ;;
+- esac
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+- shlibpath_var=LD_LIBRARY_PATH
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- case $host_os in
+- openbsd2.[[89]] | openbsd2.[[89]].*)
+- shlibpath_overrides_runpath=no
+- ;;
+- *)
+- shlibpath_overrides_runpath=yes
+- ;;
+- esac
+- else
+- shlibpath_overrides_runpath=yes
+- fi
+- ;;
++# AC_DISABLE_STATIC
++# -----------------
++# set the default static flag to --disable-static
++AC_DEFUN([AC_DISABLE_STATIC],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_STATIC(no)
++])# AC_DISABLE_STATIC
+
+-os2*)
+- libname_spec='$name'
+- shrext_cmds=".dll"
+- need_lib_prefix=no
+- library_names_spec='$libname${shared_ext} $libname.a'
+- dynamic_linker='OS/2 ld.exe'
+- shlibpath_var=LIBPATH
+- ;;
+
+-osf3* | osf4* | osf5*)
+- version_type=osf
+- need_lib_prefix=no
+- need_version=no
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+- ;;
++# AC_ENABLE_FAST_INSTALL([DEFAULT])
++# ---------------------------------
++# implement the --enable-fast-install flag
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_FAST_INSTALL],
++[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([fast-install],
++ [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
++ [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
++ [p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_fast_install=yes ;;
++ no) enable_fast_install=no ;;
++ *)
++ enable_fast_install=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_fast_install=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac],
++ [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
++])# AC_ENABLE_FAST_INSTALL
+
+-rdos*)
+- dynamic_linker=no
+- ;;
+
+-solaris*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
+- # ldd complains unless libraries are executable
+- postinstall_cmds='chmod +x $lib'
+- ;;
++# AC_DISABLE_FAST_INSTALL
++# -----------------------
++# set the default to --disable-fast-install
++AC_DEFUN([AC_DISABLE_FAST_INSTALL],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_FAST_INSTALL(no)
++])# AC_DISABLE_FAST_INSTALL
+
+-sunos4*)
+- version_type=sunos
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- if test "$with_gnu_ld" = yes; then
+- need_lib_prefix=no
+- fi
+- need_version=yes
+- ;;
+
+-sysv4 | sysv4.3*)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- case $host_vendor in
+- sni)
+- shlibpath_overrides_runpath=no
+- need_lib_prefix=no
+- export_dynamic_flag_spec='${wl}-Blargedynsym'
+- runpath_var=LD_RUN_PATH
+- ;;
+- siemens)
+- need_lib_prefix=no
+- ;;
+- motorola)
+- need_lib_prefix=no
+- need_version=no
+- shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+- ;;
+- esac
+- ;;
++# AC_LIBTOOL_PICMODE([MODE])
++# --------------------------
++# implement the --with-pic flag
++# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
++AC_DEFUN([AC_LIBTOOL_PICMODE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++pic_mode=ifelse($#,1,$1,default)
++])# AC_LIBTOOL_PICMODE
+
+-sysv4*MP*)
+- if test -d /usr/nec ;then
+- version_type=linux
+- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+- soname_spec='$libname${shared_ext}.$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- fi
+- ;;
+
+-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+- version_type=freebsd-elf
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- hardcode_into_libs=yes
+- if test "$with_gnu_ld" = yes; then
+- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+- shlibpath_overrides_runpath=no
+- else
+- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+- shlibpath_overrides_runpath=yes
+- case $host_os in
+- sco3.2v5*)
+- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+- ;;
+- esac
+- fi
+- sys_lib_dlsearch_path_spec='/usr/lib'
+- ;;
++# AC_PROG_EGREP
++# -------------
++# This is predefined starting with Autoconf 2.54, so this conditional
++# definition can be removed once we require Autoconf 2.54 or later.
++m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
++[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
++ [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
++ then ac_cv_prog_egrep='grep -E'
++ else ac_cv_prog_egrep='egrep'
++ fi])
++ EGREP=$ac_cv_prog_egrep
++ AC_SUBST([EGREP])
++])])
+
+-uts4*)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- ;;
+
+-*)
+- dynamic_linker=no
++# AC_PATH_TOOL_PREFIX
++# -------------------
++# find a file program which can recognize shared library
++AC_DEFUN([AC_PATH_TOOL_PREFIX],
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_MSG_CHECKING([for $1])
++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
++[case $MAGIC_CMD in
++[[\\/*] | ?:[\\/]*])
++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
;;
+-esac
+-AC_MSG_RESULT([$dynamic_linker])
+-test "$dynamic_linker" = no && can_build_shared=no
++*)
++ lt_save_MAGIC_CMD="$MAGIC_CMD"
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++dnl $ac_dummy forces splitting on constant user-supplied paths.
++dnl POSIX.2 word splitting is done only on the output of word expansions,
++dnl not every word. This closes a longstanding sh security hole.
++ ac_dummy="ifelse([$2], , $PATH, [$2])"
++ for ac_dir in $ac_dummy; do
++ IFS="$lt_save_ifs"
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$1; then
++ lt_cv_path_MAGIC_CMD="$ac_dir/$1"
++ if test -n "$file_magic_test_file"; then
++ case $deplibs_check_method in
++ "file_magic "*)
++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++ $EGREP "$file_magic_regex" > /dev/null; then
++ :
++ else
++ cat <<EOF 1>&2
+
+-AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+-[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+-AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+-[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such. This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem. Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool at gnu.org
+
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++EOF
++ fi ;;
++ esac
++ fi
++ break
++ fi
++ done
++ IFS="$lt_save_ifs"
++ MAGIC_CMD="$lt_save_MAGIC_CMD"
++ ;;
++esac])
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++ AC_MSG_RESULT($MAGIC_CMD)
++else
++ AC_MSG_RESULT(no)
+ fi
+-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+-
+-
+-# _LT_AC_TAGCONFIG
+-# ----------------
+-AC_DEFUN([_LT_AC_TAGCONFIG],
+-[AC_REQUIRE([LT_AC_PROG_SED])dnl
+-AC_ARG_WITH([tags],
+- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+- [include additional configurations @<:@automatic@:>@])],
+- [tagnames="$withval"])
++])# AC_PATH_TOOL_PREFIX
+
+-if test -f "$ltmain" && test -n "$tagnames"; then
+- if test ! -f "${ofile}"; then
+- AC_MSG_WARN([output file `$ofile' does not exist])
+- fi
+
+- if test -z "$LTCC"; then
+- eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+- if test -z "$LTCC"; then
+- AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+- else
+- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+- fi
+- fi
+- if test -z "$LTCFLAGS"; then
+- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++# AC_PATH_MAGIC
++# -------------
++# find a file program which can recognize a shared library
++AC_DEFUN([AC_PATH_MAGIC],
++[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++ if test -n "$ac_tool_prefix"; then
++ AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
++ else
++ MAGIC_CMD=:
+ fi
++fi
++])# AC_PATH_MAGIC
+
+- # Extract list of available tagged configurations in $ofile.
+- # Note that this assumes the entire list is on one line.
+- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+
+- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+- for tagname in $tagnames; do
++# AC_PROG_LD
++# ----------
++# find the pathname to the GNU or non-GNU linker
++AC_DEFUN([AC_PROG_LD],
++[AC_ARG_WITH([gnu-ld],
++ [AC_HELP_STRING([--with-gnu-ld],
++ [assume the C compiler uses GNU ld @<:@default=no@:>@])],
++ [test "$withval" = no || with_gnu_ld=yes],
++ [with_gnu_ld=no])
++AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++ac_prog=ld
++if test "$GCC" = yes; then
++ # Check if gcc -print-prog-name=ld gives a path.
++ AC_MSG_CHECKING([for ld used by $CC])
++ case $host in
++ *-*-mingw*)
++ # gcc leaves a trailing carriage return which upsets mingw
++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++ *)
++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++ esac
++ case $ac_prog in
++ # Accept absolute paths.
++ [[\\/]]* | ?:[[\\/]]*)
++ re_direlt='/[[^/]][[^/]]*/\.\./'
++ # Canonicalize the pathname of ld
++ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++ done
++ test -z "$LD" && LD="$ac_prog"
++ ;;
++ "")
++ # If it fails, then pretend we aren't using GCC.
++ ac_prog=ld
++ ;;
++ *)
++ # If it is relative, then search for the first ld in PATH.
++ with_gnu_ld=unknown
++ ;;
++ esac
++elif test "$with_gnu_ld" = yes; then
++ AC_MSG_CHECKING([for GNU ld])
++else
++ AC_MSG_CHECKING([for non-GNU ld])
++fi
++AC_CACHE_VAL(lt_cv_path_LD,
++[if test -z "$LD"; then
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++ for ac_dir in $PATH; do
+ IFS="$lt_save_ifs"
+- # Check whether tagname contains only valid characters
+- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
+- "") ;;
+- *) AC_MSG_ERROR([invalid tag name: $tagname])
++ test -z "$ac_dir" && ac_dir=.
++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++ lt_cv_path_LD="$ac_dir/$ac_prog"
++ # Check to see if the program is GNU ld. I'd rather use --version,
++ # but apparently some variants of GNU ld only accept -v.
++ # Break only if it was the GNU/non-GNU ld that we prefer.
++ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++ *GNU* | *'with BFD'*)
++ test "$with_gnu_ld" != no && break
+ ;;
+- esac
+-
+- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+- then
+- AC_MSG_ERROR([tag name \"$tagname\" already exists])
++ *)
++ test "$with_gnu_ld" != yes && break
++ ;;
++ esac
+ fi
++ done
++ IFS="$lt_save_ifs"
++else
++ lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi])
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++ AC_MSG_RESULT($LD)
++else
++ AC_MSG_RESULT(no)
++fi
++test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
++AC_PROG_LD_GNU
++])# AC_PROG_LD
+
+- # Update the list of available tags.
+- if test -n "$tagname"; then
+- echo appending configuration tag \"$tagname\" to $ofile
+
+- case $tagname in
+- CXX)
+- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+- (test "X$CXX" != "Xg++"))) ; then
+- AC_LIBTOOL_LANG_CXX_CONFIG
+- else
+- tagname=""
+- fi
+- ;;
++# AC_PROG_LD_GNU
++# --------------
++AC_DEFUN([AC_PROG_LD_GNU],
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++ lt_cv_prog_gnu_ld=yes
++ ;;
++*)
++ lt_cv_prog_gnu_ld=no
++ ;;
++esac])
++with_gnu_ld=$lt_cv_prog_gnu_ld
++])# AC_PROG_LD_GNU
+
+- F77)
+- if test -n "$F77" && test "X$F77" != "Xno"; then
+- AC_LIBTOOL_LANG_F77_CONFIG
+- else
+- tagname=""
+- fi
+- ;;
+
+- GCJ)
+- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+- AC_LIBTOOL_LANG_GCJ_CONFIG
+- else
+- tagname=""
+- fi
+- ;;
++# AC_PROG_LD_RELOAD_FLAG
++# ----------------------
++# find reload flag for linker
++# -- PORTME Some linkers may need a different reload flag.
++AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
++[AC_CACHE_CHECK([for $LD option to reload object files],
++ lt_cv_ld_reload_flag,
++ [lt_cv_ld_reload_flag='-r'])
++reload_flag=$lt_cv_ld_reload_flag
++case $reload_flag in
++"" | " "*) ;;
++*) reload_flag=" $reload_flag" ;;
++esac
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++ darwin*)
++ if test "$GCC" = yes; then
++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++ else
++ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++ fi
++ ;;
++esac
++])# AC_PROG_LD_RELOAD_FLAG
+
+- RC)
+- AC_LIBTOOL_LANG_RC_CONFIG
+- ;;
+
+- *)
+- AC_MSG_ERROR([Unsupported tag name: $tagname])
+- ;;
+- esac
++# AC_DEPLIBS_CHECK_METHOD
++# -----------------------
++# how to check for library dependencies
++# -- PORTME fill in with the dynamic library characteristics
++AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
++[AC_CACHE_CHECK([how to recognize dependent libraries],
++lt_cv_deplibs_check_method,
++[lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
+
+- # Append the new tag name to the list of available tags.
+- if test -n "$tagname" ; then
+- available_tags="$available_tags $tagname"
+- fi
+- fi
+- done
+- IFS="$lt_save_ifs"
++case $host_os in
++aix[[4-9]]*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
+
+- # Now substitute the updated list of available tags.
+- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+- mv "${ofile}T" "$ofile"
+- chmod +x "$ofile"
++beos*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
++bsdi[[45]]*)
++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
++ lt_cv_file_magic_cmd='/usr/bin/file -L'
++ lt_cv_file_magic_test_file=/shlib/libc.so
++ ;;
++
++cygwin*)
++ # func_win32_libid is a shell function defined in ltmain.sh
++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_file_magic_cmd='func_win32_libid'
++ ;;
++
++mingw* | pw32*)
++ # Base MSYS/MinGW do not provide the 'file' command needed by
++ # func_win32_libid shell function, so use a weaker test based on 'objdump',
++ # unless we find 'file', for example because we are cross-compiling.
++ if ( file / ) >/dev/null 2>&1; then
++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+- rm -f "${ofile}T"
+- AC_MSG_ERROR([unable to update list of available tagged configurations.])
++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ fi
+-fi
+-])# _LT_AC_TAGCONFIG
++ ;;
+
++darwin* | rhapsody*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
+
+-# AC_LIBTOOL_DLOPEN
+-# -----------------
+-# enable checks for dlopen support
+-AC_DEFUN([AC_LIBTOOL_DLOPEN],
+- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_DLOPEN
++freebsd* | dragonfly*)
++ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++ case $host_cpu in
++ i*86 )
++ # Not sure whether the presence of OpenBSD here was a mistake.
++ # Let's accept both of them until this is cleared up.
++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
++ lt_cv_file_magic_cmd=/usr/bin/file
++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++ ;;
++ esac
++ else
++ lt_cv_deplibs_check_method=pass_all
++ fi
++ ;;
+
++gnu*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
+
+-# AC_LIBTOOL_WIN32_DLL
+-# --------------------
+-# declare package support for building win32 DLLs
+-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_WIN32_DLL
++hpux10.20* | hpux11*)
++ lt_cv_file_magic_cmd=/usr/bin/file
++ case $host_cpu in
++ ia64*)
++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
++ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
++ ;;
++ hppa*64*)
++ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
++ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
++ ;;
++ *)
++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
++ lt_cv_file_magic_test_file=/usr/lib/libc.sl
++ ;;
++ esac
++ ;;
+
++interix[[3-9]]*)
++ # 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)$'
++ ;;
+
+-# AC_ENABLE_SHARED([DEFAULT])
+-# ---------------------------
+-# implement the --enable-shared flag
+-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_SHARED],
+-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([shared],
+- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+- [p=${PACKAGE-default}
+- case $enableval in
+- yes) enable_shared=yes ;;
+- no) enable_shared=no ;;
+- *)
+- enable_shared=no
+- # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+- for pkg in $enableval; do
+- IFS="$lt_save_ifs"
+- if test "X$pkg" = "X$p"; then
+- enable_shared=yes
+- fi
+- done
+- IFS="$lt_save_ifs"
+- ;;
+- esac],
+- [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+-])# AC_ENABLE_SHARED
++irix5* | irix6* | nonstopux*)
++ case $LD in
++ *-32|*"-32 ") libmagic=32-bit;;
++ *-n32|*"-n32 ") libmagic=N32;;
++ *-64|*"-64 ") libmagic=64-bit;;
++ *) libmagic=never-match;;
++ esac
++ lt_cv_deplibs_check_method=pass_all
++ ;;
+
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
+
+-# AC_DISABLE_SHARED
+-# -----------------
+-# set the default shared flag to --disable-shared
+-AC_DEFUN([AC_DISABLE_SHARED],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_SHARED(no)
+-])# AC_DISABLE_SHARED
++netbsd* | netbsdelf*-gnu)
++ 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
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
++ fi
++ ;;
+
++newos6*)
++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
++ lt_cv_file_magic_cmd=/usr/bin/file
++ lt_cv_file_magic_test_file=/usr/lib/libnls.so
++ ;;
+
+-# AC_ENABLE_STATIC([DEFAULT])
+-# ---------------------------
+-# implement the --enable-static flag
+-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_STATIC],
+-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([static],
+- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
+- [p=${PACKAGE-default}
+- case $enableval in
+- yes) enable_static=yes ;;
+- no) enable_static=no ;;
+- *)
+- enable_static=no
+- # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+- for pkg in $enableval; do
+- IFS="$lt_save_ifs"
+- if test "X$pkg" = "X$p"; then
+- enable_static=yes
+- fi
+- done
+- IFS="$lt_save_ifs"
+- ;;
+- esac],
+- [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+-])# AC_ENABLE_STATIC
++nto-qnx*)
++ lt_cv_deplibs_check_method=unknown
++ ;;
+
++openbsd*)
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
++ else
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++ fi
++ ;;
+
+-# AC_DISABLE_STATIC
+-# -----------------
+-# set the default static flag to --disable-static
+-AC_DEFUN([AC_DISABLE_STATIC],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_STATIC(no)
+-])# AC_DISABLE_STATIC
++osf3* | osf4* | osf5*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
+
++rdos*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
+
+-# AC_ENABLE_FAST_INSTALL([DEFAULT])
+-# ---------------------------------
+-# implement the --enable-fast-install flag
+-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([fast-install],
+- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+- [p=${PACKAGE-default}
+- case $enableval in
+- yes) enable_fast_install=yes ;;
+- no) enable_fast_install=no ;;
+- *)
+- enable_fast_install=no
+- # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+- for pkg in $enableval; do
+- IFS="$lt_save_ifs"
+- if test "X$pkg" = "X$p"; then
+- enable_fast_install=yes
+- fi
+- done
+- IFS="$lt_save_ifs"
+- ;;
+- esac],
+- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+-])# AC_ENABLE_FAST_INSTALL
++solaris*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
+
++sysv4 | sysv4.3*)
++ case $host_vendor in
++ motorola)
++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++ ;;
++ ncr)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++ sequent)
++ lt_cv_file_magic_cmd='/bin/file'
++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
++ ;;
++ sni)
++ lt_cv_file_magic_cmd='/bin/file'
++ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
++ lt_cv_file_magic_test_file=/lib/libc.so
++ ;;
++ siemens)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++ pc)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++ esac
++ ;;
+
+-# AC_DISABLE_FAST_INSTALL
+-# -----------------------
+-# set the default to --disable-fast-install
+-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_FAST_INSTALL(no)
+-])# AC_DISABLE_FAST_INSTALL
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++esac
++])
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
++])# AC_DEPLIBS_CHECK_METHOD
+
+
+-# AC_LIBTOOL_PICMODE([MODE])
+-# --------------------------
+-# implement the --with-pic flag
+-# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
+-AC_DEFUN([AC_LIBTOOL_PICMODE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-pic_mode=ifelse($#,1,$1,default)
+-])# AC_LIBTOOL_PICMODE
++# AC_PROG_NM
++# ----------
++# find the pathname to a BSD-compatible name lister
++AC_DEFUN([AC_PROG_NM],
++[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
++[if test -n "$NM"; then
++ # Let the user override the test.
++ lt_cv_path_NM="$NM"
++else
++ lt_nm_to_check="${ac_tool_prefix}nm"
++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++ lt_nm_to_check="$lt_nm_to_check nm"
++ fi
++ for lt_tmp_nm in $lt_nm_to_check; do
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++ IFS="$lt_save_ifs"
++ test -z "$ac_dir" && ac_dir=.
++ tmp_nm="$ac_dir/$lt_tmp_nm"
++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++ # Check to see if the nm accepts a BSD-compat flag.
++ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++ # nm: unknown option "B" ignored
++ # Tru64's nm complains that /dev/null is an invalid object file
++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++ */dev/null* | *'Invalid file or object type'*)
++ lt_cv_path_NM="$tmp_nm -B"
++ break
++ ;;
++ *)
++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++ */dev/null*)
++ lt_cv_path_NM="$tmp_nm -p"
++ break
++ ;;
++ *)
++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++ continue # so that we can try to find one that supports BSD flags
++ ;;
++ esac
++ ;;
++ esac
++ fi
++ done
++ IFS="$lt_save_ifs"
++ done
++ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++fi])
++NM="$lt_cv_path_NM"
++])# AC_PROG_NM
+
+
+-# AC_PROG_EGREP
++# AC_CHECK_LIBM
+ # -------------
+-# This is predefined starting with Autoconf 2.54, so this conditional
+-# definition can be removed once we require Autoconf 2.54 or later.
+-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+- then ac_cv_prog_egrep='grep -E'
+- else ac_cv_prog_egrep='egrep'
+- fi])
+- EGREP=$ac_cv_prog_egrep
+- AC_SUBST([EGREP])
+-])])
+-
+-
+-# AC_PATH_TOOL_PREFIX
+-# -------------------
+-# find a file program which can recognize shared library
+-AC_DEFUN([AC_PATH_TOOL_PREFIX],
+-[AC_REQUIRE([AC_PROG_EGREP])dnl
+-AC_MSG_CHECKING([for $1])
+-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+-[case $MAGIC_CMD in
+-[[\\/*] | ?:[\\/]*])
+- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++# check for math library
++AC_DEFUN([AC_CHECK_LIBM],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++LIBM=
++case $host in
++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++ # These system don't have libm, or don't need it
++ ;;
++*-ncr-sysv4.3*)
++ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
++ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+ ;;
+ *)
+- lt_save_MAGIC_CMD="$MAGIC_CMD"
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-dnl $ac_dummy forces splitting on constant user-supplied paths.
+-dnl POSIX.2 word splitting is done only on the output of word expansions,
+-dnl not every word. This closes a longstanding sh security hole.
+- ac_dummy="ifelse([$2], , $PATH, [$2])"
+- for ac_dir in $ac_dummy; do
+- IFS="$lt_save_ifs"
+- test -z "$ac_dir" && ac_dir=.
+- if test -f $ac_dir/$1; then
+- lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+- if test -n "$file_magic_test_file"; then
+- case $deplibs_check_method in
+- "file_magic "*)
+- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+- $EGREP "$file_magic_regex" > /dev/null; then
+- :
+- else
+- cat <<EOF 1>&2
+-
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such. This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem. Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool at gnu.org
+-
+-EOF
+- fi ;;
+- esac
+- fi
+- break
+- fi
+- done
+- IFS="$lt_save_ifs"
+- MAGIC_CMD="$lt_save_MAGIC_CMD"
++ AC_CHECK_LIB(m, cos, LIBM="-lm")
+ ;;
+-esac])
+-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-if test -n "$MAGIC_CMD"; then
+- AC_MSG_RESULT($MAGIC_CMD)
+-else
+- AC_MSG_RESULT(no)
+-fi
+-])# AC_PATH_TOOL_PREFIX
++esac
++])# AC_CHECK_LIBM
+
+
+-# AC_PATH_MAGIC
+-# -------------
+-# find a file program which can recognize a shared library
+-AC_DEFUN([AC_PATH_MAGIC],
+-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+-if test -z "$lt_cv_path_MAGIC_CMD"; then
+- if test -n "$ac_tool_prefix"; then
+- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+- else
+- MAGIC_CMD=:
+- fi
+-fi
+-])# AC_PATH_MAGIC
++# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
++# -----------------------------------
++# sets LIBLTDL to the link flags for the libltdl convenience library and
++# LTDLINCL to the include flags for the libltdl header and adds
++# --enable-ltdl-convenience to the configure arguments. Note that
++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
++# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!). If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
++AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++ case $enable_ltdl_convenience in
++ no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
++ "") enable_ltdl_convenience=yes
++ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
++ esac
++ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
++ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++ # For backwards non-gettext consistent compatibility...
++ INCLTDL="$LTDLINCL"
++])# AC_LIBLTDL_CONVENIENCE
+
+
+-# AC_PROG_LD
+-# ----------
+-# find the pathname to the GNU or non-GNU linker
+-AC_DEFUN([AC_PROG_LD],
+-[AC_ARG_WITH([gnu-ld],
+- [AC_HELP_STRING([--with-gnu-ld],
+- [assume the C compiler uses GNU ld @<:@default=no@:>@])],
+- [test "$withval" = no || with_gnu_ld=yes],
+- [with_gnu_ld=no])
+-AC_REQUIRE([LT_AC_PROG_SED])dnl
+-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-ac_prog=ld
+-if test "$GCC" = yes; then
+- # Check if gcc -print-prog-name=ld gives a path.
+- AC_MSG_CHECKING([for ld used by $CC])
+- case $host in
+- *-*-mingw*)
+- # gcc leaves a trailing carriage return which upsets mingw
+- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+- *)
+- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+- esac
+- case $ac_prog in
+- # Accept absolute paths.
+- [[\\/]]* | ?:[[\\/]]*)
+- re_direlt='/[[^/]][[^/]]*/\.\./'
+- # Canonicalize the pathname of ld
+- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+- done
+- test -z "$LD" && LD="$ac_prog"
+- ;;
+- "")
+- # If it fails, then pretend we aren't using GCC.
+- ac_prog=ld
+- ;;
+- *)
+- # If it is relative, then search for the first ld in PATH.
+- with_gnu_ld=unknown
+- ;;
+- esac
+-elif test "$with_gnu_ld" = yes; then
+- AC_MSG_CHECKING([for GNU ld])
+-else
+- AC_MSG_CHECKING([for non-GNU ld])
+-fi
+-AC_CACHE_VAL(lt_cv_path_LD,
+-[if test -z "$LD"; then
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH; do
+- IFS="$lt_save_ifs"
+- test -z "$ac_dir" && ac_dir=.
+- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+- lt_cv_path_LD="$ac_dir/$ac_prog"
+- # Check to see if the program is GNU ld. I'd rather use --version,
+- # but apparently some variants of GNU ld only accept -v.
+- # Break only if it was the GNU/non-GNU ld that we prefer.
+- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+- *GNU* | *'with BFD'*)
+- test "$with_gnu_ld" != no && break
+- ;;
+- *)
+- test "$with_gnu_ld" != yes && break
+- ;;
+- esac
+- fi
+- done
+- IFS="$lt_save_ifs"
+-else
+- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+-fi])
+-LD="$lt_cv_path_LD"
+-if test -n "$LD"; then
+- AC_MSG_RESULT($LD)
+-else
+- AC_MSG_RESULT(no)
+-fi
+-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+-AC_PROG_LD_GNU
+-])# AC_PROG_LD
++# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
++# -----------------------------------
++# sets LIBLTDL to the link flags for the libltdl installable library and
++# LTDLINCL to the include flags for the libltdl header and adds
++# --enable-ltdl-install to the configure arguments. Note that
++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!). If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
++# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
++AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++ AC_CHECK_LIB(ltdl, lt_dlinit,
++ [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
++ [if test x"$enable_ltdl_install" = xno; then
++ AC_MSG_WARN([libltdl not installed, but installation disabled])
++ else
++ enable_ltdl_install=yes
++ fi
++ ])
++ if test x"$enable_ltdl_install" = x"yes"; then
++ ac_configure_args="$ac_configure_args --enable-ltdl-install"
++ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
++ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++ else
++ ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
++ LIBLTDL="-lltdl"
++ LTDLINCL=
++ fi
++ # For backwards non-gettext consistent compatibility...
++ INCLTDL="$LTDLINCL"
++])# AC_LIBLTDL_INSTALLABLE
+
+
+-# AC_PROG_LD_GNU
++# AC_LIBTOOL_CXX
+ # --------------
+-AC_DEFUN([AC_PROG_LD_GNU],
+-[AC_REQUIRE([AC_PROG_EGREP])dnl
+-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+-case `$LD -v 2>&1 </dev/null` in
+-*GNU* | *'with BFD'*)
+- lt_cv_prog_gnu_ld=yes
+- ;;
+-*)
+- lt_cv_prog_gnu_ld=no
+- ;;
+-esac])
+-with_gnu_ld=$lt_cv_prog_gnu_ld
+-])# AC_PROG_LD_GNU
++# enable support for C++ libraries
++AC_DEFUN([AC_LIBTOOL_CXX],
++[AC_REQUIRE([_LT_AC_LANG_CXX])
++])# AC_LIBTOOL_CXX
+
+
+-# AC_PROG_LD_RELOAD_FLAG
+-# ----------------------
+-# find reload flag for linker
+-# -- PORTME Some linkers may need a different reload flag.
+-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
+-[AC_CACHE_CHECK([for $LD option to reload object files],
+- lt_cv_ld_reload_flag,
+- [lt_cv_ld_reload_flag='-r'])
+-reload_flag=$lt_cv_ld_reload_flag
+-case $reload_flag in
+-"" | " "*) ;;
+-*) reload_flag=" $reload_flag" ;;
+-esac
+-reload_cmds='$LD$reload_flag -o $output$reload_objs'
+-case $host_os in
+- darwin*)
+- if test "$GCC" = yes; then
+- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+- else
+- reload_cmds='$LD$reload_flag -o $output$reload_objs'
+- fi
+- ;;
+-esac
+-])# AC_PROG_LD_RELOAD_FLAG
++# _LT_AC_LANG_CXX
++# ---------------
++AC_DEFUN([_LT_AC_LANG_CXX],
++[AC_REQUIRE([AC_PROG_CXX])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
++])# _LT_AC_LANG_CXX
+
++# _LT_AC_PROG_CXXCPP
++# ------------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
++ AC_PROG_CXXCPP
++fi
++])# _LT_AC_PROG_CXXCPP
+
+-# AC_DEPLIBS_CHECK_METHOD
+-# -----------------------
+-# how to check for library dependencies
+-# -- PORTME fill in with the dynamic library characteristics
+-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognize dependent libraries],
+-lt_cv_deplibs_check_method,
+-[lt_cv_file_magic_cmd='$MAGIC_CMD'
+-lt_cv_file_magic_test_file=
+-lt_cv_deplibs_check_method='unknown'
+-# Need to set the preceding variable on all platforms that support
+-# interlibrary dependencies.
+-# 'none' -- dependencies not supported.
+-# `unknown' -- same as none, but documents that we really don't know.
+-# 'pass_all' -- all dependencies passed with no checks.
+-# 'test_compile' -- check by making test program.
+-# 'file_magic [[regex]]' -- check by looking for files in library path
+-# which responds to the $file_magic_cmd with a given extended regex.
+-# If you have `file' or equivalent on your system and you're not sure
+-# whether `pass_all' will *always* work, you probably want this one.
++# AC_LIBTOOL_F77
++# --------------
++# enable support for Fortran 77 libraries
++AC_DEFUN([AC_LIBTOOL_F77],
++[AC_REQUIRE([_LT_AC_LANG_F77])
++])# AC_LIBTOOL_F77
+
+-case $host_os in
+-aix[[4-9]]*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+
+-beos*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
++# _LT_AC_LANG_F77
++# ---------------
++AC_DEFUN([_LT_AC_LANG_F77],
++[AC_REQUIRE([AC_PROG_F77])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
++])# _LT_AC_LANG_F77
+
+-bsdi[[45]]*)
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+- lt_cv_file_magic_cmd='/usr/bin/file -L'
+- lt_cv_file_magic_test_file=/shlib/libc.so
+- ;;
+
+-cygwin*)
+- # func_win32_libid is a shell function defined in ltmain.sh
+- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+- lt_cv_file_magic_cmd='func_win32_libid'
+- ;;
++# AC_LIBTOOL_GCJ
++# --------------
++# enable support for GCJ libraries
++AC_DEFUN([AC_LIBTOOL_GCJ],
++[AC_REQUIRE([_LT_AC_LANG_GCJ])
++])# AC_LIBTOOL_GCJ
+
+-mingw* | pw32*)
+- # Base MSYS/MinGW do not provide the 'file' command needed by
+- # func_win32_libid shell function, so use a weaker test based on 'objdump',
+- # unless we find 'file', for example because we are cross-compiling.
+- if ( file / ) >/dev/null 2>&1; then
+- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+- lt_cv_file_magic_cmd='func_win32_libid'
+- else
+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+- lt_cv_file_magic_cmd='$OBJDUMP -f'
+- fi
+- ;;
+
+-darwin* | rhapsody*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
++# _LT_AC_LANG_GCJ
++# ---------------
++AC_DEFUN([_LT_AC_LANG_GCJ],
++[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
++ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
++ [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
++ [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
++ [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
++])# _LT_AC_LANG_GCJ
+
+-freebsd* | dragonfly*)
+- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+- case $host_cpu in
+- i*86 )
+- # Not sure whether the presence of OpenBSD here was a mistake.
+- # Let's accept both of them until this is cleared up.
+- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+- lt_cv_file_magic_cmd=/usr/bin/file
+- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+- ;;
+- esac
+- else
+- lt_cv_deplibs_check_method=pass_all
+- fi
+- ;;
+
+-gnu*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
++# AC_LIBTOOL_RC
++# -------------
++# enable support for Windows resource files
++AC_DEFUN([AC_LIBTOOL_RC],
++[AC_REQUIRE([LT_AC_PROG_RC])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
++])# AC_LIBTOOL_RC
+
+-hpux10.20* | hpux11*)
+- lt_cv_file_magic_cmd=/usr/bin/file
+- case $host_cpu in
+- ia64*)
+- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+- ;;
+- hppa*64*)
+- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+- ;;
+- *)
+- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+- lt_cv_file_magic_test_file=/usr/lib/libc.sl
+- ;;
+- esac
+- ;;
+
+-interix[[3-9]]*)
+- # 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)$'
+- ;;
++# AC_LIBTOOL_LANG_C_CONFIG
++# ------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined. Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
++AC_DEFUN([_LT_AC_LANG_C_CONFIG],
++[lt_save_CC="$CC"
++AC_LANG_PUSH(C)
+
+-irix5* | irix6* | nonstopux*)
+- case $LD in
+- *-32|*"-32 ") libmagic=32-bit;;
+- *-n32|*"-n32 ") libmagic=N32;;
+- *-64|*"-64 ") libmagic=64-bit;;
+- *) libmagic=never-match;;
+- esac
+- lt_cv_deplibs_check_method=pass_all
+- ;;
++# Source file extension for C test sources.
++ac_ext=c
+
+-# This must be Linux ELF.
+-linux* | k*bsd*-gnu)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
++# Object file extension for compiled C test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
-netbsd*)
-+netbsd* | netbsdelf*-gnu)
- 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
-@@ -4521,7 +4186,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
+- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+- fi
+- ;;
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;"
+
+-newos6*)
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+- lt_cv_file_magic_cmd=/usr/bin/file
+- lt_cv_file_magic_test_file=/usr/lib/libnls.so
+- ;;
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(){return(0);}'
+
+-nto-qnx*)
+- lt_cv_deplibs_check_method=unknown
+- ;;
++_LT_AC_SYS_COMPILER
+
+-openbsd*)
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+- else
+- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+- fi
+- ;;
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
+
+-osf3* | osf4* | osf5*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++AC_LIBTOOL_SYS_LIB_STRIP
++AC_LIBTOOL_DLOPEN_SELF
+
+-rdos*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
++# Report which library types will actually be built
++AC_MSG_CHECKING([if libtool supports shared libraries])
++AC_MSG_RESULT([$can_build_shared])
+
+-solaris*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
++AC_MSG_CHECKING([whether to build shared libraries])
++test "$can_build_shared" = "no" && enable_shared=no
+
+-sysv4 | sysv4.3*)
+- case $host_vendor in
+- motorola)
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+- ;;
+- ncr)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+- sequent)
+- lt_cv_file_magic_cmd='/bin/file'
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+- ;;
+- sni)
+- lt_cv_file_magic_cmd='/bin/file'
+- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+- lt_cv_file_magic_test_file=/lib/libc.so
+- ;;
+- siemens)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+- pc)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+- esac
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case $host_os in
++aix3*)
++ test "$enable_shared" = yes && enable_static=no
++ if test -n "$RANLIB"; then
++ archive_cmds="$archive_cmds~\$RANLIB \$lib"
++ postinstall_cmds='$RANLIB $lib'
++ fi
+ ;;
+
+-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
++aix[[4-9]]*)
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
++ fi
++ ;;
+ esac
+-])
+-file_magic_cmd=$lt_cv_file_magic_cmd
+-deplibs_check_method=$lt_cv_deplibs_check_method
+-test -z "$deplibs_check_method" && deplibs_check_method=unknown
+-])# AC_DEPLIBS_CHECK_METHOD
++AC_MSG_RESULT([$enable_shared])
+
+-
+-# AC_PROG_NM
+-# ----------
+-# find the pathname to a BSD-compatible name lister
+-AC_DEFUN([AC_PROG_NM],
+-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
+-[if test -n "$NM"; then
+- # Let the user override the test.
+- lt_cv_path_NM="$NM"
+-else
+- lt_nm_to_check="${ac_tool_prefix}nm"
+- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+- lt_nm_to_check="$lt_nm_to_check nm"
+- fi
+- for lt_tmp_nm in $lt_nm_to_check; do
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+- IFS="$lt_save_ifs"
+- test -z "$ac_dir" && ac_dir=.
+- tmp_nm="$ac_dir/$lt_tmp_nm"
+- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+- # Check to see if the nm accepts a BSD-compat flag.
+- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+- # nm: unknown option "B" ignored
+- # Tru64's nm complains that /dev/null is an invalid object file
+- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+- */dev/null* | *'Invalid file or object type'*)
+- lt_cv_path_NM="$tmp_nm -B"
+- break
+- ;;
+- *)
+- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+- */dev/null*)
+- lt_cv_path_NM="$tmp_nm -p"
+- break
+- ;;
+- *)
+- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+- continue # so that we can try to find one that supports BSD flags
+- ;;
+- esac
+- ;;
+- esac
+- fi
+- done
+- IFS="$lt_save_ifs"
+- done
+- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+-fi])
+-NM="$lt_cv_path_NM"
+-])# AC_PROG_NM
+-
+-
+-# AC_CHECK_LIBM
+-# -------------
+-# check for math library
+-AC_DEFUN([AC_CHECK_LIBM],
+-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-LIBM=
+-case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+- # These system don't have libm, or don't need it
+- ;;
+-*-ncr-sysv4.3*)
+- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+- ;;
+-*)
+- AC_CHECK_LIB(m, cos, LIBM="-lm")
+- ;;
+-esac
+-])# AC_CHECK_LIBM
+-
+-
+-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+-# -----------------------------------
+-# sets LIBLTDL to the link flags for the libltdl convenience library and
+-# LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments. Note that
+-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
+-# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
+-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+-# (note the single quotes!). If your package is not flat and you're not
+-# using automake, define top_builddir and top_srcdir appropriately in
+-# the Makefiles.
+-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+- case $enable_ltdl_convenience in
+- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+- "") enable_ltdl_convenience=yes
+- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+- esac
+- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+- # For backwards non-gettext consistent compatibility...
+- INCLTDL="$LTDLINCL"
+-])# AC_LIBLTDL_CONVENIENCE
+-
+-
+-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+-# -----------------------------------
+-# sets LIBLTDL to the link flags for the libltdl installable library and
+-# LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments. Note that
+-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
+-# and an installed libltdl is not found, it is assumed to be `libltdl'.
+-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+-# '${top_srcdir}/' (note the single quotes!). If your package is not
+-# flat and you're not using automake, define top_builddir and top_srcdir
+-# appropriately in the Makefiles.
+-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+- AC_CHECK_LIB(ltdl, lt_dlinit,
+- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+- [if test x"$enable_ltdl_install" = xno; then
+- AC_MSG_WARN([libltdl not installed, but installation disabled])
+- else
+- enable_ltdl_install=yes
+- fi
+- ])
+- if test x"$enable_ltdl_install" = x"yes"; then
+- ac_configure_args="$ac_configure_args --enable-ltdl-install"
+- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+- else
+- ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+- LIBLTDL="-lltdl"
+- LTDLINCL=
+- fi
+- # For backwards non-gettext consistent compatibility...
+- INCLTDL="$LTDLINCL"
+-])# AC_LIBLTDL_INSTALLABLE
+-
+-
+-# AC_LIBTOOL_CXX
+-# --------------
+-# enable support for C++ libraries
+-AC_DEFUN([AC_LIBTOOL_CXX],
+-[AC_REQUIRE([_LT_AC_LANG_CXX])
+-])# AC_LIBTOOL_CXX
+-
+-
+-# _LT_AC_LANG_CXX
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_CXX],
+-[AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+-])# _LT_AC_LANG_CXX
+-
+-# _LT_AC_PROG_CXXCPP
+-# ------------------
+-AC_DEFUN([_LT_AC_PROG_CXXCPP],
+-[
+-AC_REQUIRE([AC_PROG_CXX])
+-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+- (test "X$CXX" != "Xg++"))) ; then
+- AC_PROG_CXXCPP
+-fi
+-])# _LT_AC_PROG_CXXCPP
+-
+-# AC_LIBTOOL_F77
+-# --------------
+-# enable support for Fortran 77 libraries
+-AC_DEFUN([AC_LIBTOOL_F77],
+-[AC_REQUIRE([_LT_AC_LANG_F77])
+-])# AC_LIBTOOL_F77
+-
+-
+-# _LT_AC_LANG_F77
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_F77],
+-[AC_REQUIRE([AC_PROG_F77])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
+-])# _LT_AC_LANG_F77
+-
+-
+-# AC_LIBTOOL_GCJ
+-# --------------
+-# enable support for GCJ libraries
+-AC_DEFUN([AC_LIBTOOL_GCJ],
+-[AC_REQUIRE([_LT_AC_LANG_GCJ])
+-])# AC_LIBTOOL_GCJ
+-
+-
+-# _LT_AC_LANG_GCJ
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_GCJ],
+-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
+-])# _LT_AC_LANG_GCJ
+-
+-
+-# AC_LIBTOOL_RC
+-# -------------
+-# enable support for Windows resource files
+-AC_DEFUN([AC_LIBTOOL_RC],
+-[AC_REQUIRE([LT_AC_PROG_RC])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+-])# AC_LIBTOOL_RC
+-
+-
+-# AC_LIBTOOL_LANG_C_CONFIG
+-# ------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined. Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+-[lt_save_CC="$CC"
+-AC_LANG_PUSH(C)
+-
+-# Source file extension for C test sources.
+-ac_ext=c
+-
+-# Object file extension for compiled C test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
+-
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;"
+-
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}'
+-
+-_LT_AC_SYS_COMPILER
+-
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
+-
+-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF
+-
+-# Report which library types will actually be built
+-AC_MSG_CHECKING([if libtool supports shared libraries])
+-AC_MSG_RESULT([$can_build_shared])
+-
+-AC_MSG_CHECKING([whether to build shared libraries])
+-test "$can_build_shared" = "no" && enable_shared=no
+-
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
+-case $host_os in
+-aix3*)
+- test "$enable_shared" = yes && enable_static=no
+- if test -n "$RANLIB"; then
+- archive_cmds="$archive_cmds~\$RANLIB \$lib"
+- postinstall_cmds='$RANLIB $lib'
+- fi
+- ;;
+-
+-aix[[4-9]]*)
+- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+- test "$enable_shared" = yes && enable_static=no
+- fi
+- ;;
+-esac
+-AC_MSG_RESULT([$enable_shared])
+-
+-AC_MSG_CHECKING([whether to build static libraries])
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-AC_MSG_RESULT([$enable_static])
++AC_MSG_CHECKING([whether to build static libraries])
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++AC_MSG_RESULT([$enable_static])
+
+ AC_LIBTOOL_CONFIG($1)
+
+@@ -5108,7 +4190,7 @@ case $host_os in
;;
esac
;;
@@ -1916,7 +7588,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -6213,7 +5878,7 @@
+@@ -6800,7 +5882,7 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -1925,15 +7597,42 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -6302,1368 +5967,2042 @@
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
- case $host_os in
-- aix*)
-- # All AIX code is PIC.
-- if test "$host_cpu" = ia64; then
-- # AIX 5 now supports IA64 processor
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -6865,1548 +5947,2481 @@ AC_MSG_CHECKING([for $compiler option to
+ *)
+ ;;
+ esac
+- ;;
+- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+- case $cc_basename in
+- CC*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- ;;
++ ;;
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ case $cc_basename in
++ CC*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++ esac
++ ;;
++ vxworks*)
++ ;;
++ *)
++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++ ;;
++ esac
++ fi
++],
++[
++ if test "$GCC" = yes; then
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++
++ case $host_os in
+ aix*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
@@ -2330,21 +8029,14 @@
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
- fi
- ;;
-
- amigaos*)
-- # FIXME: we need at least 68020 code to build shared libraries, but
-- # adding the `-m68020' flag to GCC prevents building anything better,
-- # like `-m68040'.
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-- ;;
++ fi
++ ;;
++
++ amigaos*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-
-- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-- # PIC is the default for these OSes.
++
+ # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
+ # that the semantics of dynamic libraries on AmigaOS, at least up
+ # to version 4, is to share data among multiple programs linked
@@ -2352,15 +8044,8 @@
+ # behavior of shared libraries on other platforms, we can't use
+ # them.
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-
-- mingw* | cygwin* | pw32* | os2*)
-- # 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).
-- # Although the cygwin gcc ignores -fPIC, still need this for old-style
-- # (--disable-auto-import) libraries
-- m4_if([$1], [GCJ], [],
-- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++ ;;
++
+ beos*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -2370,12 +8055,8 @@
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
- ;;
-
-- darwin* | rhapsody*)
-- # PIC is the default on this platform
-- # Common symbols not allowed in MH_DYLIB files
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++ ;;
++
+ cygwin* | mingw* | pw32*)
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
@@ -2399,11 +8080,9 @@
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
- ;;
-
- interix[[3-9]]*)
-- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-- # Instead, we relocate shared libraries at runtime.
++ ;;
++
++ interix[[3-9]]*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -2416,13 +8095,8 @@
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- msdosdjgpp*)
-- # Just because we use GCC doesn't mean we suddenly get shared libraries
-- # on systems that don't support them.
-- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-- enable_shared=no
++ ;;
++
+ gnu* | linux* | k*bsd*-gnu)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -2462,11 +8136,8 @@
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
- ;;
-
-- sysv4*MP*)
-- if test -d /usr/nec; then
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++ ;;
++
+ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -2474,15 +8145,9 @@
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
-- hpux*)
-- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-- # not for PA HP-UX.
-- case $host_cpu in
-- hppa*64*|ia64*)
-- # +Z the default
++ fi
++ ;;
++
+ solaris*)
+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -2518,9 +8183,7 @@
+*** used, and then restart.
+
+_LT_EOF
- ;;
-- *)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++ ;;
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
@@ -2529,10 +8192,10 @@
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
- ;;
- esac
- ;;
-
++ ;;
++ esac
++ ;;
++
+ sunos4*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
@@ -2540,16 +8203,15 @@
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
- *)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
- ;;
- esac
++ ;;
++ esac
+
+ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+ runpath_var=
@@ -2557,17 +8219,9 @@
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
- else
-- # PORTME Check for flag to pass linker flags through the system compiler.
++ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
- case $host_os in
-- aix*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- if test "$host_cpu" = ia64; then
-- # AIX 5 now supports IA64 processor
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- else
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++ case $host_os in
+ aix3*)
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
@@ -2579,25 +8233,9 @@
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
- fi
- ;;
-- darwin*)
-- # PIC is the default on this platform
-- # Common symbols not allowed in MH_DYLIB files
-- case $cc_basename in
-- xlc*)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- ;;
-- esac
-- ;;
-
-- mingw* | cygwin* | pw32* | os2*)
-- # 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).
-- m4_if([$1], [GCJ], [],
-- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-- ;;
++ fi
++ ;;
++
+ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
@@ -2627,78 +8265,22 @@
+ done
+ ;;
+ esac
-
-- hpux9* | hpux10* | hpux11*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-- # not for PA HP-UX.
-- case $host_cpu in
-- hppa*64*|ia64*)
-- # +Z the default
-- ;;
-- *)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-- ;;
-- esac
-- # Is there a better lt_prog_compiler_static that works with the bundled CC?
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-- ;;
++
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
-
-- irix5* | irix6* | nonstopux*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- # PIC (with -KPIC) is the default.
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-- ;;
++
+ # When large executables or shared objects are built, AIX ld can
+ # have problems creating the table of contents. If linking a library
+ # or program results in "error TOC overflow" add -mminimal-toc to
+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-- newsos6)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- ;;
++
+ _LT_AC_TAGVAR(archive_cmds, $1)=''
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-- linux* | k*bsd*-gnu)
-- case $cc_basename in
-- icc* | ecc*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-- ;;
-- pgcc* | pgf77* | pgf90* | pgf95*)
-- # Portland Group compilers (*not* the Pentium gcc compiler,
-- # which looks to be a dead project)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- ;;
-- ccc*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- # All Alpha code is PIC.
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-- ;;
-- *)
-- case `$CC -V 2>&1 | sed 5q` in
-- *Sun\ C*)
-- # Sun C 5.9
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- ;;
-- *Sun\ F*)
-- # Sun Fortran 8.3 passes all unrecognized flags to the linker
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
++
+ if test "$GCC" = yes; then
+ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
@@ -2719,10 +8301,8 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ fi
- ;;
- esac
-- ;;
-- esac
++ ;;
++ esac
+ shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
@@ -2773,29 +8353,20 @@
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
- ;;
-
-- osf3* | osf4* | osf5*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- # All OSF/1 code is PIC.
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++ ;;
++
+ amigaos*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ # see comment about different semantics on the GNU ld section
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-
-- rdos*)
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++ ;;
++
+ bsdi[[45]]*)
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
- ;;
-
-- solaris*)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++
+ cygwin* | mingw* | pw32*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
@@ -2850,11 +8421,7 @@
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
- case $cc_basename in
-- f77* | f90* | f95*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-- *)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
@@ -2866,33 +8433,20 @@
+ *)
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
- esac
++ esac
+ fi
- ;;
-
-- sunos4*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++
+ dgux*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
-- sysv4 | sysv4.2uw2* | sysv4.3*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++
+ freebsd1*)
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-
-- sysv4*MP*)
-- if test -d /usr/nec ;then
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- fi
++ ;;
++
+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+ # support. Future versions do this automatically, but an explicit c++rt0.o
+ # does not break anything, and helps significantly (at the cost of a little
@@ -2902,35 +8456,24 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
-- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+ freebsd2*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
-- unicos*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++ ;;
++
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+ freebsd* | dragonfly*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
-- uts4*)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- ;;
++ ;;
++
+ hpux9*)
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
@@ -2940,22 +8483,576 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-
-- *)
-- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- ;;
++ ;;
++
++ hpux10*)
++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ fi
++ if test "$with_gnu_ld" = no; then
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++
++ # hardcode_minus_L: Not really in the search PATH,
++ # but as the default location of the library.
++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++ fi
++ ;;
++
++ hpux11*)
++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++ case $host_cpu in
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ esac
++ else
++ case $host_cpu in
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
+ esac
+- ;;
+- vxworks*)
+- ;;
+- *)
+- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+- ;;
- esac
- fi
+-],
+-[
+- if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++ fi
++ if test "$with_gnu_ld" = no; then
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+- case $host_os in
+- aix*)
+- # All AIX code is PIC.
+- if test "$host_cpu" = ia64; then
+- # AIX 5 now supports IA64 processor
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ case $host_cpu in
++ hppa*64*|ia64*)
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ ;;
++ *)
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++
++ # hardcode_minus_L: Not really in the search PATH,
++ # but as the default location of the library.
++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++ ;;
++ esac
+ fi
+ ;;
+
+- amigaos*)
+- # FIXME: we need at least 68020 code to build shared libraries, but
+- # adding the `-m68020' flag to GCC prevents building anything better,
+- # like `-m68040'.
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++ irix5* | irix6* | nonstopux*)
++ if test "$GCC" = yes; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ else
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
++ fi
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+- # PIC is the default for these OSes.
++ netbsd* | netbsdelf*-gnu)
++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
++ else
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
++ fi
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+- mingw* | cygwin* | pw32* | os2*)
+- # 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).
+- # Although the cygwin gcc ignores -fPIC, still need this for old-style
+- # (--disable-auto-import) libraries
+- m4_if([$1], [GCJ], [],
+- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++ newsos6)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+- darwin* | rhapsody*)
+- # PIC is the default on this platform
+- # Common symbols not allowed in MH_DYLIB files
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++ openbsd*)
++ if test -f /usr/libexec/ld.so; then
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ else
++ case $host_os in
++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
+ ;;
+
+- interix[[3-9]]*)
+- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+- # Instead, we relocate shared libraries at runtime.
++ os2*)
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
+
+- msdosdjgpp*)
+- # Just because we use GCC doesn't mean we suddenly get shared libraries
+- # on systems that don't support them.
+- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+- enable_shared=no
++ osf3*)
++ if test "$GCC" = yes; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ else
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++ fi
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
+
+- sysv4*MP*)
+- if test -d /usr/nec; then
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++ osf4* | osf5*) # as osf3* with the addition of -msym flag
++ if test "$GCC" = yes; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++ else
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
++
++ # Both c and cxx compiler support -rpath directly
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ fi
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
+
+- hpux*)
+- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+- # not for PA HP-UX.
+- case $host_cpu in
+- hppa*64*|ia64*)
+- # +Z the default
+- ;;
++ solaris*)
++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
++ if test "$GCC" = yes; then
++ wlarc='${wl}'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
++ else
++ wlarc=''
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++ fi
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ case $host_os in
++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
++ # but is careful enough not to reorder.
++ # Supported since Solaris 2.6 (maybe 2.5.1?)
++ if test "$GCC" = yes; then
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ else
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++ fi
+ ;;
+ esac
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- *)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+- ;;
+- esac
+- else
+- # PORTME Check for flag to pass linker flags through the system compiler.
+- case $host_os in
+- aix*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- if test "$host_cpu" = ia64; then
+- # AIX 5 now supports IA64 processor
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ sunos4*)
++ if test "x$host_vendor" = xsequent; then
++ # Use $CC to link under sequent, because it throws in some extra .o
++ # files that make .init and .fini sections work.
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ fi
+- ;;
+- darwin*)
+- # PIC is the default on this platform
+- # Common symbols not allowed in MH_DYLIB files
+- case $cc_basename in
+- xlc*)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- ;;
+- esac
+- ;;
+-
+- mingw* | cygwin* | pw32* | os2*)
+- # 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).
+- m4_if([$1], [GCJ], [],
+- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+- hpux9* | hpux10* | hpux11*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+- # not for PA HP-UX.
+- case $host_cpu in
+- hppa*64*|ia64*)
+- # +Z the default
++ sysv4)
++ case $host_vendor in
++ sni)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+ ;;
+- *)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++ siemens)
++ ## LD is ld it makes a PLAMLIB
++ ## CC just makes a GrossModule.
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ ;;
++ motorola)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+ ;;
+ esac
+- # Is there a better lt_prog_compiler_static that works with the bundled CC?
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++ runpath_var='LD_RUN_PATH'
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+- irix5* | irix6* | nonstopux*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- # PIC (with -KPIC) is the default.
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++ sysv4.3*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+ ;;
+
+- newsos6)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ sysv4*MP*)
++ if test -d /usr/nec; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ runpath_var=LD_RUN_PATH
++ hardcode_runpath_var=yes
++ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
++ fi
+ ;;
+
+- linux* | k*bsd*-gnu)
+- case $cc_basename in
+- icc* | ecc*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+- ;;
+- pgcc* | pgf77* | pgf90* | pgf95*)
+- # Portland Group compilers (*not* the Pentium gcc compiler,
+- # which looks to be a dead project)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- ;;
+- ccc*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- # All Alpha code is PIC.
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+- ;;
+- *)
+- case `$CC -V 2>&1 | sed 5q` in
+- *Sun\ C*)
+- # Sun C 5.9
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- ;;
+- *Sun\ F*)
+- # Sun Fortran 8.3 passes all unrecognized flags to the linker
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+- ;;
+- esac
+- ;;
+- esac
+- ;;
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ runpath_var='LD_RUN_PATH'
+
+- osf3* | osf4* | osf5*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- # All OSF/1 code is PIC.
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++ if test "$GCC" = yes; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ fi
+ ;;
+
+- rdos*)
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++ runpath_var='LD_RUN_PATH'
++
++ if test "$GCC" = yes; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ fi
+ ;;
+
+- solaris*)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- case $cc_basename in
+- f77* | f90* | f95*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+- *)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+- esac
++ uts4*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+- sunos4*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ *)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
++ esac
++ fi
++])
++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+- sysv4 | sysv4.2uw2* | sysv4.3*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++#
++# Do we need to explicitly link libc?
++#
++case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
++x|xyes)
++ # Assume -lc should be added
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++
++ if test "$enable_shared" = yes && test "$GCC" = yes; then
++ case $_LT_AC_TAGVAR(archive_cmds, $1) in
++ *'~'*)
++ # FIXME: we may have to deal with multi-command sequences.
+ ;;
++ '$CC '*)
++ # Test whether the compiler implicitly links with -lc since on some
++ # systems, -lgcc has to come before -lc. If gcc already passes -lc
++ # to ld, don't add -lc before -lgcc.
++ AC_MSG_CHECKING([whether -lc should be explicitly linked in])
++ $rm conftest*
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+- sysv4*MP*)
+- if test -d /usr/nec ;then
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
++ soname=conftest
++ lib=conftest
++ libobjs=conftest.$ac_objext
++ deplibs=
++ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
++ compiler_flags=-v
++ linker_flags=-v
++ verstring=
++ output_objdir=.
++ libname=conftest
++ lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
++ if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
++ then
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ else
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++ fi
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
++ else
++ cat conftest.err 1>&5
+ fi
+- ;;
+-
+- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- ;;
+-
+- unicos*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+- ;;
+-
+- uts4*)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- ;;
+-
+- *)
+- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++ $rm conftest*
++ AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+ ;;
+ esac
+ fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
--
--#
++ ;;
++esac
++])# AC_LIBTOOL_PROG_LD_SHLIBS
+
++
++# _LT_AC_FILE_LTDLL_C
++# -------------------
++# Be careful that the start marker always follows a newline.
++AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
++# /* ltdll.c starts here */
++# #define WIN32_LEAN_AND_MEAN
++# #include <windows.h>
++# #undef WIN32_LEAN_AND_MEAN
++# #include <stdio.h>
+ #
-# Check to make sure the PIC flag actually works.
--#
++# #ifndef __CYGWIN__
++# # ifdef __CYGWIN32__
++# # define __CYGWIN__ __CYGWIN32__
++# # endif
++# #endif
+ #
-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
- _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
@@ -2977,26 +9074,63 @@
- ;;
-esac
-
--#
++# #ifdef __cplusplus
++# extern "C" {
++# #endif
++# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
++# #ifdef __cplusplus
++# }
++# #endif
+ #
-# Check to make sure the static flag actually works.
--#
++# #ifdef __CYGWIN__
++# #include <cygwin/cygwin_dll.h>
++# DECLARE_CYGWIN_DLL( DllMain );
++# #endif
++# HINSTANCE __hDllInstance_base;
+ #
-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
- _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
- $lt_tmp_static_flag,
- [],
- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
--])
-
-+ hpux10*)
-+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+ fi
-+ if test "$with_gnu_ld" = no; then
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++# BOOL APIENTRY
++# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
++# {
++# __hDllInstance_base = hInst;
++# return TRUE;
++# }
++# /* ltdll.c ends here */
++])# _LT_AC_FILE_LTDLL_C
++
++
++# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
++# ---------------------------------
++AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
++
++
++# old names
++AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
++AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
++AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
++AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
++AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
++AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
++AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
++
++# This is just to silence aclocal about the macro not being used
++ifelse([AC_DISABLE_FAST_INSTALL])
++
++AC_DEFUN([LT_AC_PROG_GCJ],
++[AC_CHECK_TOOL(GCJ, gcj, no)
++ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
++ AC_SUBST(GCJFLAGS)
+ ])
+
++AC_DEFUN([LT_AC_PROG_RC],
++[AC_CHECK_TOOL(RC, windres, no)
++])
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
@@ -3085,18 +9219,13 @@
- with_gnu_ld=no
- ;;
- esac
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
- if test "$with_gnu_ld" = yes; then
- # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+ fi
-+ ;;
++# Cheap backport of AS_EXECUTABLE_P and required macros
++# from Autoconf 2.59; we should not use $as_executable_p directly.
- # Set some defaults for GNU ld with shared library support. These
- # are reset later if shared libraries are not supported. Putting them
@@ -3107,575 +9236,8 @@
- # ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ hpux11*)
-+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+ case $host_cpu in
-+ hppa*64*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ ia64*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ esac
- else
+- else
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-- fi
-- supports_anon_versioning=no
-- case `$LD -v 2>/dev/null` in
-- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-- *\ 2.11.*) ;; # other 2.11 versions
-- *) supports_anon_versioning=yes ;;
-- esac
-+ case $host_cpu in
-+ hppa*64*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ ia64*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ esac
-+ fi
-+ if test "$with_gnu_ld" = no; then
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-- # See if GNU ld supports shared libraries.
-- case $host_os in
-- aix[[3-9]]*)
-- # On AIX/PPC, the GNU linker is very broken
-- if test "$host_cpu" != ia64; then
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- cat <<EOF 1>&2
-+ case $host_cpu in
-+ hppa*64*|ia64*)
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
--*** Warning: the GNU linker, at least up to release 2.9.1, is reported
--*** to be unable to reliably create shared libraries on AIX.
--*** Therefore, libtool is disabling shared libraries support. If you
--*** really care for shared libraries, you may want to modify your PATH
--*** so that a non-GNU linker is found, and then restart.
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+ ;;
-+ esac
-+ fi
-+ ;;
-
--EOF
-+ irix5* | irix6* | nonstopux*)
-+ if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ else
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
- fi
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
-- amigaos*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+ netbsd* | netbsdelf*-gnu)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
-+ else
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
-+ fi
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-
-- # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
-- # that the semantics of dynamic libraries on AmigaOS, at least up
-- # to version 4, is to share data among multiple programs linked
-- # with the same dynamic library. Since this doesn't match the
-- # behavior of shared libraries on other platforms, we can't use
-- # them.
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ newsos6)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
-- beos*)
-- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-- # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-- # support --undefined. This deserves some investigation. FIXME
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ openbsd*)
-+ if test -f /usr/libexec/ld.so; then
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
-- cygwin* | mingw* | pw32*)
-- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-- # as there is no search path for DLLs.
-+ os2*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-- _LT_AC_TAGVAR(always_export_symbols, $1)=no
-- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+ ;;
-
-- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-- # If the export-symbols file already is a .def file (1st line
-- # is EXPORTS), use it as is; otherwise, prepend...
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-- cp $export_symbols $output_objdir/$soname.def;
-+ osf3*)
-+ if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ else
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+ fi
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+ ;;
-+
-+ osf4* | osf5*) # as osf3* with the addition of -msym flag
-+ if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ else
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-+
-+ # Both c and cxx compiler support -rpath directly
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+ fi
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+ ;;
-+
-+ solaris*)
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-+ if test "$GCC" = yes; then
-+ wlarc='${wl}'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-+ else
-+ wlarc=''
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+ fi
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ case $host_os in
-+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+ *)
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'. GCC discards it without `$wl',
-+ # but is careful enough not to reorder.
-+ # Supported since Solaris 2.6 (maybe 2.5.1?)
-+ if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
- else
-- echo EXPORTS > $output_objdir/$soname.def;
-- cat $export_symbols >> $output_objdir/$soname.def;
-- fi~
-- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-+ fi
-+ ;;
-+ esac
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+ ;;
-+
-+ sunos4*)
-+ if test "x$host_vendor" = xsequent; then
-+ # Use $CC to link under sequent, because it throws in some extra .o
-+ # files that make .init and .fini sections work.
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
- else
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
- fi
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
-- interix[[3-9]]*)
-- _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+ sysv4)
-+ case $host_vendor in
-+ sni)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-+ ;;
-+ siemens)
-+ ## LD is ld it makes a PLAMLIB
-+ ## CC just makes a GrossModule.
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+ ;;
-+ motorola)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-+ ;;
-+ esac
-+ runpath_var='LD_RUN_PATH'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-- # Instead, shared libraries are loaded at an image base (0x10000000 by
-- # default) and relocated if they conflict, which is a slow very memory
-- # consuming and fragmenting process. To avoid this, we pick a random,
-- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-- # time. Moving up from 0x10000000 also allows more sbrk(2) space.
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- gnu* | linux* | k*bsd*-gnu)
-- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- tmp_addflag=
-- case $cc_basename,$host_cpu in
-- pgcc*) # Portland Group C compiler
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-- tmp_addflag=' $pic_flag'
-- ;;
-- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-- tmp_addflag=' $pic_flag -Mnomain' ;;
-- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
-- tmp_addflag=' -i_dynamic' ;;
-- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
-- tmp_addflag=' -i_dynamic -nofor_main' ;;
-- ifc* | ifort*) # Intel Fortran compiler
-- tmp_addflag=' -nofor_main' ;;
-- esac
-- case `$CC -V 2>&1 | sed 5q` in
-- *Sun\ C*) # Sun C 5.9
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-- tmp_sharedflag='-G' ;;
-- *Sun\ F*) # Sun Fortran 8.3
-- tmp_sharedflag='-G' ;;
-- *)
-- tmp_sharedflag='-shared' ;;
-- esac
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ sysv4.3*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-+ ;;
-+
-+ sysv4*MP*)
-+ if test -d /usr/nec; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ runpath_var=LD_RUN_PATH
-+ hardcode_runpath_var=yes
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+ fi
-+ ;;
-
-- if test $supports_anon_versioning = yes; then
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-- $echo "local: *; };" >> $output_objdir/$libname.ver~
-- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-- fi
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ runpath_var='LD_RUN_PATH'
-+
-+ if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- ;;
-
-- netbsd*)
-- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-- wlarc=
-+ sysv5* | sco3.2v5* | sco5v6*)
-+ # Note: We can NOT use -z defs as we might desire, because we do not
-+ # link with -lc, and that would cause any symbols used from libc to
-+ # always be unresolved, which means just about no library would
-+ # ever link correctly. If we're not using GNU ld we use -z text
-+ # though, which does catch some bad symbols but isn't as heavy-handed
-+ # as -z defs.
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+ runpath_var='LD_RUN_PATH'
-+
-+ if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- ;;
-
-- solaris*)
-- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- cat <<EOF 1>&2
-+ uts4*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-
--*** Warning: The releases 2.8.* of the GNU linker cannot reliably
--*** create shared libraries on Solaris systems. Therefore, libtool
--*** is disabling shared libraries support. We urge you to upgrade GNU
--*** binutils to release 2.9.1 or newer. Another option is to modify
--*** your PATH or compiler configuration so that the native linker is
--*** used, and then restart.
-+ *)
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ fi
-+])
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
--EOF
-- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-+x|xyes)
-+ # Assume -lc should be added
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+
-+ if test "$enable_shared" = yes && test "$GCC" = yes; then
-+ case $_LT_AC_TAGVAR(archive_cmds, $1) in
-+ *'~'*)
-+ # FIXME: we may have to deal with multi-command sequences.
-+ ;;
-+ '$CC '*)
-+ # Test whether the compiler implicitly links with -lc since on some
-+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+ # to ld, don't add -lc before -lgcc.
-+ AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-+ $rm conftest*
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-+ soname=conftest
-+ lib=conftest
-+ libobjs=conftest.$ac_objext
-+ deplibs=
-+ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-+ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-+ compiler_flags=-v
-+ linker_flags=-v
-+ verstring=
-+ output_objdir=.
-+ libname=conftest
-+ lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-+ if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-+ then
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+ else
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+ fi
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
- else
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ cat conftest.err 1>&5
- fi
-+ $rm conftest*
-+ AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
- ;;
-+ esac
-+ fi
-+ ;;
-+esac
-+])# AC_LIBTOOL_PROG_LD_SHLIBS
-
-- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-- case `$LD -v 2>&1` in
-- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- cat <<_LT_EOF 1>&2
-
--*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
--*** reliably create shared libraries on SCO systems. Therefore, libtool
--*** is disabling shared libraries support. We urge you to upgrade GNU
--*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
--*** your PATH or compiler configuration so that the native linker is
--*** used, and then restart.
-+# _LT_AC_FILE_LTDLL_C
-+# -------------------
-+# Be careful that the start marker always follows a newline.
-+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-+# /* ltdll.c starts here */
-+# #define WIN32_LEAN_AND_MEAN
-+# #include <windows.h>
-+# #undef WIN32_LEAN_AND_MEAN
-+# #include <stdio.h>
-+#
-+# #ifndef __CYGWIN__
-+# # ifdef __CYGWIN32__
-+# # define __CYGWIN__ __CYGWIN32__
-+# # endif
-+# #endif
-+#
-+# #ifdef __cplusplus
-+# extern "C" {
-+# #endif
-+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-+# #ifdef __cplusplus
-+# }
-+# #endif
-+#
-+# #ifdef __CYGWIN__
-+# #include <cygwin/cygwin_dll.h>
-+# DECLARE_CYGWIN_DLL( DllMain );
-+# #endif
-+# HINSTANCE __hDllInstance_base;
-+#
-+# BOOL APIENTRY
-+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-+# {
-+# __hDllInstance_base = hInst;
-+# return TRUE;
-+# }
-+# /* ltdll.c ends here */
-+])# _LT_AC_FILE_LTDLL_C
-
--_LT_EOF
-- ;;
-- *)
-- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-- else
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- fi
-- ;;
-- esac
-- ;;
-
-- sunos4*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- wlarc=
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- ;;
-+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-+# ---------------------------------
-+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-
-- *)
-- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-- else
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+
-+# old names
-+AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
-+AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-+AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-+AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
-+AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
-+
-+# This is just to silence aclocal about the macro not being used
-+ifelse([AC_DISABLE_FAST_INSTALL])
-+
-+AC_DEFUN([LT_AC_PROG_GCJ],
-+[AC_CHECK_TOOL(GCJ, gcj, no)
-+ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-+ AC_SUBST(GCJFLAGS)
-+])
-+
-+AC_DEFUN([LT_AC_PROG_RC],
-+[AC_CHECK_TOOL(RC, windres, no)
-+])
-+
-+
-+# Cheap backport of AS_EXECUTABLE_P and required macros
-+# from Autoconf 2.59; we should not use $as_executable_p directly.
-+
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
@@ -3718,15 +9280,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
-- ;;
-- esac
--
-- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
-- runpath_var=
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++ fi
+ done
+ done
+done
@@ -3759,22 +9313,22 @@
+ lt_ac_max=$lt_ac_count
+ lt_cv_path_SED=$lt_ac_sed
fi
-- else
-- # PORTME fill in a description of your system's linker (not GNU ld)
+- supports_anon_versioning=no
+- case `$LD -v 2>/dev/null` in
+- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+- *\ 2.11.*) ;; # other 2.11 versions
+- *) supports_anon_versioning=yes ;;
+- esac
+-
+- # See if GNU ld supports shared libraries.
- case $host_os in
-- aix3*)
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-- # Note: this linker hardcodes the directories in LIBPATH if there
-- # are no directories specified by -L.
-- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-- # Neither direct hardcoding nor static linking is supported with a
-- # broken collect2.
-- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-- fi
-- ;;
+- aix[[3-9]]*)
+- # On AIX/PPC, the GNU linker is very broken
+- if test "$host_cpu" != ia64; then
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- cat <<EOF 1>&2
+ done
+done
+])
@@ -3783,18 +9337,11 @@
+AC_MSG_RESULT([$SED])
+])
-- aix[[4-9]]*)
-- if test "$host_cpu" = ia64; then
-- # On IA64, the linker does run time linking by default, so we don't
-- # have to do anything special.
-- aix_use_runtimelinking=no
-- exp_sym_flag='-Bexport'
-- no_entry_flag=""
-- else
-- # If we're using GNU nm, then we don't want the "-C" option.
-- # -C means demangle to AIX nm, but means don't demangle with GNU nm
-- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+-*** to be unable to reliably create shared libraries on AIX.
+-*** Therefore, libtool is disabling shared libraries support. If you
+-*** really care for shared libraries, you may want to modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+#
+# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
@@ -3817,7 +9364,10 @@
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
-+
+
+-EOF
+- fi
+- ;;
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
@@ -3832,28 +9382,18 @@
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
- else
-- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
- fi
-- aix_use_runtimelinking=no
++ fi
+
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
-- # Test if we are trying to use run time linking or normal
-- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-- # need to do runtime linking.
-- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-- for ld_flag in $LDFLAGS; do
-- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-- aix_use_runtimelinking=yes
-- break
-- fi
-- done
-- ;;
-- esac
+- amigaos*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
@@ -3873,15 +9413,25 @@
+ $3])dnl
+fi])
-- exp_sym_flag='-bexport'
-- no_entry_flag='-bnoentry'
+- # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
+- # that the semantics of dynamic libraries on AmigaOS, at least up
+- # to version 4, is to share data among multiple programs linked
+- # with the same dynamic library. Since this doesn't match the
+- # behavior of shared libraries on other platforms, we can't use
+- # them.
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
+
+- beos*)
+- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+- # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+- # support --undefined. This deserves some investigation. FIXME
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
-
-- # When large executables or shared objects are built, AIX ld can
-- # have problems creating the table of contents. If linking a library
-- # or program results in "error TOC overflow" add -mminimal-toc to
-- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
-- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+- ;;
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
@@ -3898,10 +9448,14 @@
+fi[]dnl
+])# _PKG_CONFIG
-- _LT_AC_TAGVAR(archive_cmds, $1)=''
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- cygwin* | mingw* | pw32*)
+- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+- # as there is no search path for DLLs.
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+- _LT_AC_TAGVAR(always_export_symbols, $1)=no
+- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
@@ -3912,6 +9466,356 @@
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+- # If the export-symbols file already is a .def file (1st line
+- # is EXPORTS), use it as is; otherwise, prepend...
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+- cp $export_symbols $output_objdir/$soname.def;
+- else
+- echo EXPORTS > $output_objdir/$soname.def;
+- cat $export_symbols >> $output_objdir/$soname.def;
+- fi~
+- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
+
+- interix[[3-9]]*)
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+- # Instead, shared libraries are loaded at an image base (0x10000000 by
+- # default) and relocated if they conflict, which is a slow very memory
+- # consuming and fragmenting process. To avoid this, we pick a random,
+- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+- # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+- ;;
++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++# [ACTION-IF-NOT-FOUND])
++#
++#
++# Note that if there is a possibility the first call to
++# PKG_CHECK_MODULES might not happen, you should be sure to include an
++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
++#
++#
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_MODULES],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+- gnu* | linux* | k*bsd*-gnu)
+- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- tmp_addflag=
+- case $cc_basename,$host_cpu in
+- pgcc*) # Portland Group C compiler
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+- tmp_addflag=' $pic_flag'
+- ;;
+- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+- tmp_addflag=' $pic_flag -Mnomain' ;;
+- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+- tmp_addflag=' -i_dynamic' ;;
+- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
+- tmp_addflag=' -i_dynamic -nofor_main' ;;
+- ifc* | ifort*) # Intel Fortran compiler
+- tmp_addflag=' -nofor_main' ;;
+- esac
+- case `$CC -V 2>&1 | sed 5q` in
+- *Sun\ C*) # Sun C 5.9
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+- tmp_sharedflag='-G' ;;
+- *Sun\ F*) # Sun Fortran 8.3
+- tmp_sharedflag='-G' ;;
+- *)
+- tmp_sharedflag='-shared' ;;
+- esac
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++pkg_failed=no
++AC_MSG_CHECKING([for $1])
+
+- if test $supports_anon_versioning = yes; then
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+- $echo "local: *; };" >> $output_objdir/$libname.ver~
+- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+- fi
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+- netbsd*)
+- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+- wlarc=
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+- fi
+- ;;
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
+
+- solaris*)
+- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- cat <<EOF 1>&2
++if test $pkg_failed = yes; then
++ _PKG_SHORT_ERRORS_SUPPORTED
++ if test $_pkg_short_errors_supported = yes; then
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++ else
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+-*** create shared libraries on Solaris systems. Therefore, libtool
+-*** is disabling shared libraries support. We urge you to upgrade GNU
+-*** binutils to release 2.9.1 or newer. Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
++ ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met:
+
+-EOF
+- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
++$$1_PKG_ERRORS
+
+- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+- case `$LD -v 2>&1` in
+- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- cat <<_LT_EOF 1>&2
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+-*** reliably create shared libraries on SCO systems. Therefore, libtool
+-*** is disabling shared libraries support. We urge you to upgrade GNU
+-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
++_PKG_TEXT
++])],
++ [AC_MSG_RESULT([no])
++ $4])
++elif test $pkg_failed = untried; then
++ ifelse([$4], , [AC_MSG_FAILURE(dnl
++[The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
+
+-_LT_EOF
+- ;;
+- *)
+- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
+- esac
+- ;;
++_PKG_TEXT
+
+- sunos4*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- wlarc=
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- ;;
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
++ [$4])
++else
++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++ AC_MSG_RESULT([yes])
++ ifelse([$3], , :, [$3])
++fi[]dnl
++])# PKG_CHECK_MODULES
+
+- *)
+- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
+- esac
++# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+- runpath_var=
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+- fi
+- else
+- # PORTME fill in a description of your system's linker (not GNU ld)
+- case $host_os in
+- aix3*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+- # Note: this linker hardcodes the directories in LIBPATH if there
+- # are no directories specified by -L.
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+- # Neither direct hardcoding nor static linking is supported with a
+- # broken collect2.
+- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+- fi
+- ;;
++# AM_AUTOMAKE_VERSION(VERSION)
++# ----------------------------
++# Automake X.Y traces this macro to ensure aclocal.m4 has been
++# generated from the m4 files accompanying Automake X.Y.
++# (This private macro should not be called outside this file.)
++AC_DEFUN([AM_AUTOMAKE_VERSION],
++[am__api_version='1.10'
++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
++dnl require some minimum version. Point them to the right macro.
++m4_if([$1], [1.10.1], [],
++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
++])
+
+- aix[[4-9]]*)
+- if test "$host_cpu" = ia64; then
+- # On IA64, the linker does run time linking by default, so we don't
+- # have to do anything special.
+- aix_use_runtimelinking=no
+- exp_sym_flag='-Bexport'
+- no_entry_flag=""
+- else
+- # If we're using GNU nm, then we don't want the "-C" option.
+- # -C means demangle to AIX nm, but means don't demangle with GNU nm
+- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+- else
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+- fi
+- aix_use_runtimelinking=no
++# _AM_AUTOCONF_VERSION(VERSION)
++# -----------------------------
++# aclocal traces this macro to find the Autoconf version.
++# This is a private macro too. Using m4_define simplifies
++# the logic in aclocal, which can simply ignore this definition.
++m4_define([_AM_AUTOCONF_VERSION], [])
+
+- # Test if we are trying to use run time linking or normal
+- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+- # need to do runtime linking.
+- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+- for ld_flag in $LDFLAGS; do
+- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+- aix_use_runtimelinking=yes
+- break
+- fi
+- done
+- ;;
+- esac
++# AM_SET_CURRENT_AUTOMAKE_VERSION
++# -------------------------------
++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
++[AM_AUTOMAKE_VERSION([1.10.1])dnl
++m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+
+- exp_sym_flag='-bexport'
+- no_entry_flag='-bnoentry'
+- fi
++# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+- # When large executables or shared objects are built, AIX ld can
+- # have problems creating the table of contents. If linking a library
+- # or program results in "error TOC overflow" add -mminimal-toc to
+- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+- _LT_AC_TAGVAR(archive_cmds, $1)=''
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
++# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
++# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
++#
++# Of course, Automake must honor this variable whenever it calls a
++# tool from the auxiliary directory. The problem is that $srcdir (and
++# therefore $ac_aux_dir as well) can be either absolute or relative,
++# depending on how configure is run. This is pretty annoying, since
++# it makes $ac_aux_dir quite unusable in subdirectories: in the top
++# source directory, any form will work fine, but in subdirectories a
++# relative path needs to be adjusted first.
++#
++# $ac_aux_dir/missing
++# fails when called from a subdirectory if $ac_aux_dir is relative
++# $top_srcdir/$ac_aux_dir/missing
++# fails if $ac_aux_dir is absolute,
++# fails when called from a subdirectory in a VPATH build with
++# a relative $ac_aux_dir
++#
++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
++# are both prefixed by $srcdir. In an in-source build this is usually
++# harmless because $srcdir is `.', but things will broke when you
++# start a VPATH build or use an absolute $srcdir.
++#
++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
++# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
++# and then we would define $MISSING as
++# MISSING="\${SHELL} $am_aux_dir/missing"
++# This will work as long as MISSING is not called from configure, because
++# unfortunately $(top_srcdir) has no meaning in configure.
++# However there are other variables, like CC, which are often used in
++# configure, and could therefore not use this "fixed" $ac_aux_dir.
++#
++# Another solution, used here, is to always expand $ac_aux_dir to an
++# absolute PATH. The drawback is that using absolute paths prevent a
++# configured tree to be moved without reconfiguration.
++
++AC_DEFUN([AM_AUX_DIR_EXPAND],
++[dnl Rely on autoconf to set up CDPATH properly.
++AC_PREREQ([2.50])dnl
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
++])
- if test "$GCC" = yes; then
- case $host_os in aix4.[[012]]|aix4.[[012]].*)
@@ -3953,6 +9857,7 @@
- fi
- fi
- fi
++# AM_CONDITIONAL -*- Autoconf -*-
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
@@ -3986,23 +9891,12 @@
- fi
- fi
- ;;
-+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+# [ACTION-IF-NOT-FOUND])
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
++# Free Software Foundation, Inc.
+#
-+#
-+# Note that if there is a possibility the first call to
-+# PKG_CHECK_MODULES might not happen, you should be sure to include an
-+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-+#
-+#
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_MODULES],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-+
-+pkg_failed=no
-+AC_MSG_CHECKING([for $1])
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
- amigaos*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
@@ -4011,15 +9905,34 @@
- # see comment about different semantics on the GNU ld section
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
++# serial 8
- bsdi[[45]]*)
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
- ;;
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
++# AM_CONDITIONAL(NAME, SHELL-CONDITION)
++# -------------------------------------
++# Define a conditional.
++AC_DEFUN([AM_CONDITIONAL],
++[AC_PREREQ(2.52)dnl
++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
++AC_SUBST([$1_TRUE])dnl
++AC_SUBST([$1_FALSE])dnl
++_AM_SUBST_NOTMAKE([$1_TRUE])dnl
++_AM_SUBST_NOTMAKE([$1_FALSE])dnl
++if $2; then
++ $1_TRUE=
++ $1_FALSE='#'
++else
++ $1_TRUE='#'
++ $1_FALSE=
++fi
++AC_CONFIG_COMMANDS_PRE(
++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
++ AC_MSG_ERROR([[conditional "$1" was never defined.
++Usually this means the macro was only invoked conditionally.]])
++fi])])
- cygwin* | mingw* | pw32*)
- # When not using gcc, we currently assume that we are using
@@ -4041,15 +9954,12 @@
- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- ;;
-+if test $pkg_failed = yes; then
-+ _PKG_SHORT_ERRORS_SUPPORTED
-+ if test $_pkg_short_errors_supported = yes; then
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-+ else
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
- darwin* | rhapsody*)
- case $host_os in
@@ -4099,21 +10009,22 @@
- esac
- fi
- ;;
-+ ifelse([$4], , [AC_MSG_ERROR(dnl
-+[Package requirements ($2) were not met:
++# serial 9
- dgux*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-+$$1_PKG_ERRORS
++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
++# written in clear, in which case automake, when reading aclocal.m4,
++# will think it sees a *use*, and therefore will trigger all it's
++# C support machinery. Also note that it means that autoscan, seeing
++# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
- freebsd1*)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
- # support. Future versions do this automatically, but an explicit c++rt0.o
@@ -4125,15 +10036,21 @@
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-+_PKG_TEXT
-+])],
-+ [AC_MSG_RESULT([no])
-+ $4])
-+elif test $pkg_failed = untried; then
-+ ifelse([$4], , [AC_MSG_FAILURE(dnl
-+[The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
++# _AM_DEPENDENCIES(NAME)
++# ----------------------
++# See how the compiler implements dependency checking.
++# NAME is "CC", "CXX", "GCJ", or "OBJC".
++# We try a few techniques and use that to set a single cache variable.
++#
++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
++# dependency, and given that the user is not expected to run this macro,
++# just rely on AC_PROG_CC.
++AC_DEFUN([_AM_DEPENDENCIES],
++[AC_REQUIRE([AM_SET_DEPDIR])dnl
++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
++AC_REQUIRE([AM_MAKE_INCLUDE])dnl
++AC_REQUIRE([AM_DEP_TRACK])dnl
- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
@@ -4142,7 +10059,33 @@
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-+_PKG_TEXT
++ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
++ [$1], CXX, [depcc="$CXX" am_compiler_list=],
++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
++ [$1], UPC, [depcc="$UPC" am_compiler_list=],
++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
++ [depcc="$$1" am_compiler_list=])
++
++AC_CACHE_CHECK([dependency style of $depcc],
++ [am_cv_$1_dependencies_compiler_type],
++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++ # We make a subdir and do the tests there. Otherwise we can end up
++ # making bogus files that we don't know about and never remove. For
++ # instance it was reported that on HP-UX the gcc test will end up
++ # making a dummy file named `D' -- because `-MD' means `put the output
++ # in D'.
++ mkdir conftest.dir
++ # Copy depcomp to subdir because otherwise we won't find it if we're
++ # using a relative directory.
++ cp "$am_depcomp" conftest.dir
++ cd conftest.dir
++ # We will build objects and dependencies in a subdirectory because
++ # it helps to detect inapplicable dependency modes. For instance
++ # both Tru64's cc and ICC support -MD to output dependencies as a
++ # side effect of compilation, but ICC will put the dependencies in
++ # the current directory while Tru64 will put them in the object
++ # directory.
++ mkdir sub
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
@@ -4151,145 +10094,106 @@
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-+ [$4])
-+else
-+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-+ AC_MSG_RESULT([yes])
-+ ifelse([$3], , :, [$3])
-+fi[]dnl
-+])# PKG_CHECK_MODULES
++ am_cv_$1_dependencies_compiler_type=none
++ if test "$am_compiler_list" = ""; then
++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
++ fi
++ for depmode in $am_compiler_list; do
++ # Setup a source with many dependencies, because some compilers
++ # like to wrap large dependency lists on column 80 (with \), and
++ # we should not choose a depcomp mode which is confused by this.
++ #
++ # We need to recreate these files for each test, as the compiler may
++ # overwrite some of them when testing with obscure command lines.
++ # This happens at least with the AIX C compiler.
++ : > sub/conftest.c
++ for i in 1 2 3 4 5 6; do
++ echo '#include "conftst'$i'.h"' >> sub/conftest.c
++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++ # Solaris 8's {/usr,}/bin/sh.
++ touch sub/conftst$i.h
++ done
++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- hpux9*)
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-- else
++ case $depmode in
++ nosideeffect)
++ # after this tag, mechanisms are not by side-effect, so they'll
++ # only be used when explicitly requested
++ if test "x$enable_dependency_tracking" = xyes; then
++ continue
+ else
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-- fi
++ break
+ fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+# (This private macro should not be called outside this file.)
-+AC_DEFUN([AM_AUTOMAKE_VERSION],
-+[am__api_version='1.10'
-+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-+dnl require some minimum version. Point them to the right macro.
-+m4_if([$1], [1.10.1], [],
-+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-+])
-+
-+# _AM_AUTOCONF_VERSION(VERSION)
-+# -----------------------------
-+# aclocal traces this macro to find the Autoconf version.
-+# This is a private macro too. Using m4_define simplifies
-+# the logic in aclocal, which can simply ignore this definition.
-+m4_define([_AM_AUTOCONF_VERSION], [])
-+
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+[AM_AUTOMAKE_VERSION([1.10.1])dnl
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
-+
-+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-+#
-+# Of course, Automake must honor this variable whenever it calls a
-+# tool from the auxiliary directory. The problem is that $srcdir (and
-+# therefore $ac_aux_dir as well) can be either absolute or relative,
-+# depending on how configure is run. This is pretty annoying, since
-+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-+# source directory, any form will work fine, but in subdirectories a
-+# relative path needs to be adjusted first.
-+#
-+# $ac_aux_dir/missing
-+# fails when called from a subdirectory if $ac_aux_dir is relative
-+# $top_srcdir/$ac_aux_dir/missing
-+# fails if $ac_aux_dir is absolute,
-+# fails when called from a subdirectory in a VPATH build with
-+# a relative $ac_aux_dir
-+#
-+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-+# are both prefixed by $srcdir. In an in-source build this is usually
-+# harmless because $srcdir is `.', but things will broke when you
-+# start a VPATH build or use an absolute $srcdir.
-+#
-+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-+# and then we would define $MISSING as
-+# MISSING="\${SHELL} $am_aux_dir/missing"
-+# This will work as long as MISSING is not called from configure, because
-+# unfortunately $(top_srcdir) has no meaning in configure.
-+# However there are other variables, like CC, which are often used in
-+# configure, and could therefore not use this "fixed" $ac_aux_dir.
-+#
-+# Another solution, used here, is to always expand $ac_aux_dir to an
-+# absolute PATH. The drawback is that using absolute paths prevent a
-+# configured tree to be moved without reconfiguration.
-
+-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-- ;;
-+AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+])
-
+ ;;
+-
- hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-- fi
++ none) break ;;
++ esac
++ # We check with `-c' and `-o' for the sake of the "dashmstdout"
++ # mode. It turns out that the SunPro C++ compiler does not properly
++ # handle `-M -o', and we need to detect this.
++ if depmode=$depmode \
++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++ >/dev/null 2>conftest.err &&
++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++ # icc doesn't choke on unknown options, it will just issue warnings
++ # or remarks (even with -Werror). So we grep stderr for any message
++ # that says an option was ignored or not supported.
++ # When given -MP, icc 7.0 and 7.1 complain thusly:
++ # icc: Command line warning: ignoring option '-M'; no argument required
++ # The diagnosis changed in icc 8.0:
++ # icc: Command line remark: option '-MP' not supported
++ if (grep 'ignoring option' conftest.err ||
++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++ am_cv_$1_dependencies_compiler_type=$depmode
++ break
+ fi
- if test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+# AM_CONDITIONAL -*- Autoconf -*-
++ fi
++ done
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
++ cd ..
++ rm -rf conftest.dir
++else
++ am_cv_$1_dependencies_compiler_type=none
++fi
++])
++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
++AM_CONDITIONAL([am__fastdep$1], [
++ test "x$enable_dependency_tracking" != xno \
++ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
++])
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- fi
- ;;
-+# serial 8
- hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -4320,29 +10224,14 @@
- if test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-+# -------------------------------------
-+# Define a conditional.
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_PREREQ(2.52)dnl
-+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
-+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])dnl
-+AC_SUBST([$1_FALSE])dnl
-+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-+if $2; then
-+ $1_TRUE=
-+ $1_FALSE='#'
-+else
-+ $1_TRUE='#'
-+ $1_FALSE=
-+fi
-+AC_CONFIG_COMMANDS_PRE(
-+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+ AC_MSG_ERROR([[conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.]])
-+fi])])
++# AM_SET_DEPDIR
++# -------------
++# Choose a directory name for dependency files.
++# This macro is AC_REQUIREd in _AM_DEPENDENCIES
++AC_DEFUN([AM_SET_DEPDIR],
++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
++])
- case $host_cpu in
- hppa*64*|ia64*)
@@ -4353,12 +10242,6 @@
- *)
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
@@ -4367,310 +10250,6 @@
- esac
- fi
- ;;
-+# serial 9
-
-- irix5* | irix6* | nonstopux*)
-- if test "$GCC" = yes; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-- fi
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-- ;;
-+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-+# written in clear, in which case automake, when reading aclocal.m4,
-+# will think it sees a *use*, and therefore will trigger all it's
-+# C support machinery. Also note that it means that autoscan, seeing
-+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-- netbsd*)
-- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
-- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
-- fi
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- ;;
-
-- newsos6)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- ;;
-+# _AM_DEPENDENCIES(NAME)
-+# ----------------------
-+# See how the compiler implements dependency checking.
-+# NAME is "CC", "CXX", "GCJ", or "OBJC".
-+# We try a few techniques and use that to set a single cache variable.
-+#
-+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-+# dependency, and given that the user is not expected to run this macro,
-+# just rely on AC_PROG_CC.
-+AC_DEFUN([_AM_DEPENDENCIES],
-+[AC_REQUIRE([AM_SET_DEPDIR])dnl
-+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-+AC_REQUIRE([AM_DEP_TRACK])dnl
-
-- openbsd*)
-- if test -f /usr/libexec/ld.so; then
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-- else
-- case $host_os in
-- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-- ;;
-- *)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- ;;
-- esac
-- fi
-- else
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- fi
-- ;;
-+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
-+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
-+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
-+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
-+ [depcc="$$1" am_compiler_list=])
-
-- os2*)
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-- ;;
-+AC_CACHE_CHECK([dependency style of $depcc],
-+ [am_cv_$1_dependencies_compiler_type],
-+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+ # We make a subdir and do the tests there. Otherwise we can end up
-+ # making bogus files that we don't know about and never remove. For
-+ # instance it was reported that on HP-UX the gcc test will end up
-+ # making a dummy file named `D' -- because `-MD' means `put the output
-+ # in D'.
-+ mkdir conftest.dir
-+ # Copy depcomp to subdir because otherwise we won't find it if we're
-+ # using a relative directory.
-+ cp "$am_depcomp" conftest.dir
-+ cd conftest.dir
-+ # We will build objects and dependencies in a subdirectory because
-+ # it helps to detect inapplicable dependency modes. For instance
-+ # both Tru64's cc and ICC support -MD to output dependencies as a
-+ # side effect of compilation, but ICC will put the dependencies in
-+ # the current directory while Tru64 will put them in the object
-+ # directory.
-+ mkdir sub
-
-- osf3*)
-- if test "$GCC" = yes; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-- else
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-- fi
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-- ;;
-+ am_cv_$1_dependencies_compiler_type=none
-+ if test "$am_compiler_list" = ""; then
-+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-+ fi
-+ for depmode in $am_compiler_list; do
-+ # Setup a source with many dependencies, because some compilers
-+ # like to wrap large dependency lists on column 80 (with \), and
-+ # we should not choose a depcomp mode which is confused by this.
-+ #
-+ # We need to recreate these files for each test, as the compiler may
-+ # overwrite some of them when testing with obscure command lines.
-+ # This happens at least with the AIX C compiler.
-+ : > sub/conftest.c
-+ for i in 1 2 3 4 5 6; do
-+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
-+ done
-+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-- osf4* | osf5*) # as osf3* with the addition of -msym flag
-- if test "$GCC" = yes; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ case $depmode in
-+ nosideeffect)
-+ # after this tag, mechanisms are not by side-effect, so they'll
-+ # only be used when explicitly requested
-+ if test "x$enable_dependency_tracking" = xyes; then
-+ continue
- else
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
--
-- # Both c and cxx compiler support -rpath directly
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+ break
- fi
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
--
-- solaris*)
-- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-- if test "$GCC" = yes; then
-- wlarc='${wl}'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-- else
-- wlarc=''
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+ none) break ;;
-+ esac
-+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+ # mode. It turns out that the SunPro C++ compiler does not properly
-+ # handle `-M -o', and we need to detect this.
-+ if depmode=$depmode \
-+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+ >/dev/null 2>conftest.err &&
-+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+ # icc doesn't choke on unknown options, it will just issue warnings
-+ # or remarks (even with -Werror). So we grep stderr for any message
-+ # that says an option was ignored or not supported.
-+ # When given -MP, icc 7.0 and 7.1 complain thusly:
-+ # icc: Command line warning: ignoring option '-M'; no argument required
-+ # The diagnosis changed in icc 8.0:
-+ # icc: Command line remark: option '-MP' not supported
-+ if (grep 'ignoring option' conftest.err ||
-+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+ am_cv_$1_dependencies_compiler_type=$depmode
-+ break
- fi
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- case $host_os in
-- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-- *)
-- # The compiler driver will combine and reorder linker options,
-- # but understands `-z linker_flag'. GCC discards it without `$wl',
-- # but is careful enough not to reorder.
-- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- if test "$GCC" = yes; then
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-- else
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-- fi
-- ;;
-- esac
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-- ;;
-+ fi
-+ done
-
-- sunos4*)
-- if test "x$host_vendor" = xsequent; then
-- # Use $CC to link under sequent, because it throws in some extra .o
-- # files that make .init and .fini sections work.
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-- fi
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- ;;
-+ cd ..
-+ rm -rf conftest.dir
-+else
-+ am_cv_$1_dependencies_compiler_type=none
-+fi
-+])
-+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-+AM_CONDITIONAL([am__fastdep$1], [
-+ test "x$enable_dependency_tracking" != xno \
-+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-+])
-
-- sysv4)
-- case $host_vendor in
-- sni)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-- ;;
-- siemens)
-- ## LD is ld it makes a PLAMLIB
-- ## CC just makes a GrossModule.
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=no
-- ;;
-- motorola)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-- ;;
-- esac
-- runpath_var='LD_RUN_PATH'
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- ;;
-
-- sysv4.3*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-- ;;
-+# AM_SET_DEPDIR
-+# -------------
-+# Choose a directory name for dependency files.
-+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-+AC_DEFUN([AM_SET_DEPDIR],
-+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-+])
-
-- sysv4*MP*)
-- if test -d /usr/nec; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- runpath_var=LD_RUN_PATH
-- hardcode_runpath_var=yes
-- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-- fi
-- ;;
-
-- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- runpath_var='LD_RUN_PATH'
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
@@ -4686,54 +10265,38 @@
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+])
+- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
- fi
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
+# Generate code to set up dependency tracking. -*- Autoconf -*-
-- sysv5* | sco3.2v5* | sco5v6*)
-- # Note: We can NOT use -z defs as we might desire, because we do not
-- # link with -lc, and that would cause any symbols used from libc to
-- # always be unresolved, which means just about no library would
-- # ever link correctly. If we're not using GNU ld we use -z text
-- # though, which does catch some bad symbols but isn't as heavy-handed
-- # as -z defs.
-- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- netbsd*)
+- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
+- fi
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-- runpath_var='LD_RUN_PATH'
+- ;;
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-
-- if test "$GCC" = yes; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-- fi
-- ;;
++
+#serial 3
-
-- uts4*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- ;;
++
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -4777,21 +10340,12 @@
+ done
+done
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-- *)
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- ;;
-- esac
-- fi
--])
--AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
--test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
++
++
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
- #
--# Do we need to explicitly link libc?
++#
+# This code is only required when automatic dependency tracking
+# is enabled. FIXME. This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
@@ -4800,65 +10354,81 @@
+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
-+
+
+- newsos6)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- ;;
+# Do all the work for Automake. -*- Autoconf -*-
-+
+
+- openbsd*)
+- if test -f /usr/libexec/ld.so; then
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+- else
+- case $host_os in
+- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- ;;
+- *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- ;;
+- esac
+- fi
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008 Free Software Foundation, Inc.
- #
--case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
--x|xyes)
-- # Assume -lc should be added
-- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-- if test "$enable_shared" = yes && test "$GCC" = yes; then
-- case $_LT_AC_TAGVAR(archive_cmds, $1) in
-- *'~'*)
-- # FIXME: we may have to deal with multi-command sequences.
+- os2*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
- ;;
-- '$CC '*)
-- # Test whether the compiler implicitly links with -lc since on some
-- # systems, -lgcc has to come before -lc. If gcc already passes -lc
-- # to ld, don't add -lc before -lgcc.
-- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-- $rm conftest*
-- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+# serial 13
-- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-- soname=conftest
-- lib=conftest
-- libobjs=conftest.$ac_objext
-- deplibs=
-- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-- pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-- compiler_flags=-v
-- linker_flags=-v
-- verstring=
-- output_objdir=.
-- libname=conftest
-- lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-- if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-- then
-- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-- else
-- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-- fi
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+- osf3*)
+- if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
-- cat conftest.err 1>&5
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- fi
-- $rm conftest*
-- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-- esac
+# This macro actually does too much. Some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
-+
+
+- osf4* | osf5*) # as osf3* with the addition of -msym flag
+- if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+- else
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
@@ -4884,12 +10454,14 @@
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
- fi
-- ;;
--esac
--])# AC_LIBTOOL_PROG_LD_SHLIBS
++ fi
+fi
+- # Both c and cxx compiler support -rpath directly
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+- fi
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+- ;;
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
@@ -4900,44 +10472,37 @@
+fi
+AC_SUBST([CYGPATH_W])
--# _LT_AC_FILE_LTDLL_C
--# -------------------
--# Be careful that the start marker always follows a newline.
--AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
--# /* ltdll.c starts here */
--# #define WIN32_LEAN_AND_MEAN
--# #include <windows.h>
--# #undef WIN32_LEAN_AND_MEAN
--# #include <stdio.h>
--#
--# #ifndef __CYGWIN__
--# # ifdef __CYGWIN32__
--# # define __CYGWIN__ __CYGWIN32__
--# # endif
--# #endif
--#
--# #ifdef __cplusplus
--# extern "C" {
--# #endif
--# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
--# #ifdef __cplusplus
--# }
--# #endif
--#
--# #ifdef __CYGWIN__
--# #include <cygwin/cygwin_dll.h>
--# DECLARE_CYGWIN_DLL( DllMain );
--# #endif
--# HINSTANCE __hDllInstance_base;
--#
--# BOOL APIENTRY
--# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
--# {
--# __hDllInstance_base = hInst;
--# return TRUE;
--# }
--# /* ltdll.c ends here */
--])# _LT_AC_FILE_LTDLL_C
+- solaris*)
+- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+- if test "$GCC" = yes; then
+- wlarc='${wl}'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+- else
+- wlarc=''
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+- fi
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- case $host_os in
+- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+- *)
+- # The compiler driver will combine and reorder linker options,
+- # but understands `-z linker_flag'. GCC discards it without `$wl',
+- # but is careful enough not to reorder.
+- # Supported since Solaris 2.6 (maybe 2.5.1?)
+- if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+- else
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+- fi
+- ;;
+- esac
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- ;;
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
@@ -4951,13 +10516,44 @@
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+- sunos4*)
+- if test "x$host_vendor" = xsequent; then
+- # Use $CC to link under sequent, because it throws in some extra .o
+- # files that make .init and .fini sections work.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+- fi
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- ;;
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
--# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
--# ---------------------------------
--AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+- sysv4)
+- case $host_vendor in
+- sni)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+- ;;
+- siemens)
+- ## LD is ld it makes a PLAMLIB
+- ## CC just makes a GrossModule.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- ;;
+- motorola)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+- ;;
+- esac
+- runpath_var='LD_RUN_PATH'
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- ;;
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
@@ -4993,21 +10589,25 @@
+])
+])
-
--# old names
--AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
--AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
--AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
--AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
--AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
--AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
--AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
+- sysv4.3*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+- ;;
+
+- sysv4*MP*)
+- if test -d /usr/nec; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- runpath_var=LD_RUN_PATH
+- hardcode_runpath_var=yes
+- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+- fi
+- ;;
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated. The stamp files are numbered to have different names.
-
--# This is just to silence aclocal about the macro not being used
--ifelse([AC_DISABLE_FAST_INSTALL])
++
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
@@ -5025,20 +10625,25 @@
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
--AC_DEFUN([LT_AC_PROG_GCJ],
--[AC_CHECK_TOOL(GCJ, gcj, no)
-- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-- AC_SUBST(GCJFLAGS)
--])
+- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- runpath_var='LD_RUN_PATH'
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
--AC_DEFUN([LT_AC_PROG_RC],
--[AC_CHECK_TOOL(RC, windres, no)
--])
+- if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- fi
+- ;;
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
@@ -5047,22 +10652,43 @@
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+- sysv5* | sco3.2v5* | sco5v6*)
+- # Note: We can NOT use -z defs as we might desire, because we do not
+- # link with -lc, and that would cause any symbols used from libc to
+- # always be unresolved, which means just about no library would
+- # ever link correctly. If we're not using GNU ld we use -z text
+- # though, which does catch some bad symbols but isn't as heavy-handed
+- # as -z defs.
+- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+- runpath_var='LD_RUN_PATH'
+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
--# Cheap backport of AS_EXECUTABLE_P and required macros
--# from Autoconf 2.59; we should not use $as_executable_p directly.
+- if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+- fi
+- ;;
+# serial 2
--# _AS_TEST_PREPARE
--# ----------------
--m4_ifndef([_AS_TEST_PREPARE],
--[m4_defun([_AS_TEST_PREPARE],
--[if test -x / >/dev/null 2>&1; then
-- as_executable_p='test -x'
+- uts4*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- ;;
+# Check whether the underlying file-system supports filenames
+# with a leading dot. For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
@@ -5070,12 +10696,324 @@
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
- else
++else
++ am__leading_dot=_
++fi
++rmdir .tst 2>/dev/null
++AC_SUBST([am__leading_dot])])
+
+- *)
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
+- esac
+- fi
+-])
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
++# From Jim Meyering
+
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
+ #
+-# Do we need to explicitly link libc?
+-#
+-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+-x|xyes)
+- # Assume -lc should be added
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+- if test "$enable_shared" = yes && test "$GCC" = yes; then
+- case $_LT_AC_TAGVAR(archive_cmds, $1) in
+- *'~'*)
+- # FIXME: we may have to deal with multi-command sequences.
+- ;;
+- '$CC '*)
+- # Test whether the compiler implicitly links with -lc since on some
+- # systems, -lgcc has to come before -lc. If gcc already passes -lc
+- # to ld, don't add -lc before -lgcc.
+- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+- $rm conftest*
+- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++# serial 4
+
+- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+- soname=conftest
+- lib=conftest
+- libobjs=conftest.$ac_objext
+- deplibs=
+- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+- pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+- compiler_flags=-v
+- linker_flags=-v
+- verstring=
+- output_objdir=.
+- libname=conftest
+- lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+- if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+- then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- else
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+- fi
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+- else
+- cat conftest.err 1>&5
+- fi
+- $rm conftest*
+- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+- ;;
+- esac
+- fi
+- ;;
+-esac
+-])# AC_LIBTOOL_PROG_LD_SHLIBS
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++ dnl maintainer-mode is disabled by default
++ AC_ARG_ENABLE(maintainer-mode,
++[ --enable-maintainer-mode enable make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer],
++ USE_MAINTAINER_MODE=$enableval,
++ USE_MAINTAINER_MODE=no)
++ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++ MAINT=$MAINTAINER_MODE_TRUE
++ AC_SUBST(MAINT)dnl
++]
++)
+
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
+-# _LT_AC_FILE_LTDLL_C
+-# -------------------
+-# Be careful that the start marker always follows a newline.
+-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
+-# /* ltdll.c starts here */
+-# #define WIN32_LEAN_AND_MEAN
+-# #include <windows.h>
+-# #undef WIN32_LEAN_AND_MEAN
+-# #include <stdio.h>
+-#
+-# #ifndef __CYGWIN__
+-# # ifdef __CYGWIN32__
+-# # define __CYGWIN__ __CYGWIN32__
+-# # endif
+-# #endif
+-#
+-# #ifdef __cplusplus
+-# extern "C" {
+-# #endif
+-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+-# #ifdef __cplusplus
+-# }
+-# #endif
++# Check to see how 'make' treats includes. -*- Autoconf -*-
++
++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+ #
+-# #ifdef __CYGWIN__
+-# #include <cygwin/cygwin_dll.h>
+-# DECLARE_CYGWIN_DLL( DllMain );
+-# #endif
+-# HINSTANCE __hDllInstance_base;
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 3
++
++# AM_MAKE_INCLUDE()
++# -----------------
++# Check to see how make treats includes.
++AC_DEFUN([AM_MAKE_INCLUDE],
++[am_make=${MAKE-make}
++cat > confinc << 'END'
++am__doit:
++ @echo done
++.PHONY: am__doit
++END
++# If we don't find an include directive, just comment out the code.
++AC_MSG_CHECKING([for style of include used by $am_make])
++am__include="#"
++am__quote=
++_am_result=none
++# First try GNU make style include.
++echo "include confinc" > confmf
++# We grep out `Entering directory' and `Leaving directory'
++# messages which can occur if `w' ends up in MAKEFLAGS.
++# In particular we don't look at `^make:' because GNU make might
++# be invoked under some other name (usually "gmake"), in which
++# case it prints its new name instead of `make'.
++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
++ am__include=include
++ am__quote=
++ _am_result=GNU
++fi
++# Now try BSD make style include.
++if test "$am__include" = "#"; then
++ echo '.include "confinc"' > confmf
++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
++ am__include=.include
++ am__quote="\""
++ _am_result=BSD
++ fi
++fi
++AC_SUBST([am__include])
++AC_SUBST([am__quote])
++AC_MSG_RESULT([$_am_result])
++rm -f confinc confmf
++])
++
++# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
++# Free Software Foundation, Inc.
+ #
+-# BOOL APIENTRY
+-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+-# {
+-# __hDllInstance_base = hInst;
+-# return TRUE;
+-# }
+-# /* ltdll.c ends here */
+-])# _LT_AC_FILE_LTDLL_C
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 5
++
++# AM_PROG_CC_C_O
++# --------------
++# Like AC_PROG_CC_C_O, but changed for automake.
++AC_DEFUN([AM_PROG_CC_C_O],
++[AC_REQUIRE([AC_PROG_CC_C_O])dnl
++AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++AC_REQUIRE_AUX_FILE([compile])dnl
++# FIXME: we rely on the cache variable name because
++# there is no other way.
++set dummy $CC
++ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
++if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
++ # Losing compiler, so override with the script.
++ # FIXME: It is wrong to rewrite CC.
++ # But if we don't then we get into trouble of one sort or another.
++ # A longer-term fix would be to have automake use am__CC in this case,
++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
++ CC="$am_aux_dir/compile $CC"
++fi
++dnl Make sure AC_PROG_CC is never called again, or it will override our
++dnl setting of CC.
++m4_define([AC_PROG_CC],
++ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
++])
+
++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
+-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+-# ---------------------------------
+-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
++# serial 5
+
+-# old names
+-AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
+-AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+-AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+-AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
+-AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
++# AM_MISSING_PROG(NAME, PROGRAM)
++# ------------------------------
++AC_DEFUN([AM_MISSING_PROG],
++[AC_REQUIRE([AM_MISSING_HAS_RUN])
++$1=${$1-"${am_missing_run}$2"}
++AC_SUBST($1)])
+
+-# This is just to silence aclocal about the macro not being used
+-ifelse([AC_DISABLE_FAST_INSTALL])
+
+-AC_DEFUN([LT_AC_PROG_GCJ],
+-[AC_CHECK_TOOL(GCJ, gcj, no)
+- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+- AC_SUBST(GCJFLAGS)
++# AM_MISSING_HAS_RUN
++# ------------------
++# Define MISSING if not defined so far and test if it supports --run.
++# If it does, set am_missing_run to use it, otherwise, to nothing.
++AC_DEFUN([AM_MISSING_HAS_RUN],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++AC_REQUIRE_AUX_FILE([missing])dnl
++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++# Use eval to expand $SHELL
++if eval "$MISSING --run true"; then
++ am_missing_run="$MISSING --run "
++else
++ am_missing_run=
++ AC_MSG_WARN([`missing' script is too old or missing])
++fi
+ ])
+
+-AC_DEFUN([LT_AC_PROG_RC],
+-[AC_CHECK_TOOL(RC, windres, no)
++# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_PROG_MKDIR_P
++# ---------------
++# Check for `mkdir -p'.
++AC_DEFUN([AM_PROG_MKDIR_P],
++[AC_PREREQ([2.60])dnl
++AC_REQUIRE([AC_PROG_MKDIR_P])dnl
++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
++dnl while keeping a definition of mkdir_p for backward compatibility.
++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
++dnl Makefile.ins that do not define MKDIR_P, so we do our own
++dnl adjustment using top_builddir (which is defined more often than
++dnl MKDIR_P).
++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
++case $mkdir_p in
++ [[\\/$]]* | ?:[[\\/]]*) ;;
++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
+ ])
+
++# Helper functions for option handling. -*- Autoconf -*-
+
+-# Cheap backport of AS_EXECUTABLE_P and required macros
+-# from Autoconf 2.59; we should not use $as_executable_p directly.
++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# _AS_TEST_PREPARE
+-# ----------------
+-m4_ifndef([_AS_TEST_PREPARE],
+-[m4_defun([_AS_TEST_PREPARE],
+-[if test -x / >/dev/null 2>&1; then
+- as_executable_p='test -x'
+-else
- as_executable_p='test -f'
-+ am__leading_dot=_
- fi
+-fi
-])])# _AS_TEST_PREPARE
--
++# serial 3
+
-# AS_EXECUTABLE_P
-# ---------------
-# Check whether a file is executable.
@@ -5084,7 +11022,11 @@
-[AS_REQUIRE([_AS_TEST_PREPARE])dnl
-$as_executable_p $1[]dnl
-])])# AS_EXECUTABLE_P
--
++# _AM_MANGLE_OPTION(NAME)
++# -----------------------
++AC_DEFUN([_AM_MANGLE_OPTION],
++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
-# NOTE: This macro has been submitted for inclusion into #
-# GNU Autoconf as AC_PROG_SED. When it is available in #
-# a released version of Autoconf we should remove this #
@@ -5147,57 +11089,12 @@
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])
-+rmdir .tst 2>/dev/null
-+AC_SUBST([am__leading_dot])])
-
- # Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
- # From Jim Meyering
-@@ -7833,205 +8172,47 @@
- dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
- dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
- dnl Makefile.ins that do not define MKDIR_P, so we do our own
--dnl adjustment using top_builddir (which is defined more often than
--dnl MKDIR_P).
--AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
--case $mkdir_p in
-- [[\\/$]]* | ?:[[\\/]]*) ;;
-- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
--esac
--])
--
--# Helper functions for option handling. -*- Autoconf -*-
--
--# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 3
--
--# _AM_MANGLE_OPTION(NAME)
--# -----------------------
--AC_DEFUN([_AM_MANGLE_OPTION],
--[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
--
--# _AM_SET_OPTION(NAME)
--# ------------------------------
--# Set option NAME. Presently that only means defining a flag for this option.
--AC_DEFUN([_AM_SET_OPTION],
--[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
--
--# _AM_SET_OPTIONS(OPTIONS)
--# ----------------------------------
--# OPTIONS is a space-separated list of Automake options.
--AC_DEFUN([_AM_SET_OPTIONS],
--[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
--
--# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
--# -------------------------------------------
--# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
--AC_DEFUN([_AM_IF_OPTION],
--[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
--
++# _AM_SET_OPTION(NAME)
++# ------------------------------
++# Set option NAME. Presently that only means defining a flag for this option.
++AC_DEFUN([_AM_SET_OPTION],
++[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-#
-# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
@@ -5215,12 +11112,28 @@
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--#
++# _AM_SET_OPTIONS(OPTIONS)
++# ----------------------------------
++# OPTIONS is a space-separated list of Automake options.
++AC_DEFUN([_AM_SET_OPTIONS],
++[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++
++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
++# -------------------------------------------
++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
++AC_DEFUN([_AM_IF_OPTION],
++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
++
++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+ #
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
--
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
@@ -5242,13 +11155,27 @@
-
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
--
++# AM_RUN_LOG(COMMAND)
++# -------------------
++# Run COMMAND, save the exit status in ac_status, and log it.
++# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
++AC_DEFUN([AM_RUN_LOG],
++[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
++ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++ (exit $ac_status); }])
+
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
--#
++# Check to make sure that the build environment is sane. -*- Autoconf -*-
++
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
+ #
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
@@ -5261,24 +11188,47 @@
-m4_ifvaln([$3], [else
- $3])dnl
-fi])
--
--
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
++# serial 4
+
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
--[if test -n "$PKG_CONFIG"; then
-- if test -n "$$1"; then
-- pkg_cv_[]$1="$$1"
-- else
-- PKG_CHECK_EXISTS([$3],
-- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-- [pkg_failed=yes])
-- fi
--else
-- pkg_failed=untried
+-[if test -n "$$1"; then
+- pkg_cv_[]$1="$$1"
+- elif test -n "$PKG_CONFIG"; then
+- PKG_CHECK_EXISTS([$3],
+- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+- [pkg_failed=yes])
+- else
+- pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
--
++# AM_SANITY_CHECK
++# ---------------
++AC_DEFUN([AM_SANITY_CHECK],
++[AC_MSG_CHECKING([whether build environment is sane])
++# Just in case
++sleep 1
++echo timestamp > conftest.file
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments. Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++ if test "$[*]" = "X"; then
++ # -L didn't work.
++ set X `ls -t $srcdir/configure conftest.file`
++ fi
++ rm -f conftest.file
++ if test "$[*]" != "X $srcdir/configure conftest.file" \
++ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
@@ -5289,8 +11239,25 @@
- _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
--
--
++ # If neither matched, then we have a broken ls. This can happen
++ # if, for instance, CONFIG_SHELL is bash and it inherits a
++ # broken ls alias from the environment. This has actually
++ # happened. Such a system could not be considered "sane".
++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
++alias in your environment])
++ fi
+
++ test "$[2]" = conftest.file
++ )
++then
++ # Ok.
++ :
++else
++ AC_MSG_ERROR([newly created file is older than distributed files!
++Check your system clock])
++fi
++AC_MSG_RESULT(yes)])
+
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
@@ -5299,59 +11266,144 @@
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
--#
++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+ #
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
--
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
--
++# AM_PROG_INSTALL_STRIP
++# ---------------------
++# One issue with vendor `install' (even GNU) is that you can't
++# specify the program used to strip binaries. This is especially
++# annoying in cross-compiling environments, where the build's strip
++# is unlikely to handle the host's binaries.
++# Fortunately install-sh will honor a STRIPPROG variable, so we
++# always use install-sh in `make install-strip', and initialize
++# STRIPPROG with the value of the STRIP variable (set by the user).
++AC_DEFUN([AM_PROG_INSTALL_STRIP],
++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'. However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
++if test "$cross_compiling" != no; then
++ AC_CHECK_TOOL([STRIP], [strip], :)
++fi
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
++AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
--
--m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
--and $1[]_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.])
-+dnl adjustment using top_builddir (which is defined more often than
-+dnl MKDIR_P).
-+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-+case $mkdir_p in
-+ [[\\/$]]* | ?:[[\\/]]*) ;;
-+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+])
-
--if test $pkg_failed = yes; then
-- _PKG_SHORT_ERRORS_SUPPORTED
-- if test $_pkg_short_errors_supported = yes; then
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-- else
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-+# Helper functions for option handling. -*- Autoconf -*-
-
-- ifelse([$4], , [AC_MSG_ERROR(dnl
--[Package requirements ($2) were not met:
-+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
++# Copyright (C) 2006 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+-and $1[]_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.])
++# _AM_SUBST_NOTMAKE(VARIABLE)
++# ---------------------------
++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
++# This macro is traced by Automake.
++AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+-if test $pkg_failed = yes; then
+- _PKG_SHORT_ERRORS_SUPPORTED
+- if test $_pkg_short_errors_supported = yes; then
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+- else
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
++# Check how to create a tarball. -*- Autoconf -*-
+
+- ifelse([$4], , [AC_MSG_ERROR(dnl
+-[Package requirements ($2) were not met:
++# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
-$$1_PKG_ERRORS
-+# serial 3
++# serial 2
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++# _AM_PROG_TAR(FORMAT)
++# --------------------
++# Check how to create a tarball in format FORMAT.
++# FORMAT should be one of `v7', `ustar', or `pax'.
++#
++# Substitute a variable $(am__tar) that is a command
++# writing to stdout a FORMAT-tarball containing the directory
++# $tardir.
++# tardir=directory && $(am__tar) > result.tar
++#
++# Substitute a variable $(am__untar) that extract such
++# a tarball read from stdin.
++# $(am__untar) < result.tar
++AC_DEFUN([_AM_PROG_TAR],
++[# Always define AMTAR for backward compatibility.
++AM_MISSING_PROG([AMTAR], [tar])
++m4_if([$1], [v7],
++ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
++ [m4_case([$1], [ustar],, [pax],,
++ [m4_fatal([Unknown tar format])])
++AC_MSG_CHECKING([how to create a $1 tar archive])
++# Loop over all known methods to create a tar archive until one works.
++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
++_am_tools=${am_cv_prog_tar_$1-$_am_tools}
++# Do not fold the above two line into one, because Tru64 sh and
++# Solaris sh will not grok spaces in the rhs of `-'.
++for _am_tool in $_am_tools
++do
++ case $_am_tool in
++ gnutar)
++ for _am_tar in tar gnutar gtar;
++ do
++ AM_RUN_LOG([$_am_tar --version]) && break
++ done
++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
++ am__untar="$_am_tar -xf -"
++ ;;
++ plaintar)
++ # Must skip GNU tar: if it does not support --format= it doesn't create
++ # ustar tarball either.
++ (tar --version) >/dev/null 2>&1 && continue
++ am__tar='tar chf - "$$tardir"'
++ am__tar_='tar chf - "$tardir"'
++ am__untar='tar xf -'
++ ;;
++ pax)
++ am__tar='pax -L -x $1 -w "$$tardir"'
++ am__tar_='pax -L -x $1 -w "$tardir"'
++ am__untar='pax -r'
++ ;;
++ cpio)
++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
++ am__untar='cpio -i -H $1 -d'
++ ;;
++ none)
++ am__tar=false
++ am__tar_=false
++ am__untar=false
++ ;;
++ esac
-_PKG_TEXT
-])],
@@ -5362,20 +11414,25 @@
-[The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-+# _AM_SET_OPTION(NAME)
-+# ------------------------------
-+# Set option NAME. Presently that only means defining a flag for this option.
-+AC_DEFUN([_AM_SET_OPTION],
-+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
++ # If the value was cached, stop now. We just wanted to have am__tar
++ # and am__untar set.
++ test -n "${am_cv_prog_tar_$1}" && break
-_PKG_TEXT
-+# _AM_SET_OPTIONS(OPTIONS)
-+# ----------------------------------
-+# OPTIONS is a space-separated list of Automake options.
-+AC_DEFUN([_AM_SET_OPTIONS],
-+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
++ # tar/untar a dummy directory, and stop if the command works
++ rm -rf conftest.dir
++ mkdir conftest.dir
++ echo GrepMe > conftest.dir/file
++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
++ rm -rf conftest.dir
++ if test -s conftest.tar; then
++ AM_RUN_LOG([$am__untar <conftest.tar])
++ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
++ fi
++done
++rm -rf conftest.dir
+
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
- [$4])
-else
- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -5384,223 +11441,28 @@
- ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
-+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-+# -------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+AC_DEFUN([_AM_IF_OPTION],
-+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
- # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
- #
-@@ -8238,195 +8419,5 @@
- AC_SUBST([am__untar])
- ]) # _AM_PROG_TAR
-
--# gnome-common.m4
--#
--
--dnl GNOME_COMMON_INIT
--
--AC_DEFUN([GNOME_COMMON_INIT],
--[
-- dnl this macro should come after AC_CONFIG_MACRO_DIR
-- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
--
-- dnl ensure that when the Automake generated makefile calls aclocal,
-- dnl it honours the $ACLOCAL_FLAGS environment variable
-- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
-- if test -n "$ac_macro_dir"; then
-- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
-- fi
--
-- AC_SUBST([ACLOCAL_AMFLAGS])
--])
--
--AC_DEFUN([GNOME_DEBUG_CHECK],
--[
-- AC_ARG_ENABLE([debug],
-- AC_HELP_STRING([--enable-debug],
-- [turn on debugging]),,
-- [enable_debug=no])
--
-- if test x$enable_debug = xyes ; then
-- AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
-- [Enable additional debugging at the expense of performance and size])
-- fi
--])
--
--dnl GNOME_MAINTAINER_MODE_DEFINES ()
--dnl define DISABLE_DEPRECATED
--dnl
--AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
--[
-- AC_REQUIRE([AM_MAINTAINER_MODE])
--
-- if test $USE_MAINTAINER_MODE = yes; then
-- DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED"
-- else
-- DISABLE_DEPRECATED=""
-- fi
-- AC_SUBST(DISABLE_DEPRECATED)
--])
--
--dnl GNOME_COMPILE_WARNINGS
--dnl Turn on many useful compiler warnings
--dnl For now, only works on GCC
--AC_DEFUN([GNOME_COMPILE_WARNINGS],[
-- dnl ******************************
-- dnl More compiler warnings
-- dnl ******************************
--
-- AC_ARG_ENABLE(compile-warnings,
-- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-- [Turn on compiler warnings]),,
-- [enable_compile_warnings="m4_default([$1],[yes])"])
--
-- warnCFLAGS=
-- if test "x$GCC" != xyes; then
-- enable_compile_warnings=no
-- fi
--
-- warning_flags=
-- realsave_CFLAGS="$CFLAGS"
--
-- case "$enable_compile_warnings" in
-- no)
-- warning_flags=
-- ;;
-- minimum)
-- warning_flags="-Wall"
-- ;;
-- yes)
-- warning_flags="-Wall -Wmissing-prototypes"
-- ;;
-- maximum|error)
-- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-- CFLAGS="$warning_flags $CFLAGS"
-- for option in -Wno-sign-compare; do
-- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS $option"
-- AC_MSG_CHECKING([whether gcc understands $option])
-- AC_TRY_COMPILE([], [],
-- has_option=yes,
-- has_option=no,)
-- CFLAGS="$SAVE_CFLAGS"
-- AC_MSG_RESULT($has_option)
-- if test $has_option = yes; then
-- warning_flags="$warning_flags $option"
-- fi
-- unset has_option
-- unset SAVE_CFLAGS
-- done
-- unset option
-- if test "$enable_compile_warnings" = "error" ; then
-- warning_flags="$warning_flags -Werror"
-- fi
-- ;;
-- *)
-- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
-- ;;
-- esac
-- CFLAGS="$realsave_CFLAGS"
-- AC_MSG_CHECKING(what warning flags to pass to the C compiler)
-- AC_MSG_RESULT($warning_flags)
--
-- AC_ARG_ENABLE(iso-c,
-- AC_HELP_STRING([--enable-iso-c],
-- [Try to warn if code is not ISO C ]),,
-- [enable_iso_c=no])
--
-- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
-- complCFLAGS=
-- if test "x$enable_iso_c" != "xno"; then
-- if test "x$GCC" = "xyes"; then
-- case " $CFLAGS " in
-- *[\ \ ]-ansi[\ \ ]*) ;;
-- *) complCFLAGS="$complCFLAGS -ansi" ;;
-- esac
-- case " $CFLAGS " in
-- *[\ \ ]-pedantic[\ \ ]*) ;;
-- *) complCFLAGS="$complCFLAGS -pedantic" ;;
-- esac
-- fi
-- fi
-- AC_MSG_RESULT($complCFLAGS)
--
-- WARN_CFLAGS="$warning_flags $complCFLAGS"
-- AC_SUBST(WARN_CFLAGS)
--])
--
--dnl For C++, do basically the same thing.
--
--AC_DEFUN([GNOME_CXX_WARNINGS],[
-- AC_ARG_ENABLE(cxx-warnings,
-- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
-- [Turn on compiler warnings.]),,
-- [enable_cxx_warnings="m4_default([$1],[minimum])"])
--
-- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
-- warnCXXFLAGS=
-- if test "x$GXX" != xyes; then
-- enable_cxx_warnings=no
-- fi
-- if test "x$enable_cxx_warnings" != "xno"; then
-- if test "x$GXX" = "xyes"; then
-- case " $CXXFLAGS " in
-- *[\ \ ]-Wall[\ \ ]*) ;;
-- *) warnCXXFLAGS="-Wall -Wno-unused" ;;
-- esac
--
-- ## -W is not all that useful. And it cannot be controlled
-- ## with individual -Wno-xxx flags, unlike -Wall
-- if test "x$enable_cxx_warnings" = "xyes"; then
-- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
-- fi
-- fi
-- fi
-- AC_MSG_RESULT($warnCXXFLAGS)
--
-- AC_ARG_ENABLE(iso-cxx,
-- AC_HELP_STRING([--enable-iso-cxx],
-- [Try to warn if code is not ISO C++ ]),,
-- [enable_iso_cxx=no])
--
-- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
-- complCXXFLAGS=
-- if test "x$enable_iso_cxx" != "xno"; then
-- if test "x$GXX" = "xyes"; then
-- case " $CXXFLAGS " in
-- *[\ \ ]-ansi[\ \ ]*) ;;
-- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
-- esac
--
-- case " $CXXFLAGS " in
-- *[\ \ ]-pedantic[\ \ ]*) ;;
-- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-- esac
-- fi
-- fi
-- AC_MSG_RESULT($complCXXFLAGS)
--
-- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-- AC_SUBST(WARN_CXXFLAGS)
--])
--
++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
++AC_MSG_RESULT([$am_cv_prog_tar_$1])])
++AC_SUBST([am__tar])
++AC_SUBST([am__untar])
++]) # _AM_PROG_TAR
+
m4_include([m4/gnome-doc-utils.m4])
m4_include([m4/intltool.m4])
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/capplets/about-me/Makefile.in control-center-2.22.2.1/capplets/about-me/Makefile.in
---- control-center-2.22.2.1.old/capplets/about-me/Makefile.in 1974-05-20 03:44:04.000000000 +0100
-+++ control-center-2.22.2.1/capplets/about-me/Makefile.in 2008-05-29 10:34:57.000000000 +0200
-@@ -213,8 +213,6 @@
+Index: gnome-control-center-2.24.0.1/capplets/about-me/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/capplets/about-me/Makefile.in 2008-09-24 18:41:35.000000000 +0200
++++ gnome-control-center-2.24.0.1/capplets/about-me/Makefile.in 2008-12-28 13:26:32.812355131 +0100
+@@ -204,8 +204,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -250,6 +248,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -238,6 +236,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -5609,7 +11471,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -329,7 +329,6 @@
+@@ -306,7 +306,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -5617,19 +11479,20 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/capplets/accessibility/at-properties/Makefile.in control-center-2.22.2.1/capplets/accessibility/at-properties/Makefile.in
---- control-center-2.22.2.1.old/capplets/accessibility/at-properties/Makefile.in 1974-05-20 03:44:05.000000000 +0100
-+++ control-center-2.22.2.1/capplets/accessibility/at-properties/Makefile.in 2008-05-29 10:34:58.000000000 +0200
-@@ -211,8 +211,6 @@
+Index: gnome-control-center-2.24.0.1/capplets/accessibility/at-properties/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/capplets/accessibility/at-properties/Makefile.in 2008-09-24 18:41:36.000000000 +0200
++++ gnome-control-center-2.24.0.1/capplets/accessibility/at-properties/Makefile.in 2008-12-28 13:26:33.028355070 +0100
+@@ -202,8 +202,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -248,6 +246,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -236,6 +234,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -5638,7 +11501,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -327,7 +327,6 @@
+@@ -304,7 +304,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -5646,19 +11509,20 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
gnome_at_properties_LDADD = $(AT_CAPPLET_LIBS) $(GNOMECC_CAPPLETS_LIBS) $(top_builddir)/capplets/common/libcommon.la
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/capplets/accessibility/Makefile.in control-center-2.22.2.1/capplets/accessibility/Makefile.in
---- control-center-2.22.2.1.old/capplets/accessibility/Makefile.in 1974-05-20 03:44:04.000000000 +0100
-+++ control-center-2.22.2.1/capplets/accessibility/Makefile.in 2008-05-29 10:34:58.000000000 +0200
-@@ -182,8 +182,6 @@
+Index: gnome-control-center-2.24.0.1/capplets/accessibility/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/capplets/accessibility/Makefile.in 2008-09-24 18:41:35.000000000 +0200
++++ gnome-control-center-2.24.0.1/capplets/accessibility/Makefile.in 2008-12-28 13:26:32.904355232 +0100
+@@ -173,8 +173,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -219,6 +217,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -207,6 +205,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -5667,7 +11531,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -298,7 +298,6 @@
+@@ -275,7 +275,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -5675,19 +11539,20 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = at-properties
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/capplets/appearance/data/Makefile.in control-center-2.22.2.1/capplets/appearance/data/Makefile.in
---- control-center-2.22.2.1.old/capplets/appearance/data/Makefile.in 1974-05-20 03:44:06.000000000 +0100
-+++ control-center-2.22.2.1/capplets/appearance/data/Makefile.in 2008-05-29 10:34:59.000000000 +0200
-@@ -192,8 +192,6 @@
+Index: gnome-control-center-2.24.0.1/capplets/appearance/data/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/capplets/appearance/data/Makefile.in 2008-09-24 18:41:36.000000000 +0200
++++ gnome-control-center-2.24.0.1/capplets/appearance/data/Makefile.in 2008-12-28 13:26:33.284354924 +0100
+@@ -183,8 +183,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -229,6 +227,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -217,6 +215,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -5696,7 +11561,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -308,7 +308,6 @@
+@@ -285,7 +285,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -5704,19 +11569,20 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
gladedir = $(pkgdatadir)/glade
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/capplets/appearance/Makefile.in control-center-2.22.2.1/capplets/appearance/Makefile.in
---- control-center-2.22.2.1.old/capplets/appearance/Makefile.in 1974-05-20 03:44:05.000000000 +0100
-+++ control-center-2.22.2.1/capplets/appearance/Makefile.in 2008-05-29 10:34:59.000000000 +0200
-@@ -218,8 +218,6 @@
+Index: gnome-control-center-2.24.0.1/capplets/appearance/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/capplets/appearance/Makefile.in 2008-09-24 18:41:36.000000000 +0200
++++ gnome-control-center-2.24.0.1/capplets/appearance/Makefile.in 2008-12-28 13:26:33.172355355 +0100
+@@ -209,8 +209,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -255,6 +253,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -243,6 +241,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -5725,7 +11591,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -334,7 +334,6 @@
+@@ -311,7 +311,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -5733,19 +11599,20 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = data
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/capplets/common/Makefile.in control-center-2.22.2.1/capplets/common/Makefile.in
---- control-center-2.22.2.1.old/capplets/common/Makefile.in 1974-05-20 03:44:06.000000000 +0100
-+++ control-center-2.22.2.1/capplets/common/Makefile.in 2008-05-29 10:35:00.000000000 +0200
-@@ -204,8 +204,6 @@
+Index: gnome-control-center-2.24.0.1/capplets/common/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/capplets/common/Makefile.in 2008-09-24 18:41:36.000000000 +0200
++++ gnome-control-center-2.24.0.1/capplets/common/Makefile.in 2008-12-28 13:26:33.424355119 +0100
+@@ -193,8 +193,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -241,6 +239,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -227,6 +225,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -5754,7 +11621,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -320,7 +320,6 @@
+@@ -295,7 +295,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -5762,19 +11629,20 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = ChangeLog
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/capplets/default-applications/Makefile.in control-center-2.22.2.1/capplets/default-applications/Makefile.in
---- control-center-2.22.2.1.old/capplets/default-applications/Makefile.in 1974-05-20 03:44:07.000000000 +0100
-+++ control-center-2.22.2.1/capplets/default-applications/Makefile.in 2008-05-29 10:35:06.000000000 +0200
-@@ -220,8 +220,6 @@
+Index: gnome-control-center-2.24.0.1/capplets/default-applications/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/capplets/default-applications/Makefile.in 2008-09-24 18:41:36.000000000 +0200
++++ gnome-control-center-2.24.0.1/capplets/default-applications/Makefile.in 2008-12-28 13:26:33.627855145 +0100
+@@ -226,8 +226,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -257,6 +255,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -260,6 +258,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -5783,7 +11651,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -336,7 +336,6 @@
+@@ -328,7 +328,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -5791,19 +11659,20 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/capplets/display/Makefile.in control-center-2.22.2.1/capplets/display/Makefile.in
---- control-center-2.22.2.1.old/capplets/display/Makefile.in 1974-05-20 03:44:07.000000000 +0100
-+++ control-center-2.22.2.1/capplets/display/Makefile.in 2008-05-29 10:35:07.000000000 +0200
-@@ -221,8 +221,6 @@
+Index: gnome-control-center-2.24.0.1/capplets/display/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/capplets/display/Makefile.in 2008-09-24 18:41:37.000000000 +0200
++++ gnome-control-center-2.24.0.1/capplets/display/Makefile.in 2008-12-28 13:26:33.807855257 +0100
+@@ -214,8 +214,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -258,6 +256,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -248,6 +246,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -5812,7 +11681,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -337,7 +337,6 @@
+@@ -316,7 +316,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -5820,19 +11689,20 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/capplets/keybindings/Makefile.in control-center-2.22.2.1/capplets/keybindings/Makefile.in
---- control-center-2.22.2.1.old/capplets/keybindings/Makefile.in 1974-05-20 03:44:07.000000000 +0100
-+++ control-center-2.22.2.1/capplets/keybindings/Makefile.in 2008-05-29 10:35:11.000000000 +0200
-@@ -212,8 +212,6 @@
+Index: gnome-control-center-2.24.0.1/capplets/keybindings/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/capplets/keybindings/Makefile.in 2008-09-24 18:41:37.000000000 +0200
++++ gnome-control-center-2.24.0.1/capplets/keybindings/Makefile.in 2008-12-28 13:26:33.983855279 +0100
+@@ -203,8 +203,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -249,6 +247,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -237,6 +235,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -5841,7 +11711,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -328,7 +328,6 @@
+@@ -305,7 +305,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -5849,19 +11719,20 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/capplets/keyboard/Makefile.in control-center-2.22.2.1/capplets/keyboard/Makefile.in
---- control-center-2.22.2.1.old/capplets/keyboard/Makefile.in 1974-05-20 03:44:08.000000000 +0100
-+++ control-center-2.22.2.1/capplets/keyboard/Makefile.in 2008-05-29 10:35:11.000000000 +0200
-@@ -215,8 +215,6 @@
+Index: gnome-control-center-2.24.0.1/capplets/keyboard/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/capplets/keyboard/Makefile.in 2008-09-24 18:41:37.000000000 +0200
++++ gnome-control-center-2.24.0.1/capplets/keyboard/Makefile.in 2008-12-28 13:26:34.151854634 +0100
+@@ -206,8 +206,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -252,6 +250,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -240,6 +238,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -5870,7 +11741,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -331,7 +331,6 @@
+@@ -308,7 +308,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -5878,19 +11749,20 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/capplets/Makefile.in control-center-2.22.2.1/capplets/Makefile.in
---- control-center-2.22.2.1.old/capplets/Makefile.in 1974-05-20 03:44:04.000000000 +0100
-+++ control-center-2.22.2.1/capplets/Makefile.in 2008-05-29 10:34:56.000000000 +0200
-@@ -184,8 +184,6 @@
+Index: gnome-control-center-2.24.0.1/capplets/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/capplets/Makefile.in 2008-09-24 18:41:35.000000000 +0200
++++ gnome-control-center-2.24.0.1/capplets/Makefile.in 2008-12-28 13:26:32.660356133 +0100
+@@ -175,8 +175,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -221,6 +219,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -209,6 +207,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -5899,7 +11771,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -300,7 +300,6 @@
+@@ -277,7 +277,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -5907,19 +11779,20 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
always_built_SUBDIRS = \
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/capplets/mouse/Makefile.in control-center-2.22.2.1/capplets/mouse/Makefile.in
---- control-center-2.22.2.1.old/capplets/mouse/Makefile.in 1974-05-20 03:44:08.000000000 +0100
-+++ control-center-2.22.2.1/capplets/mouse/Makefile.in 2008-05-29 10:35:12.000000000 +0200
-@@ -207,8 +207,6 @@
+Index: gnome-control-center-2.24.0.1/capplets/mouse/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/capplets/mouse/Makefile.in 2008-09-24 18:41:37.000000000 +0200
++++ gnome-control-center-2.24.0.1/capplets/mouse/Makefile.in 2008-12-28 13:26:34.311854788 +0100
+@@ -198,8 +198,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -244,6 +242,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -232,6 +230,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -5928,7 +11801,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -323,7 +323,6 @@
+@@ -300,7 +300,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -5936,19 +11809,20 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/capplets/network/Makefile.in control-center-2.22.2.1/capplets/network/Makefile.in
---- control-center-2.22.2.1.old/capplets/network/Makefile.in 1974-05-20 03:44:09.000000000 +0100
-+++ control-center-2.22.2.1/capplets/network/Makefile.in 2008-05-29 10:35:12.000000000 +0200
-@@ -221,8 +221,6 @@
+Index: gnome-control-center-2.24.0.1/capplets/network/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/capplets/network/Makefile.in 2008-09-24 18:41:37.000000000 +0200
++++ gnome-control-center-2.24.0.1/capplets/network/Makefile.in 2008-12-28 13:26:34.491857345 +0100
+@@ -212,8 +212,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -258,6 +256,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -246,6 +244,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -5957,7 +11831,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -337,7 +337,6 @@
+@@ -314,7 +314,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -5965,19 +11839,20 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/capplets/sound/Makefile.in control-center-2.22.2.1/capplets/sound/Makefile.in
---- control-center-2.22.2.1.old/capplets/sound/Makefile.in 1974-05-20 03:44:09.000000000 +0100
-+++ control-center-2.22.2.1/capplets/sound/Makefile.in 2008-05-29 10:35:13.000000000 +0200
-@@ -224,8 +224,6 @@
+Index: gnome-control-center-2.24.0.1/capplets/sound/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/capplets/sound/Makefile.in 2008-09-24 18:41:37.000000000 +0200
++++ gnome-control-center-2.24.0.1/capplets/sound/Makefile.in 2008-12-28 13:26:34.671854523 +0100
+@@ -215,8 +215,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -261,6 +259,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -249,6 +247,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -5986,7 +11861,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -340,7 +340,6 @@
+@@ -317,7 +317,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -5994,19 +11869,20 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/capplets/windows/Makefile.in control-center-2.22.2.1/capplets/windows/Makefile.in
---- control-center-2.22.2.1.old/capplets/windows/Makefile.in 2008-05-29 10:34:07.000000000 +0200
-+++ control-center-2.22.2.1/capplets/windows/Makefile.in 2008-05-29 10:35:13.000000000 +0200
-@@ -208,8 +208,6 @@
+Index: gnome-control-center-2.24.0.1/capplets/windows/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/capplets/windows/Makefile.in 2008-12-28 13:23:47.448358310 +0100
++++ gnome-control-center-2.24.0.1/capplets/windows/Makefile.in 2008-12-28 13:26:34.831855165 +0100
+@@ -199,8 +199,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -245,6 +243,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -233,6 +231,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -6015,7 +11891,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -324,7 +324,6 @@
+@@ -301,7 +301,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -6023,14 +11899,24 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/configure control-center-2.22.2.1/configure
---- control-center-2.22.2.1.old/configure 1974-05-20 03:44:01.000000000 +0100
-+++ control-center-2.22.2.1/configure 2008-05-29 10:34:51.000000000 +0200
+@@ -320,7 +319,7 @@ Desktop_in_files = window-properties.des
+ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
+ INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) \
+ -I$(top_srcdir)/libwindow-settings \
+- -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" \
++ -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/libgnome-window-settings1"\" \
+ -DGLADEDIR=\""$(gladedir)"\" \
+ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+ -DPIXMAPDIR=\""$(pixmapdir)"\"
+Index: gnome-control-center-2.24.0.1/configure
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/configure 2008-09-24 18:41:34.000000000 +0200
++++ gnome-control-center-2.24.0.1/configure 2008-12-28 13:26:37.219858180 +0100
@@ -1,11 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.62 for gnome-control-center 2.22.2.1.
-+# Generated by GNU Autoconf 2.61 for gnome-control-center 2.22.2.1.
+-# Generated by GNU Autoconf 2.62 for gnome-control-center 2.24.0.1.
++# Generated by GNU Autoconf 2.61 for gnome-control-center 2.24.0.1.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center>.
#
@@ -6040,7 +11926,7 @@
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
-@@ -17,7 +17,7 @@
+@@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -6049,7 +11935,7 @@
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-@@ -39,45 +39,17 @@
+@@ -39,45 +39,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
@@ -6104,7 +11990,7 @@
fi
# Support unset when possible.
-@@ -93,6 +65,8 @@
+@@ -93,6 +65,8 @@ fi
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
@@ -6113,7 +11999,7 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-@@ -115,7 +89,7 @@
+@@ -115,7 +89,7 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
@@ -6122,7 +12008,7 @@
{ (exit 1); exit 1; }
fi
-@@ -128,10 +102,17 @@
+@@ -128,10 +102,17 @@ PS2='> '
PS4='+ '
# NLS nuisances.
@@ -6144,7 +12030,7 @@
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -153,7 +134,7 @@
+@@ -153,7 +134,7 @@ as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
@@ -6153,7 +12039,7 @@
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
-@@ -179,7 +160,7 @@
+@@ -179,7 +160,7 @@ else
as_have_required=no
fi
@@ -6162,7 +12048,7 @@
(as_func_return () {
(exit \$1)
}
-@@ -261,7 +242,7 @@
+@@ -261,7 +242,7 @@ IFS=$as_save_IFS
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -6171,7 +12057,7 @@
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-@@ -282,7 +263,7 @@
+@@ -282,7 +263,7 @@ _ASEOF
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -6180,7 +12066,7 @@
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-@@ -362,10 +343,10 @@
+@@ -362,10 +343,10 @@ fi
if test "x$CONFIG_SHELL" != x; then
for as_var in BASH_ENV ENV
@@ -6195,7 +12081,7 @@
fi
-@@ -434,10 +415,9 @@
+@@ -434,10 +415,9 @@ fi
test \$exitcode = 0") || {
echo No shell found that supports shell functions.
@@ -6209,7 +12095,7 @@
}
-@@ -473,7 +453,7 @@
+@@ -473,7 +453,7 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
@@ -6218,7 +12104,7 @@
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
-@@ -501,6 +481,7 @@
+@@ -501,6 +481,7 @@ case `echo -n x` in
*)
ECHO_N='-n';;
esac
@@ -6226,7 +12112,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -513,22 +494,19 @@
+@@ -513,22 +494,19 @@ if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
@@ -6260,7 +12146,7 @@
else
as_ln_s='cp -p'
fi
-@@ -553,10 +531,10 @@
+@@ -553,10 +531,10 @@ else
as_test_x='
eval sh -c '\''
if test -d "$1"; then
@@ -6273,7 +12159,7 @@
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
-@@ -843,7 +821,6 @@
+@@ -843,7 +821,6 @@ MAKEINFO
install_sh
STRIP
INSTALL_STRIP_PROGRAM
@@ -6281,9 +12167,9 @@
mkdir_p
AWK
SET_MAKE
-@@ -961,10 +938,6 @@
- TYPING_BREAK
- SCREENSAVER_LIBS
+@@ -963,10 +940,6 @@ SCREENSAVER_LIBS
+ HAVE_TYPING_BREAK_TRUE
+ HAVE_TYPING_BREAK_FALSE
XF86MISC_LIBS
-ENABLE_DYNAMIC_LIBSLAB_TRUE
-ENABLE_DYNAMIC_LIBSLAB_FALSE
@@ -6292,7 +12178,7 @@
CAPPLET_CFLAGS
CAPPLET_LIBS
GNOMECC_CFLAGS
-@@ -981,6 +954,8 @@
+@@ -981,6 +954,8 @@ DEFAULT_APPLICATIONS_CAPPLET_CFLAGS
DEFAULT_APPLICATIONS_CAPPLET_LIBS
METACITY_CFLAGS
METACITY_LIBS
@@ -6300,8 +12186,8 @@
+SLAB_LIBS
TYPING_CFLAGS
TYPING_LIBS
- LIBBACKGROUND_CFLAGS
-@@ -1055,35 +1030,6 @@
+ GSD_DBUS_CFLAGS
+@@ -1036,34 +1011,6 @@ ENABLE_UPDATE_MIMEDB_FALSE
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
@@ -6324,20 +12210,19 @@
-enable_compile_warnings
-enable_iso_c
-with_x
--enable_vfs_methods
-enable_aboutme
-enable_hal
-with_gconf_source
-with_gconf_schema_file_dir
-enable_schemas_install
--enable_esd
-enable_gstreamer
+-with_libcanberra
-enable_update_mimedb
-'
ac_precious_vars='build_alias
host_alias
target_alias
-@@ -1101,8 +1047,6 @@
+@@ -1081,8 +1028,6 @@ F77
FFLAGS
PKG_CONFIG
XMKMF
@@ -6346,7 +12231,7 @@
CAPPLET_CFLAGS
CAPPLET_LIBS
GNOMECC_CFLAGS
-@@ -1119,6 +1063,8 @@
+@@ -1097,6 +1042,8 @@ DEFAULT_APPLICATIONS_CAPPLET_CFLAGS
DEFAULT_APPLICATIONS_CAPPLET_LIBS
METACITY_CFLAGS
METACITY_LIBS
@@ -6354,8 +12239,8 @@
+SLAB_LIBS
TYPING_CFLAGS
TYPING_LIBS
- LIBBACKGROUND_CFLAGS
-@@ -1168,8 +1114,6 @@
+ GSD_DBUS_CFLAGS
+@@ -1128,8 +1075,6 @@ CANBERRA_LIBS'
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
@@ -6364,7 +12249,7 @@
# The variables have the same names as the options, with
# dashes changed to underlines.
cache_file=/dev/null
-@@ -1268,21 +1212,13 @@
+@@ -1228,21 +1173,13 @@ do
datarootdir=$ac_optarg ;;
-disable-* | --disable-*)
@@ -6391,7 +12276,7 @@
-docdir | --docdir | --docdi | --doc | --do)
ac_prev=docdir ;;
-@@ -1295,21 +1231,13 @@
+@@ -1255,21 +1192,13 @@ do
dvidir=$ac_optarg ;;
-enable-* | --enable-*)
@@ -6418,7 +12303,7 @@
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -1500,38 +1428,22 @@
+@@ -1460,38 +1389,22 @@ do
ac_init_version=: ;;
-with-* | --with-*)
@@ -6467,7 +12352,7 @@
--x)
# Obsolete; use --with-x.
-@@ -1551,7 +1463,7 @@
+@@ -1511,7 +1424,7 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -6476,7 +12361,7 @@
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; }
;;
-@@ -1560,16 +1472,16 @@
+@@ -1520,16 +1433,16 @@ Try \`$0 --help' for more information."
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
@@ -6496,7 +12381,7 @@
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
-@@ -1578,38 +1490,22 @@
+@@ -1538,38 +1451,22 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -6538,7 +12423,7 @@
{ (exit 1); exit 1; }; }
done
-@@ -1624,7 +1520,7 @@
+@@ -1584,7 +1481,7 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
@@ -6547,7 +12432,7 @@
If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
-@@ -1640,10 +1536,10 @@
+@@ -1600,10 +1497,10 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -6560,7 +12445,7 @@
{ (exit 1); exit 1; }; }
-@@ -1651,12 +1547,12 @@
+@@ -1611,12 +1508,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
# Try the directory containing this script, then the parent directory.
@@ -6579,7 +12464,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -1683,12 +1579,12 @@
+@@ -1643,12 +1540,12 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -6594,7 +12479,7 @@
{ (exit 1); exit 1; }; }
pwd)`
# When building in place, set srcdir=.
-@@ -1737,9 +1633,9 @@
+@@ -1697,9 +1594,9 @@ Configuration:
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
@@ -6606,7 +12491,7 @@
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-@@ -1749,26 +1645,25 @@
+@@ -1709,26 +1606,25 @@ for instance \`--prefix=\$HOME'.
For better control, use the options below.
Fine tuning of the installation directories:
@@ -6652,7 +12537,7 @@
_ACEOF
cat <<\_ACEOF
-@@ -1795,7 +1690,6 @@
+@@ -1755,7 +1651,6 @@ if test -n "$ac_init_help"; then
cat <<\_ACEOF
Optional Features:
@@ -6660,7 +12545,7 @@
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-maintainer-mode enable make rules and dependencies not useful
-@@ -1852,10 +1746,6 @@
+@@ -1812,10 +1707,6 @@ Some influential environment variables:
FFLAGS Fortran 77 compiler flags
PKG_CONFIG path to pkg-config utility
XMKMF Path to xmkmf, Makefile generator for X Window System
@@ -6671,7 +12556,7 @@
CAPPLET_CFLAGS
C compiler flags for CAPPLET, overriding pkg-config
CAPPLET_LIBS
-@@ -1887,6 +1777,8 @@
+@@ -1843,6 +1734,8 @@ Some influential environment variables:
C compiler flags for METACITY, overriding pkg-config
METACITY_LIBS
linker flags for METACITY, overriding pkg-config
@@ -6680,7 +12565,7 @@
TYPING_CFLAGS
C compiler flags for TYPING, overriding pkg-config
TYPING_LIBS linker flags for TYPING, overriding pkg-config
-@@ -1980,17 +1872,15 @@
+@@ -1900,17 +1793,15 @@ fi
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
@@ -6701,7 +12586,7 @@
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -2026,7 +1916,7 @@
+@@ -1946,7 +1837,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
echo &&
$SHELL "$ac_srcdir/configure" --help=recursive
else
@@ -6710,10 +12595,10 @@
fi || ac_status=$?
cd "$ac_pwd" || { ac_status=$?; break; }
done
-@@ -2036,10 +1926,10 @@
+@@ -1956,10 +1847,10 @@ test -n "$ac_init_help" && exit $ac_stat
if $ac_init_version; then
cat <<\_ACEOF
- gnome-control-center configure 2.22.2.1
+ gnome-control-center configure 2.24.0.1
-generated by GNU Autoconf 2.62
+generated by GNU Autoconf 2.61
@@ -6723,16 +12608,16 @@
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
-@@ -2050,7 +1940,7 @@
+@@ -1970,7 +1861,7 @@ This file contains any messages produced
running configure, to aid debugging if configure makes a mistake.
- It was created by gnome-control-center $as_me 2.22.2.1, which was
+ It was created by gnome-control-center $as_me 2.24.0.1, which was
-generated by GNU Autoconf 2.62. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
-@@ -2086,7 +1976,7 @@
+@@ -2006,7 +1897,7 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6741,7 +12626,7 @@
done
IFS=$as_save_IFS
-@@ -2121,7 +2011,7 @@
+@@ -2041,7 +1932,7 @@ do
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*\'*)
@@ -6750,7 +12635,7 @@
esac
case $ac_pass in
1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-@@ -2173,12 +2063,11 @@
+@@ -2093,12 +1984,11 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -6765,7 +12650,7 @@
*) $as_unset $ac_var ;;
esac ;;
esac
-@@ -2208,9 +2097,9 @@
+@@ -2128,9 +2018,9 @@ _ASBOX
do
eval ac_val=\$$ac_var
case $ac_val in
@@ -6777,7 +12662,7 @@
done | sort
echo
-@@ -2225,9 +2114,9 @@
+@@ -2145,9 +2035,9 @@ _ASBOX
do
eval ac_val=\$$ac_var
case $ac_val in
@@ -6789,7 +12674,7 @@
done | sort
echo
fi
-@@ -2243,8 +2132,8 @@
+@@ -2163,8 +2053,8 @@ _ASBOX
echo
fi
test "$ac_signal" != 0 &&
@@ -6800,7 +12685,7 @@
} >&5
rm -f core *.core core.conftest.* &&
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-@@ -2286,24 +2175,21 @@
+@@ -2206,24 +2096,21 @@ _ACEOF
# Let the site file select an alternate cache file if it wants to.
@@ -6834,7 +12719,7 @@
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
fi
-@@ -2313,16 +2199,16 @@
+@@ -2233,16 +2120,16 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
@@ -6855,7 +12740,7 @@
>$cache_file
fi
-@@ -2336,38 +2222,29 @@
+@@ -2256,38 +2143,29 @@ for ac_var in $ac_precious_vars; do
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -6906,7 +12791,7 @@
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
-@@ -2377,10 +2254,10 @@
+@@ -2297,10 +2175,10 @@ $as_echo "$as_me: current value: \`$ac
fi
done
if $ac_cache_corrupted; then
@@ -6921,7 +12806,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -2440,8 +2317,8 @@
+@@ -2360,8 +2238,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
fi
done
if test -z "$ac_aux_dir"; then
@@ -6932,7 +12817,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -2467,12 +2344,11 @@
+@@ -2387,12 +2265,11 @@ ac_configure="$SHELL $ac_aux_dir/configu
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
@@ -6948,7 +12833,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -2501,29 +2377,17 @@
+@@ -2421,29 +2298,17 @@ case $as_dir/ in
# program-specific install script used by HP pwplus--don't use.
:
else
@@ -6980,7 +12865,7 @@
fi
if test "${ac_cv_path_install+set}" = set; then
-@@ -2536,8 +2400,8 @@
+@@ -2456,8 +2321,8 @@ fi
INSTALL=$ac_install_sh
fi
fi
@@ -6991,7 +12876,7 @@
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -2547,8 +2411,8 @@
+@@ -2467,8 +2332,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -7002,7 +12887,7 @@
# Just in case
sleep 1
echo timestamp > conftest.file
-@@ -2571,9 +2435,9 @@
+@@ -2491,9 +2356,9 @@ if (
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -7014,7 +12899,7 @@
alias in your environment" >&2;}
{ (exit 1); exit 1; }; }
fi
-@@ -2584,23 +2448,26 @@
+@@ -2504,23 +2369,26 @@ then
# Ok.
:
else
@@ -7048,7 +12933,7 @@
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -2611,15 +2478,15 @@
+@@ -2531,15 +2399,15 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -7069,7 +12954,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-@@ -2654,8 +2521,8 @@
+@@ -2574,8 +2442,8 @@ fi
MKDIR_P="$ac_install_sh -d"
fi
fi
@@ -7080,7 +12965,7 @@
mkdir_p="$MKDIR_P"
case $mkdir_p in
-@@ -2667,10 +2534,10 @@
+@@ -2587,10 +2455,10 @@ for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -7094,7 +12979,7 @@
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
-@@ -2683,7 +2550,7 @@
+@@ -2603,7 +2471,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
@@ -7103,7 +12988,7 @@
break 2
fi
done
-@@ -2694,23 +2561,22 @@
+@@ -2614,23 +2482,22 @@ fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
@@ -7135,7 +13020,7 @@
else
cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
-@@ -2727,12 +2593,12 @@
+@@ -2647,12 +2514,12 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -7152,7 +13037,7 @@
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2751,8 +2617,8 @@
+@@ -2671,8 +2538,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -7163,7 +13048,7 @@
{ (exit 1); exit 1; }; }
fi
fi
-@@ -2807,10 +2673,10 @@
+@@ -2727,10 +2594,10 @@ if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -7177,7 +13062,7 @@
else
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -2823,7 +2689,7 @@
+@@ -2743,7 +2610,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
@@ -7186,7 +13071,7 @@
break 2
fi
done
-@@ -2834,11 +2700,11 @@
+@@ -2754,11 +2621,11 @@ fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
@@ -7202,7 +13087,7 @@
fi
-@@ -2847,10 +2713,10 @@
+@@ -2767,10 +2634,10 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -7216,7 +13101,7 @@
else
if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-@@ -2863,7 +2729,7 @@
+@@ -2783,7 +2650,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
@@ -7225,7 +13110,7 @@
break 2
fi
done
-@@ -2874,11 +2740,11 @@
+@@ -2794,11 +2661,11 @@ fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
@@ -7241,7 +13126,7 @@
fi
if test "x$ac_ct_STRIP" = x; then
-@@ -2886,10 +2752,10 @@
+@@ -2806,10 +2673,10 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7254,7 +13139,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -2910,8 +2776,8 @@
+@@ -2830,8 +2697,8 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c
AMTAR=${AMTAR-"${am_missing_run}tar"}
@@ -7265,7 +13150,7 @@
# Loop over all known methods to create a tar archive until one works.
_am_tools='gnutar plaintar pax cpio none'
_am_tools=${am_cv_prog_tar_ustar-$_am_tools}
-@@ -2984,20 +2850,20 @@
+@@ -2904,20 +2771,20 @@ done
rm -rf conftest.dir
if test "${am_cv_prog_tar_ustar+set}" = set; then
@@ -7291,7 +13176,7 @@
# Check whether --enable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-@@ -3005,8 +2871,8 @@
+@@ -2925,8 +2792,8 @@ else
USE_MAINTAINER_MODE=no
fi
@@ -7302,7 +13187,7 @@
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
-@@ -3031,8 +2897,8 @@
+@@ -2951,8 +2818,8 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -7313,7 +13198,7 @@
am__include="#"
am__quote=
_am_result=none
-@@ -3059,8 +2925,8 @@
+@@ -2979,8 +2846,8 @@ if test "$am__include" = "#"; then
fi
@@ -7324,7 +13209,7 @@
rm -f confinc confmf
# Check whether --enable-dependency-tracking was given.
-@@ -3089,10 +2955,10 @@
+@@ -3009,10 +2876,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -7338,7 +13223,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3105,7 +2971,7 @@
+@@ -3025,7 +2892,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
@@ -7347,7 +13232,7 @@
break 2
fi
done
-@@ -3116,11 +2982,11 @@
+@@ -3036,11 +2903,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7363,7 +13248,7 @@
fi
-@@ -3129,10 +2995,10 @@
+@@ -3049,10 +2916,10 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -7377,7 +13262,7 @@
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -3145,7 +3011,7 @@
+@@ -3065,7 +2932,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
@@ -7386,7 +13271,7 @@
break 2
fi
done
-@@ -3156,11 +3022,11 @@
+@@ -3076,11 +2943,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -7402,7 +13287,7 @@
fi
if test "x$ac_ct_CC" = x; then
-@@ -3168,10 +3034,10 @@
+@@ -3088,10 +2955,10 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7415,7 +13300,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -3186,10 +3052,10 @@
+@@ -3106,10 +2973,10 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -7429,7 +13314,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3202,7 +3068,7 @@
+@@ -3122,7 +2989,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
@@ -7438,7 +13323,7 @@
break 2
fi
done
-@@ -3213,11 +3079,11 @@
+@@ -3133,11 +3000,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7454,7 +13339,7 @@
fi
-@@ -3226,10 +3092,10 @@
+@@ -3146,10 +3013,10 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -7468,7 +13353,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3247,7 +3113,7 @@
+@@ -3167,7 +3034,7 @@ do
continue
fi
ac_cv_prog_CC="cc"
@@ -7477,7 +13362,7 @@
break 2
fi
done
-@@ -3270,11 +3136,11 @@
+@@ -3190,11 +3057,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7493,7 +13378,7 @@
fi
-@@ -3285,10 +3151,10 @@
+@@ -3205,10 +3072,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -7507,7 +13392,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3301,7 +3167,7 @@
+@@ -3221,7 +3088,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
@@ -7516,7 +13401,7 @@
break 2
fi
done
-@@ -3312,11 +3178,11 @@
+@@ -3232,11 +3099,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7532,7 +13417,7 @@
fi
-@@ -3329,10 +3195,10 @@
+@@ -3249,10 +3116,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -7546,7 +13431,7 @@
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -3345,7 +3211,7 @@
+@@ -3265,7 +3132,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
@@ -7555,7 +13440,7 @@
break 2
fi
done
-@@ -3356,11 +3222,11 @@
+@@ -3276,11 +3143,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -7571,7 +13456,7 @@
fi
-@@ -3372,10 +3238,10 @@
+@@ -3292,10 +3159,10 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7584,7 +13469,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -3387,48 +3253,44 @@
+@@ -3307,48 +3174,44 @@ fi
fi
@@ -7643,7 +13528,7 @@
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
-@@ -3447,22 +3309,27 @@
+@@ -3367,22 +3230,27 @@ main ()
}
_ACEOF
ac_clean_files_save=$ac_clean_files
@@ -7680,7 +13565,7 @@
* ) ac_rmfiles="$ac_rmfiles $ac_file";;
esac
done
-@@ -3473,11 +3340,10 @@
+@@ -3393,11 +3261,10 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7694,7 +13579,7 @@
(exit $ac_status); }; then
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-@@ -3488,7 +3354,7 @@
+@@ -3408,7 +3275,7 @@ for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
@@ -7703,7 +13588,7 @@
;;
[ab].out )
# We found the default executable, but exeext='' is most
-@@ -3515,15 +3381,15 @@
+@@ -3435,15 +3302,15 @@ else
ac_file=''
fi
@@ -7724,7 +13609,7 @@
See \`config.log' for more details." >&2;}
{ (exit 77); exit 77; }; }
fi
-@@ -3532,8 +3398,8 @@
+@@ -3452,8 +3319,8 @@ ac_exeext=$ac_cv_exeext
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
@@ -7735,7 +13620,7 @@
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
-@@ -3542,51 +3408,49 @@
+@@ -3462,51 +3329,49 @@ if test "$cross_compiling" != yes; then
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7802,7 +13687,7 @@
(exit $ac_status); }; then
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-@@ -3595,31 +3459,31 @@
+@@ -3515,31 +3380,31 @@ $as_echo "$ac_try_echo") >&5
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -7842,7 +13727,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3642,41 +3506,40 @@
+@@ -3562,41 +3427,40 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7895,7 +13780,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3702,21 +3565,20 @@
+@@ -3622,21 +3486,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7920,7 +13805,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
-@@ -3726,19 +3588,15 @@
+@@ -3646,19 +3509,15 @@ rm -f core conftest.err conftest.$ac_obj
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -7946,7 +13831,7 @@
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
-@@ -3765,21 +3623,20 @@
+@@ -3685,21 +3544,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7971,7 +13856,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
CFLAGS=""
-@@ -3804,21 +3661,20 @@
+@@ -3724,21 +3582,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7996,7 +13881,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -3844,21 +3700,20 @@
+@@ -3764,21 +3621,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8021,7 +13906,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3873,8 +3728,8 @@
+@@ -3793,8 +3649,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
@@ -8032,7 +13917,7 @@
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
-@@ -3890,10 +3745,10 @@
+@@ -3810,10 +3666,10 @@ else
CFLAGS=
fi
fi
@@ -8046,7 +13931,7 @@
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-@@ -3964,21 +3819,20 @@
+@@ -3884,21 +3740,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8071,7 +13956,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3994,15 +3848,15 @@
+@@ -3914,15 +3769,15 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -8093,7 +13978,7 @@
esac
-@@ -4014,10 +3868,10 @@
+@@ -3934,10 +3789,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -8107,7 +13992,7 @@
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
-@@ -4105,8 +3959,8 @@
+@@ -4025,8 +3880,8 @@ else
fi
fi
@@ -8118,41 +14003,21 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
if
-@@ -4121,14 +3975,12 @@
-
-
-
--
-- { $as_echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
--$as_echo_n "checking for strerror in -lcposix... " >&6; }
--if test "${ac_cv_lib_cposix_strerror+set}" = set; then
-- $as_echo_n "(cached) " >&6
+@@ -4041,10 +3896,10 @@ fi
+
+
+
+-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
+-$as_echo_n "checking for library containing strerror... " >&6; }
+{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
-+if test "${ac_cv_search_strerror+set}" = set; then
+ if test "${ac_cv_search_strerror+set}" = set; then
+- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lcposix $LIBS"
-+ ac_func_search_save_LIBS=$LIBS
+ ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -4151,47 +4003,60 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
-+for ac_lib in '' cposix; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext
- if { (ac_try="$ac_link"
- case "(($ac_try" in
+@@ -4082,30 +3937,26 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8173,52 +14038,33 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_cposix_strerror=yes
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_search_strerror=$ac_res
+ ac_cv_search_strerror=$ac_res
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-- ac_cv_lib_cposix_strerror=no
-+
+
fi
-rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_strerror+set}" = set; then
-+ break
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
--$as_echo "$ac_cv_lib_cposix_strerror" >&6; }
--if test $ac_cv_lib_cposix_strerror = yes; then
-- LIBS="$LIBS -lcposix"
-+done
-+if test "${ac_cv_search_strerror+set}" = set; then
-+ :
-+else
-+ ac_cv_search_strerror=no
- fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
+ conftest$ac_exeext
+ if test "${ac_cv_search_strerror+set}" = set; then
+@@ -4120,8 +3971,8 @@ fi
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+-$as_echo "$ac_cv_search_strerror" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
-+ac_res=$ac_cv_search_strerror
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
--
-+fi
-
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -4201,10 +4066,10 @@
+ ac_res=$ac_cv_search_strerror
+ if test "$ac_res" != no; then
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+@@ -4136,10 +3987,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -8232,7 +14078,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4217,7 +4082,7 @@
+@@ -4152,7 +4003,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
@@ -8241,7 +14087,7 @@
break 2
fi
done
-@@ -4228,11 +4093,11 @@
+@@ -4163,11 +4014,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -8257,7 +14103,7 @@
fi
-@@ -4241,10 +4106,10 @@
+@@ -4176,10 +4027,10 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -8271,7 +14117,7 @@
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -4257,7 +4122,7 @@
+@@ -4192,7 +4043,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
@@ -8280,7 +14126,7 @@
break 2
fi
done
-@@ -4268,11 +4133,11 @@
+@@ -4203,11 +4054,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -8296,7 +14142,7 @@
fi
if test "x$ac_ct_CC" = x; then
-@@ -4280,10 +4145,10 @@
+@@ -4215,10 +4066,10 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8309,7 +14155,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -4298,10 +4163,10 @@
+@@ -4233,10 +4084,10 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -8323,7 +14169,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4314,7 +4179,7 @@
+@@ -4249,7 +4100,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
@@ -8332,7 +14178,7 @@
break 2
fi
done
-@@ -4325,11 +4190,11 @@
+@@ -4260,11 +4111,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -8348,7 +14194,7 @@
fi
-@@ -4338,10 +4203,10 @@
+@@ -4273,10 +4124,10 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -8362,7 +14208,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4359,7 +4224,7 @@
+@@ -4294,7 +4145,7 @@ do
continue
fi
ac_cv_prog_CC="cc"
@@ -8371,7 +14217,7 @@
break 2
fi
done
-@@ -4382,11 +4247,11 @@
+@@ -4317,11 +4168,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -8387,7 +14233,7 @@
fi
-@@ -4397,10 +4262,10 @@
+@@ -4332,10 +4183,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -8401,7 +14247,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4413,7 +4278,7 @@
+@@ -4348,7 +4199,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
@@ -8410,7 +14256,7 @@
break 2
fi
done
-@@ -4424,11 +4289,11 @@
+@@ -4359,11 +4210,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -8426,7 +14272,7 @@
fi
-@@ -4441,10 +4306,10 @@
+@@ -4376,10 +4227,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -8440,7 +14286,7 @@
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -4457,7 +4322,7 @@
+@@ -4392,7 +4243,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
@@ -8449,7 +14295,7 @@
break 2
fi
done
-@@ -4468,11 +4333,11 @@
+@@ -4403,11 +4254,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -8465,7 +14311,7 @@
fi
-@@ -4484,10 +4349,10 @@
+@@ -4419,10 +4270,10 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8478,7 +14324,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -4499,54 +4364,50 @@
+@@ -4434,54 +4285,50 @@ fi
fi
@@ -8546,7 +14392,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -4572,21 +4433,20 @@
+@@ -4507,21 +4354,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8571,7 +14417,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
-@@ -4596,19 +4456,15 @@
+@@ -4531,19 +4377,15 @@ rm -f core conftest.err conftest.$ac_obj
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -8597,7 +14443,7 @@
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
-@@ -4635,21 +4491,20 @@
+@@ -4570,21 +4412,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8622,7 +14468,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
CFLAGS=""
-@@ -4674,21 +4529,20 @@
+@@ -4609,21 +4450,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8647,7 +14493,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -4714,21 +4568,20 @@
+@@ -4649,21 +4489,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8672,7 +14518,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -4743,8 +4596,8 @@
+@@ -4678,8 +4517,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
@@ -8683,7 +14529,7 @@
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
-@@ -4760,10 +4613,10 @@
+@@ -4695,10 +4534,10 @@ else
CFLAGS=
fi
fi
@@ -8697,7 +14543,7 @@
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-@@ -4834,21 +4687,20 @@
+@@ -4769,21 +4608,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8722,7 +14568,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -4864,15 +4716,15 @@
+@@ -4799,15 +4637,15 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -8744,7 +14590,7 @@
esac
-@@ -4884,10 +4736,10 @@
+@@ -4819,10 +4657,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -8758,7 +14604,7 @@
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
-@@ -4975,8 +4827,8 @@
+@@ -4910,8 +4748,8 @@ else
fi
fi
@@ -8769,7 +14615,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
if
-@@ -4991,16 +4843,16 @@
+@@ -4926,16 +4764,16 @@ fi
if test "x$CC" != xcc; then
@@ -8792,7 +14638,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -5026,21 +4878,19 @@
+@@ -4961,21 +4799,19 @@ if { (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8818,7 +14664,7 @@
(exit $ac_status); };
then
eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-@@ -5051,11 +4901,10 @@
+@@ -4986,11 +4822,10 @@ then
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8832,7 +14678,7 @@
(exit $ac_status); }; }; then
ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
rm -f conftest2.*
-@@ -5063,21 +4912,19 @@
+@@ -4998,21 +4833,19 @@ $as_echo "$ac_try_echo") >&5
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8858,7 +14704,7 @@
(exit $ac_status); };
then
# cc works too.
-@@ -5095,11 +4942,11 @@
+@@ -5030,11 +4863,11 @@ rm -f core conftest*
fi
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -8874,7 +14720,7 @@
cat >>confdefs.h <<\_ACEOF
#define NO_MINUS_C_MINUS_O 1
-@@ -5126,15 +4973,15 @@
+@@ -5061,15 +4894,15 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -8893,7 +14739,7 @@
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -5166,21 +5013,20 @@
+@@ -5101,21 +4934,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8918,7 +14764,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
-@@ -5204,14 +5050,13 @@
+@@ -5139,14 +4971,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8935,7 +14781,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -5219,7 +5064,7 @@
+@@ -5154,7 +4985,7 @@ $as_echo "$ac_try_echo") >&5
# Broken: success on invalid input.
continue
else
@@ -8944,7 +14790,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
-@@ -5244,8 +5089,8 @@
+@@ -5179,8 +5010,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
@@ -8955,7 +14801,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -5273,21 +5118,20 @@
+@@ -5208,21 +5039,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8980,7 +14826,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
-@@ -5311,14 +5155,13 @@
+@@ -5246,14 +5076,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8997,7 +14843,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -5326,7 +5169,7 @@
+@@ -5261,7 +5090,7 @@ $as_echo "$ac_try_echo") >&5
# Broken: success on invalid input.
continue
else
@@ -9006,7 +14852,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
-@@ -5342,9 +5185,9 @@
+@@ -5277,9 +5106,9 @@ rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then
:
else
@@ -9018,7 +14864,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
-@@ -5356,37 +5199,42 @@
+@@ -5291,37 +5120,42 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -9073,7 +14919,7 @@
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
-@@ -5401,60 +5249,74 @@
+@@ -5336,60 +5170,74 @@ case `"$ac_path_GREP" --version 2>&1` in
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
@@ -9168,7 +15014,7 @@
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
-@@ -5469,31 +5331,40 @@
+@@ -5404,31 +5252,40 @@ case `"$ac_path_EGREP" --version 2>&1` i
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
@@ -9220,7 +15066,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -5520,21 +5391,20 @@
+@@ -5455,21 +5312,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9245,7 +15091,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_stdc=no
-@@ -5626,40 +5496,37 @@
+@@ -5561,40 +5417,37 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9294,7 +15140,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -5742,34 +5609,34 @@
+@@ -5677,34 +5530,34 @@ fi
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -9342,7 +15188,7 @@
{ (exit 1); exit 1; }; };;
esac
build=$ac_cv_build
-@@ -5786,27 +5653,27 @@
+@@ -5721,27 +5574,27 @@ IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -9379,7 +15225,7 @@
{ (exit 1); exit 1; }; };;
esac
host=$ac_cv_host
-@@ -5823,10 +5690,10 @@
+@@ -5758,10 +5611,10 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -9393,7 +15239,7 @@
else
# Loop through the user's path and test for sed and gsed.
# Then use that list of sed's as ones to test for truncation.
-@@ -5879,8 +5746,8 @@
+@@ -5814,8 +5667,8 @@ fi
SED=$lt_cv_path_SED
@@ -9404,7 +15250,7 @@
# Check whether --with-gnu-ld was given.
-@@ -5893,8 +5760,8 @@
+@@ -5828,8 +5681,8 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -9415,7 +15261,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -5923,14 +5790,14 @@
+@@ -5858,14 +5711,14 @@ $as_echo_n "checking for ld used by $CC.
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -9435,7 +15281,7 @@
else
if test -z "$LD"; then
lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -5960,19 +5827,19 @@
+@@ -5895,19 +5748,19 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -9464,7 +15310,7 @@
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
-@@ -5984,20 +5851,20 @@
+@@ -5919,20 +5772,20 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
@@ -9492,7 +15338,7 @@
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
"" | " "*) ;;
-@@ -6014,10 +5881,10 @@
+@@ -5949,10 +5802,10 @@ case $host_os in
;;
esac
@@ -9506,7 +15352,7 @@
else
if test -n "$NM"; then
# Let the user override the test.
-@@ -6063,25 +5930,25 @@
+@@ -5998,25 +5851,25 @@ else
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi
fi
@@ -9543,7 +15389,7 @@
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
-@@ -6193,7 +6060,7 @@
+@@ -6128,7 +5981,7 @@ linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -9552,7 +15398,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
-@@ -6264,8 +6131,8 @@
+@@ -6199,8 +6052,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware*
esac
fi
@@ -9563,7 +15409,7 @@
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -6298,7 +6165,7 @@
+@@ -6233,7 +6086,7 @@ ia64-*-hpux*)
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9572,12 +15418,12 @@
(exit $ac_status); }; then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
-@@ -6313,11 +6180,11 @@
+@@ -6248,11 +6101,11 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6316 "configure"' > conftest.$ac_ext
-+ echo '#line 6183 "configure"' > conftest.$ac_ext
+- echo '#line 6251 "configure"' > conftest.$ac_ext
++ echo '#line 6104 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9586,7 +15432,7 @@
(exit $ac_status); }; then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
-@@ -6355,7 +6222,7 @@
+@@ -6290,7 +6143,7 @@ s390*-*linux*|sparc*-*linux*)
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9595,7 +15441,15 @@
(exit $ac_status); }; then
case `/usr/bin/file conftest.o` in
*32-bit*)
-@@ -6405,10 +6272,10 @@
+@@ -6313,7 +6166,6 @@ s390*-*linux*|sparc*-*linux*)
+ esac
+ ;;
+ *64-bit*)
+- libsuff=64
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+@@ -6341,10 +6193,10 @@ s390*-*linux*|sparc*-*linux*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -9609,7 +15463,7 @@
else
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -6437,30 +6304,26 @@
+@@ -6373,30 +6225,26 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9645,7 +15499,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
-@@ -6470,8 +6333,8 @@
+@@ -6406,8 +6254,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -9656,7 +15510,7 @@
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
CFLAGS="$SAVE_CFLAGS"
-@@ -6483,7 +6346,7 @@
+@@ -6419,7 +6267,7 @@ sparc*-*solaris*)
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9665,7 +15519,7 @@
(exit $ac_status); }; then
case `/usr/bin/file conftest.o` in
*64-bit*)
-@@ -6520,11 +6383,11 @@
+@@ -6456,11 +6304,11 @@ need_locks="$enable_libtool_lock"
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
do
@@ -9681,7 +15535,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6542,21 +6405,20 @@
+@@ -6478,21 +6326,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9706,7 +15560,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
-@@ -6564,14 +6426,12 @@
+@@ -6500,14 +6347,12 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -9726,7 +15580,7 @@
_ACEOF
fi
-@@ -6582,21 +6442,20 @@
+@@ -6518,21 +6363,20 @@ done
for ac_header in dlfcn.h
do
@@ -9757,7 +15611,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -6612,33 +6471,32 @@
+@@ -6548,33 +6392,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9798,7 +15652,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -6652,52 +6510,51 @@
+@@ -6588,52 +6431,51 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9872,7 +15726,7 @@
( cat <<\_ASBOX
## ----------------------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center ##
-@@ -6706,23 +6563,21 @@
+@@ -6642,23 +6484,21 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -9904,7 +15758,7 @@
_ACEOF
fi
-@@ -6743,10 +6598,10 @@
+@@ -6679,10 +6519,10 @@ if test -z "$CXX"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -9918,7 +15772,7 @@
else
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
-@@ -6759,7 +6614,7 @@
+@@ -6695,7 +6535,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
@@ -9927,7 +15781,7 @@
break 2
fi
done
-@@ -6770,11 +6625,11 @@
+@@ -6706,11 +6546,11 @@ fi
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
@@ -9943,7 +15797,7 @@
fi
-@@ -6787,10 +6642,10 @@
+@@ -6723,10 +6563,10 @@ if test -z "$CXX"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -9957,7 +15811,7 @@
else
if test -n "$ac_ct_CXX"; then
ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-@@ -6803,7 +6658,7 @@
+@@ -6739,7 +6579,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
@@ -9966,7 +15820,7 @@
break 2
fi
done
-@@ -6814,11 +6669,11 @@
+@@ -6750,11 +6590,11 @@ fi
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
@@ -9982,7 +15836,7 @@
fi
-@@ -6830,10 +6685,10 @@
+@@ -6766,10 +6606,10 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9995,7 +15849,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -6845,47 +6700,43 @@
+@@ -6781,47 +6621,43 @@ fi
fi
fi
# Provide some information about the compiler.
@@ -10054,7 +15908,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6911,21 +6762,20 @@
+@@ -6847,21 +6683,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10079,7 +15933,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
-@@ -6935,19 +6785,15 @@
+@@ -6871,19 +6706,15 @@ rm -f core conftest.err conftest.$ac_obj
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
@@ -10105,7 +15959,7 @@
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
ac_cxx_werror_flag=yes
-@@ -6974,21 +6820,20 @@
+@@ -6910,21 +6741,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10130,7 +15984,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
CXXFLAGS=""
-@@ -7013,21 +6858,20 @@
+@@ -6949,21 +6779,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10155,7 +16009,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-@@ -7053,21 +6897,20 @@
+@@ -6989,21 +6818,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10180,7 +16034,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -7082,8 +6925,8 @@
+@@ -7018,8 +6846,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
fi
@@ -10191,7 +16045,7 @@
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
-@@ -7107,10 +6950,10 @@
+@@ -7043,10 +6871,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
depcc="$CXX" am_compiler_list=
@@ -10205,7 +16059,7 @@
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
-@@ -7198,8 +7041,8 @@
+@@ -7134,8 +6962,8 @@ else
fi
fi
@@ -10216,7 +16070,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
if
-@@ -7223,11 +7066,11 @@
+@@ -7159,11 +6987,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
@@ -10231,7 +16085,7 @@
else
# Double quotes because CXXCPP needs to be expanded
for CXXCPP in "$CXX -E" "/lib/cpp"
-@@ -7259,21 +7102,20 @@
+@@ -7195,21 +7023,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10256,7 +16110,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
-@@ -7297,14 +7139,13 @@
+@@ -7233,14 +7060,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10273,7 +16127,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
-@@ -7312,7 +7153,7 @@
+@@ -7248,7 +7074,7 @@ $as_echo "$ac_try_echo") >&5
# Broken: success on invalid input.
continue
else
@@ -10282,7 +16136,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
-@@ -7337,8 +7178,8 @@
+@@ -7273,8 +7099,8 @@ fi
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -10293,7 +16147,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -7366,21 +7207,20 @@
+@@ -7302,21 +7128,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10318,7 +16172,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
-@@ -7404,14 +7244,13 @@
+@@ -7340,14 +7165,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10335,7 +16189,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
-@@ -7419,7 +7258,7 @@
+@@ -7355,7 +7179,7 @@ $as_echo "$ac_try_echo") >&5
# Broken: success on invalid input.
continue
else
@@ -10344,7 +16198,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
-@@ -7435,9 +7274,9 @@
+@@ -7371,9 +7195,9 @@ rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then
:
else
@@ -10356,7 +16210,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
-@@ -7460,10 +7299,10 @@
+@@ -7396,10 +7220,10 @@ if test -n "$ac_tool_prefix"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -10370,7 +16224,7 @@
else
if test -n "$F77"; then
ac_cv_prog_F77="$F77" # Let the user override the test.
-@@ -7476,7 +7315,7 @@
+@@ -7412,7 +7236,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
@@ -10379,7 +16233,7 @@
break 2
fi
done
-@@ -7487,11 +7326,11 @@
+@@ -7423,11 +7247,11 @@ fi
fi
F77=$ac_cv_prog_F77
if test -n "$F77"; then
@@ -10395,7 +16249,7 @@
fi
-@@ -7504,10 +7343,10 @@
+@@ -7440,10 +7264,10 @@ if test -z "$F77"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -10409,7 +16263,7 @@
else
if test -n "$ac_ct_F77"; then
ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-@@ -7520,7 +7359,7 @@
+@@ -7456,7 +7280,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_F77="$ac_prog"
@@ -10418,7 +16272,7 @@
break 2
fi
done
-@@ -7531,11 +7370,11 @@
+@@ -7467,11 +7291,11 @@ fi
fi
ac_ct_F77=$ac_cv_prog_ac_ct_F77
if test -n "$ac_ct_F77"; then
@@ -10434,7 +16288,7 @@
fi
-@@ -7547,10 +7386,10 @@
+@@ -7483,10 +7307,10 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10447,7 +16301,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -7561,41 +7400,37 @@
+@@ -7497,41 +7321,37 @@ fi
# Provide some information about the compiler.
@@ -10497,7 +16351,7 @@
(exit $ac_status); }
rm -f a.out
-@@ -7603,10 +7438,10 @@
+@@ -7539,10 +7359,10 @@ rm -f a.out
# input file. (Note that this only needs to work for GNU compilers.)
ac_save_ext=$ac_ext
ac_ext=F
@@ -10511,7 +16365,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
program main
-@@ -7622,21 +7457,20 @@
+@@ -7558,21 +7378,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10536,7 +16390,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
-@@ -7646,16 +7480,16 @@
+@@ -7582,16 +7401,16 @@ rm -f core conftest.err conftest.$ac_obj
ac_cv_f77_compiler_gnu=$ac_compiler_gnu
fi
@@ -10558,7 +16412,7 @@
else
FFLAGS=-g
cat >conftest.$ac_ext <<_ACEOF
-@@ -7669,21 +7503,20 @@
+@@ -7605,21 +7424,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10583,7 +16437,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_prog_f77_g=no
-@@ -7692,8 +7525,8 @@
+@@ -7628,8 +7446,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -10594,7 +16448,7 @@
if test "$ac_test_FFLAGS" = set; then
FFLAGS=$ac_save_FFLAGS
elif test $ac_cv_prog_f77_g = yes; then
-@@ -7710,11 +7543,7 @@
+@@ -7646,11 +7464,7 @@ else
fi
fi
@@ -10607,7 +16461,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7725,10 +7554,10 @@
+@@ -7661,10 +7475,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
@@ -10621,7 +16475,7 @@
else
i=0
teststring="ABCD"
-@@ -7837,11 +7666,11 @@
+@@ -7773,11 +7587,11 @@ else
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -10637,7 +16491,7 @@
fi
-@@ -7849,10 +7678,10 @@
+@@ -7785,10 +7599,10 @@ fi
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -10651,7 +16505,7 @@
else
# These are sane defaults that work on at least a few old systems.
-@@ -7957,14 +7786,14 @@
+@@ -7893,14 +7707,14 @@ EOF
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10668,7 +16522,7 @@
(exit $ac_status); } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
-@@ -8019,7 +7848,7 @@
+@@ -7955,7 +7769,7 @@ EOF
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
@@ -10677,7 +16531,7 @@
(exit $ac_status); } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
-@@ -8054,17 +7883,17 @@
+@@ -7990,17 +7804,17 @@ if test -z "$lt_cv_sys_global_symbol_pip
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -10702,7 +16556,7 @@
else
rm -f .libs 2>/dev/null
mkdir .libs 2>/dev/null
-@@ -8076,8 +7905,8 @@
+@@ -8012,8 +7826,8 @@ else
fi
rmdir .libs 2>/dev/null
fi
@@ -10713,7 +16567,7 @@
objdir=$lt_cv_objdir
-@@ -8128,10 +7957,10 @@
+@@ -8064,10 +7878,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -10727,7 +16581,7 @@
else
if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
-@@ -8144,7 +7973,7 @@
+@@ -8080,7 +7894,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
@@ -10736,7 +16590,7 @@
break 2
fi
done
-@@ -8155,11 +7984,11 @@
+@@ -8091,11 +7905,11 @@ fi
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
@@ -10752,7 +16606,7 @@
fi
-@@ -8168,10 +7997,10 @@
+@@ -8104,10 +7918,10 @@ if test -z "$ac_cv_prog_AR"; then
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -10766,7 +16620,7 @@
else
if test -n "$ac_ct_AR"; then
ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-@@ -8184,7 +8013,7 @@
+@@ -8120,7 +7934,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AR="ar"
@@ -10775,7 +16629,7 @@
break 2
fi
done
-@@ -8195,11 +8024,11 @@
+@@ -8131,11 +7945,11 @@ fi
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
if test -n "$ac_ct_AR"; then
@@ -10791,7 +16645,7 @@
fi
if test "x$ac_ct_AR" = x; then
-@@ -8207,10 +8036,10 @@
+@@ -8143,10 +7957,10 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10804,7 +16658,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -8224,10 +8053,10 @@
+@@ -8160,10 +7974,10 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -10818,7 +16672,7 @@
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-@@ -8240,7 +8069,7 @@
+@@ -8176,7 +7990,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
@@ -10827,7 +16681,7 @@
break 2
fi
done
-@@ -8251,11 +8080,11 @@
+@@ -8187,11 +8001,11 @@ fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
@@ -10843,7 +16697,7 @@
fi
-@@ -8264,10 +8093,10 @@
+@@ -8200,10 +8014,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -10857,7 +16711,7 @@
else
if test -n "$ac_ct_RANLIB"; then
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-@@ -8280,7 +8109,7 @@
+@@ -8216,7 +8030,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
@@ -10866,7 +16720,7 @@
break 2
fi
done
-@@ -8291,11 +8120,11 @@
+@@ -8227,11 +8041,11 @@ fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
@@ -10882,7 +16736,7 @@
fi
if test "x$ac_ct_RANLIB" = x; then
-@@ -8303,10 +8132,10 @@
+@@ -8239,10 +8053,10 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10895,7 +16749,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -8320,10 +8149,10 @@
+@@ -8256,10 +8070,10 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -10909,7 +16763,7 @@
else
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -8336,7 +8165,7 @@
+@@ -8272,7 +8086,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
@@ -10918,7 +16772,7 @@
break 2
fi
done
-@@ -8347,11 +8176,11 @@
+@@ -8283,11 +8097,11 @@ fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
@@ -10934,7 +16788,7 @@
fi
-@@ -8360,10 +8189,10 @@
+@@ -8296,10 +8110,10 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -10948,7 +16802,7 @@
else
if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-@@ -8376,7 +8205,7 @@
+@@ -8312,7 +8126,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
@@ -10957,7 +16811,7 @@
break 2
fi
done
-@@ -8387,11 +8216,11 @@
+@@ -8323,11 +8137,11 @@ fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
@@ -10973,7 +16827,7 @@
fi
if test "x$ac_ct_STRIP" = x; then
-@@ -8399,10 +8228,10 @@
+@@ -8335,10 +8149,10 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10986,7 +16840,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -8467,10 +8296,10 @@
+@@ -8403,10 +8217,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -11000,7 +16854,7 @@
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
-@@ -8520,19 +8349,19 @@
+@@ -8456,19 +8270,19 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -11027,7 +16881,7 @@
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
-@@ -8582,11 +8411,11 @@
+@@ -8518,11 +8332,11 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -11043,7 +16897,7 @@
fi
else
-@@ -8604,10 +8433,10 @@
+@@ -8540,10 +8354,10 @@ esac
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -11057,7 +16911,7 @@
else
if test -n "$DSYMUTIL"; then
ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-@@ -8620,7 +8449,7 @@
+@@ -8556,7 +8370,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
@@ -11066,7 +16920,7 @@
break 2
fi
done
-@@ -8631,11 +8460,11 @@
+@@ -8567,11 +8381,11 @@ fi
fi
DSYMUTIL=$ac_cv_prog_DSYMUTIL
if test -n "$DSYMUTIL"; then
@@ -11082,7 +16936,7 @@
fi
-@@ -8644,10 +8473,10 @@
+@@ -8580,10 +8394,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
@@ -11096,7 +16950,7 @@
else
if test -n "$ac_ct_DSYMUTIL"; then
ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-@@ -8660,7 +8489,7 @@
+@@ -8596,7 +8410,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
@@ -11105,7 +16959,7 @@
break 2
fi
done
-@@ -8671,11 +8500,11 @@
+@@ -8607,11 +8421,11 @@ fi
fi
ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
if test -n "$ac_ct_DSYMUTIL"; then
@@ -11121,7 +16975,7 @@
fi
if test "x$ac_ct_DSYMUTIL" = x; then
-@@ -8683,10 +8512,10 @@
+@@ -8619,10 +8433,10 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -11134,7 +16988,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -8700,10 +8529,10 @@
+@@ -8636,10 +8450,10 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -11148,7 +17002,7 @@
else
if test -n "$NMEDIT"; then
ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-@@ -8716,7 +8545,7 @@
+@@ -8652,7 +8466,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
@@ -11157,7 +17011,7 @@
break 2
fi
done
-@@ -8727,11 +8556,11 @@
+@@ -8663,11 +8477,11 @@ fi
fi
NMEDIT=$ac_cv_prog_NMEDIT
if test -n "$NMEDIT"; then
@@ -11173,7 +17027,7 @@
fi
-@@ -8740,10 +8569,10 @@
+@@ -8676,10 +8490,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
@@ -11187,7 +17041,7 @@
else
if test -n "$ac_ct_NMEDIT"; then
ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-@@ -8756,7 +8585,7 @@
+@@ -8692,7 +8506,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
@@ -11196,7 +17050,7 @@
break 2
fi
done
-@@ -8767,11 +8596,11 @@
+@@ -8703,11 +8517,11 @@ fi
fi
ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
if test -n "$ac_ct_NMEDIT"; then
@@ -11212,7 +17066,7 @@
fi
if test "x$ac_ct_NMEDIT" = x; then
-@@ -8779,10 +8608,10 @@
+@@ -8715,10 +8529,10 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -11225,7 +17079,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -8794,10 +8623,10 @@
+@@ -8730,10 +8544,10 @@ else
fi
@@ -11239,7 +17093,7 @@
else
lt_cv_apple_cc_single_mod=no
if test -z "${LT_MULTI_MODULE}"; then
-@@ -8815,12 +8644,12 @@
+@@ -8751,12 +8565,12 @@ else
rm conftest.c
fi
fi
@@ -11257,7 +17111,7 @@
else
lt_cv_ld_exported_symbols_list=no
save_LDFLAGS=$LDFLAGS
-@@ -8847,37 +8676,33 @@
+@@ -8783,37 +8597,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11302,7 +17156,7 @@
case $host_os in
rhapsody* | darwin1.[0123])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -8989,10 +8814,10 @@
+@@ -8925,10 +8735,10 @@ if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -11316,21 +17170,21 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
-@@ -9007,11 +8832,11 @@
+@@ -8943,11 +8753,11 @@ else
-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:9010: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8835: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8946: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8756: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9014: \$? = $ac_status" >&5
-+ echo "$as_me:8839: \$? = $ac_status" >&5
+- echo "$as_me:8950: \$? = $ac_status" >&5
++ echo "$as_me:8760: \$? = $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.
-@@ -9024,8 +8849,8 @@
+@@ -8960,8 +8770,8 @@ else
$rm conftest*
fi
@@ -11341,7 +17195,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -9039,8 +8864,8 @@
+@@ -8975,8 +8785,8 @@ lt_prog_compiler_wl=
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -11352,7 +17206,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9271,18 +9096,18 @@
+@@ -9207,18 +9017,18 @@ $as_echo_n "checking for $compiler optio
esac
fi
@@ -11376,21 +17230,21 @@
else
lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
-@@ -9297,11 +9122,11 @@
+@@ -9233,11 +9043,11 @@ else
-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:9300: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9125: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9236: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9046: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9304: \$? = $ac_status" >&5
-+ echo "$as_me:9129: \$? = $ac_status" >&5
+- echo "$as_me:9240: \$? = $ac_status" >&5
++ echo "$as_me:9050: \$? = $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.
-@@ -9314,8 +9139,8 @@
+@@ -9250,8 +9060,8 @@ else
$rm conftest*
fi
@@ -11401,7 +17255,7 @@
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9342,10 +9167,10 @@
+@@ -9278,10 +9088,10 @@ esac
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -11415,7 +17269,7 @@
else
lt_cv_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
-@@ -9370,8 +9195,8 @@
+@@ -9306,8 +9116,8 @@ else
LDFLAGS="$save_LDFLAGS"
fi
@@ -11426,7 +17280,7 @@
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
:
-@@ -9380,10 +9205,10 @@
+@@ -9316,10 +9126,10 @@ else
fi
@@ -11440,21 +17294,21 @@
else
lt_cv_prog_compiler_c_o=no
$rm -r conftest 2>/dev/null
-@@ -9401,11 +9226,11 @@
+@@ -9337,11 +9147,11 @@ else
-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:9404: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9229: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9340: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9150: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9408: \$? = $ac_status" >&5
-+ echo "$as_me:9233: \$? = $ac_status" >&5
+- echo "$as_me:9344: \$? = $ac_status" >&5
++ echo "$as_me:9154: \$? = $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
-@@ -9427,34 +9252,34 @@
+@@ -9363,34 +9173,34 @@ else
$rm conftest*
fi
@@ -11499,7 +17353,7 @@
runpath_var=
allow_undefined_flag=
-@@ -9666,12 +9491,13 @@
+@@ -9602,12 +9412,13 @@ EOF
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -11514,7 +17368,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9884,21 +9710,18 @@
+@@ -9820,21 +9631,18 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11540,7 +17394,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -9913,13 +9736,12 @@
+@@ -9849,13 +9657,12 @@ if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -11555,7 +17409,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -9954,21 +9776,18 @@
+@@ -9890,21 +9697,18 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11581,7 +17435,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -9983,13 +9802,12 @@
+@@ -9919,13 +9723,12 @@ if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -11596,7 +17450,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10222,7 +10040,7 @@
+@@ -10158,7 +9961,7 @@ if test -z "$aix_libpath"; then aix_libp
link_all_deplibs=yes
;;
@@ -11605,7 +17459,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10441,8 +10259,8 @@
+@@ -10377,8 +10180,8 @@ if test -z "$aix_libpath"; then aix_libp
esac
fi
@@ -11616,7 +17470,7 @@
test "$ld_shlibs" = no && can_build_shared=no
#
-@@ -10462,15 +10280,15 @@
+@@ -10398,15 +10201,15 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -11635,7 +17489,7 @@
(exit $ac_status); } 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -10488,7 +10306,7 @@
+@@ -10424,7 +10227,7 @@ $as_echo_n "checking whether -lc should
if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
(eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
@@ -11644,7 +17498,7 @@
(exit $ac_status); }
then
archive_cmds_need_lc=no
-@@ -10500,16 +10318,16 @@
+@@ -10436,16 +10239,16 @@ $as_echo_n "checking whether -lc should
cat conftest.err 1>&5
fi
$rm conftest*
@@ -11665,7 +17519,22 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -10933,6 +10751,18 @@
+@@ -10853,13 +10656,11 @@ linux* | k*bsd*-gnu)
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -10871,6 +10672,18 @@ linux* | k*bsd*-gnu)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11684,7 +17553,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11110,19 +10940,19 @@
+@@ -11048,19 +10861,19 @@ uts4*)
dynamic_linker=no
;;
esac
@@ -11708,7 +17577,7 @@
else
lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
-@@ -11134,8 +10964,8 @@
+@@ -11072,8 +10885,8 @@ if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -11719,7 +17588,7 @@
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
test -n "$runpath_var" || \
-@@ -11159,8 +10989,8 @@
+@@ -11097,8 +10910,8 @@ else
# directories.
hardcode_action=unsupported
fi
@@ -11730,7 +17599,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11173,13 +11003,13 @@
+@@ -11111,13 +10924,13 @@ fi
striplib=
old_striplib=
@@ -11748,7 +17617,7 @@
else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
-@@ -11187,16 +11017,16 @@
+@@ -11125,16 +10938,16 @@ else
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -11771,7 +17640,7 @@
;;
esac
fi
-@@ -11228,10 +11058,10 @@
+@@ -11166,10 +10979,10 @@ else
darwin*)
# if libdl is installed we need to link against it
@@ -11785,7 +17654,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-@@ -11263,36 +11093,32 @@
+@@ -11201,36 +11014,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11829,7 +17698,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11306,10 +11132,10 @@
+@@ -11244,10 +11053,10 @@ fi
;;
*)
@@ -11843,7 +17712,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -11362,42 +11188,38 @@
+@@ -11300,42 +11109,38 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11896,7 +17765,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
-@@ -11429,43 +11251,39 @@
+@@ -11367,43 +11172,39 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11950,7 +17819,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -11518,42 +11336,38 @@
+@@ -11456,42 +11257,38 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12003,7 +17872,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-@@ -11585,43 +11399,39 @@
+@@ -11523,43 +11320,39 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12057,7 +17926,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsvld $LIBS"
-@@ -11653,43 +11463,39 @@
+@@ -11591,43 +11384,39 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12111,7 +17980,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
-@@ -11721,36 +11527,32 @@
+@@ -11659,36 +11448,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12155,7 +18024,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -11790,10 +11592,10 @@
+@@ -11728,10 +11513,10 @@ fi
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -12169,16 +18038,16 @@
else
if test "$cross_compiling" = yes; then :
lt_cv_dlopen_self=cross
-@@ -11801,7 +11603,7 @@
+@@ -11739,7 +11524,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11804 "configure"
-+#line 11606 "configure"
+-#line 11742 "configure"
++#line 11527 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11867,7 +11669,7 @@
+@@ -11805,7 +11590,7 @@ EOF
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
@@ -12187,7 +18056,7 @@
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
-@@ -11885,15 +11687,15 @@
+@@ -11823,15 +11608,15 @@ rm -fr conftest*
fi
@@ -12208,16 +18077,16 @@
else
if test "$cross_compiling" = yes; then :
lt_cv_dlopen_self_static=cross
-@@ -11901,7 +11703,7 @@
+@@ -11839,7 +11624,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11904 "configure"
-+#line 11706 "configure"
+-#line 11842 "configure"
++#line 11627 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11967,7 +11769,7 @@
+@@ -11905,7 +11690,7 @@ EOF
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
@@ -12226,7 +18095,7 @@
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
-@@ -11985,8 +11787,8 @@
+@@ -11923,8 +11708,8 @@ rm -fr conftest*
fi
@@ -12237,7 +18106,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -12008,13 +11810,13 @@
+@@ -11946,13 +11731,13 @@ fi
# Report which library types will actually be built
@@ -12257,7 +18126,7 @@
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
-@@ -12034,15 +11836,15 @@
+@@ -11972,15 +11757,15 @@ aix[4-9]*)
fi
;;
esac
@@ -12279,7 +18148,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12135,8 +11937,8 @@
+@@ -12073,8 +11858,8 @@ if test -f "$ltmain"; then
cfgfile="${ofile}T"
trap "$rm \"$cfgfile\"; exit 1" 1 2 15
$rm -f "$cfgfile"
@@ -12290,7 +18159,7 @@
cat <<__EOF__ >> "$cfgfile"
#! $SHELL
-@@ -12548,18 +12350,18 @@
+@@ -12486,18 +12271,18 @@ fi
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
@@ -12315,7 +18184,7 @@
fi
fi
if test -z "$LTCFLAGS"; then
-@@ -12576,16 +12378,16 @@
+@@ -12514,16 +12299,16 @@ $as_echo "$as_me: WARNING: using \`LTCC=
# Check whether tagname contains only valid characters
case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
"") ;;
@@ -12336,7 +18205,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -12728,8 +12530,8 @@
+@@ -12666,8 +12451,8 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -12347,7 +18216,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12758,14 +12560,14 @@
+@@ -12696,14 +12481,14 @@ $as_echo_n "checking for ld used by $CC.
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -12367,7 +18236,7 @@
else
if test -z "$LD"; then
lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -12795,19 +12597,19 @@
+@@ -12733,19 +12518,19 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -12396,7 +18265,7 @@
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
-@@ -12819,8 +12621,8 @@
+@@ -12757,8 +12542,8 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
@@ -12407,7 +18276,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12870,8 +12672,8 @@
+@@ -12808,8 +12593,8 @@ else
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -12418,7 +18287,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -12988,21 +12790,18 @@
+@@ -12926,21 +12711,18 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12444,7 +18313,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -13017,13 +12816,12 @@
+@@ -12955,13 +12737,12 @@ if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -12459,7 +18328,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13059,21 +12857,18 @@
+@@ -12997,21 +12778,18 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12485,7 +18354,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -13088,13 +12883,12 @@
+@@ -13026,13 +12804,12 @@ if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -12500,7 +18369,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13497,7 +13291,7 @@
+@@ -13435,7 +13212,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
@@ -12509,7 +18378,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=
-@@ -13824,8 +13618,8 @@
+@@ -13762,8 +13539,8 @@ if test -z "$aix_libpath"; then aix_libp
ld_shlibs_CXX=no
;;
esac
@@ -12520,7 +18389,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13844,7 +13638,7 @@
+@@ -13782,7 +13559,7 @@ EOF
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -12529,7 +18398,7 @@
(exit $ac_status); }; then
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
-@@ -14000,8 +13794,8 @@
+@@ -13938,8 +13715,8 @@ lt_prog_compiler_wl_CXX=
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -12540,7 +18409,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -14201,7 +13995,7 @@
+@@ -14139,7 +13916,7 @@ $as_echo_n "checking for $compiler optio
;;
esac
;;
@@ -12549,7 +18418,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -14284,18 +14078,18 @@
+@@ -14222,18 +13999,18 @@ $as_echo_n "checking for $compiler optio
esac
fi
@@ -12573,21 +18442,21 @@
else
lt_cv_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
-@@ -14310,11 +14104,11 @@
+@@ -14248,11 +14025,11 @@ else
-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:14313: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14107: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14251: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14028: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14317: \$? = $ac_status" >&5
-+ echo "$as_me:14111: \$? = $ac_status" >&5
+- echo "$as_me:14255: \$? = $ac_status" >&5
++ echo "$as_me:14032: \$? = $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.
-@@ -14327,8 +14121,8 @@
+@@ -14265,8 +14042,8 @@ else
$rm conftest*
fi
@@ -12598,7 +18467,7 @@
if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14355,10 +14149,10 @@
+@@ -14293,10 +14070,10 @@ esac
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
@@ -12612,7 +18481,7 @@
else
lt_cv_prog_compiler_static_works_CXX=no
save_LDFLAGS="$LDFLAGS"
-@@ -14383,8 +14177,8 @@
+@@ -14321,8 +14098,8 @@ else
LDFLAGS="$save_LDFLAGS"
fi
@@ -12623,7 +18492,7 @@
if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
:
-@@ -14393,10 +14187,10 @@
+@@ -14331,10 +14108,10 @@ else
fi
@@ -12637,21 +18506,21 @@
else
lt_cv_prog_compiler_c_o_CXX=no
$rm -r conftest 2>/dev/null
-@@ -14414,11 +14208,11 @@
+@@ -14352,11 +14129,11 @@ else
-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:14417: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14211: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14355: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14132: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14421: \$? = $ac_status" >&5
-+ echo "$as_me:14215: \$? = $ac_status" >&5
+- echo "$as_me:14359: \$? = $ac_status" >&5
++ echo "$as_me:14136: \$? = $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
-@@ -14440,34 +14234,34 @@
+@@ -14378,34 +14155,34 @@ else
$rm conftest*
fi
@@ -12696,7 +18565,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14486,14 +14280,17 @@
+@@ -14424,14 +14201,17 @@ $as_echo_n "checking whether the $compil
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
;;
@@ -12716,7 +18585,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
#
-@@ -14513,15 +14310,15 @@
+@@ -14451,15 +14231,15 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -12735,7 +18604,7 @@
(exit $ac_status); } 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -14539,7 +14336,7 @@
+@@ -14477,7 +14257,7 @@ $as_echo_n "checking whether -lc should
if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
(eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
@@ -12744,7 +18613,7 @@
(exit $ac_status); }
then
archive_cmds_need_lc_CXX=no
-@@ -14551,16 +14348,16 @@
+@@ -14489,16 +14269,16 @@ $as_echo_n "checking whether -lc should
cat conftest.err 1>&5
fi
$rm conftest*
@@ -12765,7 +18634,22 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -14932,6 +14729,18 @@
+@@ -14854,13 +14634,11 @@ linux* | k*bsd*-gnu)
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -14872,6 +14650,18 @@ linux* | k*bsd*-gnu)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -12784,7 +18668,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -15109,19 +14918,19 @@
+@@ -15049,19 +14839,19 @@ uts4*)
dynamic_linker=no
;;
esac
@@ -12808,7 +18692,7 @@
else
lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
-@@ -15133,8 +14942,8 @@
+@@ -15073,8 +14863,8 @@ if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -12819,7 +18703,7 @@
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
test -n "$runpath_var_CXX" || \
-@@ -15158,8 +14967,8 @@
+@@ -15098,8 +14888,8 @@ else
# directories.
hardcode_action_CXX=unsupported
fi
@@ -12830,7 +18714,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -15697,13 +15506,13 @@
+@@ -15637,13 +15427,13 @@ done
cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
@@ -12850,7 +18734,7 @@
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
-@@ -15722,15 +15531,15 @@
+@@ -15662,15 +15452,15 @@ aix[4-9]*)
fi
;;
esac
@@ -12872,7 +18756,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -15739,8 +15548,8 @@
+@@ -15679,8 +15469,8 @@ lt_prog_compiler_wl_F77=
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -12883,7 +18767,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -15971,18 +15780,18 @@
+@@ -15911,18 +15701,18 @@ $as_echo_n "checking for $compiler optio
esac
fi
@@ -12907,21 +18791,21 @@
else
lt_cv_prog_compiler_pic_works_F77=no
ac_outfile=conftest.$ac_objext
-@@ -15997,11 +15806,11 @@
+@@ -15937,11 +15727,11 @@ else
-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:16000: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15809: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15940: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15730: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16004: \$? = $ac_status" >&5
-+ echo "$as_me:15813: \$? = $ac_status" >&5
+- echo "$as_me:15944: \$? = $ac_status" >&5
++ echo "$as_me:15734: \$? = $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.
-@@ -16014,8 +15823,8 @@
+@@ -15954,8 +15744,8 @@ else
$rm conftest*
fi
@@ -12932,7 +18816,7 @@
if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16042,10 +15851,10 @@
+@@ -15982,10 +15772,10 @@ esac
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
@@ -12946,7 +18830,7 @@
else
lt_cv_prog_compiler_static_works_F77=no
save_LDFLAGS="$LDFLAGS"
-@@ -16070,8 +15879,8 @@
+@@ -16010,8 +15800,8 @@ else
LDFLAGS="$save_LDFLAGS"
fi
@@ -12957,7 +18841,7 @@
if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
:
-@@ -16080,10 +15889,10 @@
+@@ -16020,10 +15810,10 @@ else
fi
@@ -12971,21 +18855,21 @@
else
lt_cv_prog_compiler_c_o_F77=no
$rm -r conftest 2>/dev/null
-@@ -16101,11 +15910,11 @@
+@@ -16041,11 +15831,11 @@ else
-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:16104: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15913: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16044: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15834: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16108: \$? = $ac_status" >&5
-+ echo "$as_me:15917: \$? = $ac_status" >&5
+- echo "$as_me:16048: \$? = $ac_status" >&5
++ echo "$as_me:15838: \$? = $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
-@@ -16127,34 +15936,34 @@
+@@ -16067,34 +15857,34 @@ else
$rm conftest*
fi
@@ -13030,7 +18914,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16366,12 +16175,13 @@
+@@ -16306,12 +16096,13 @@ EOF
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -13045,7 +18929,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -16574,21 +16384,18 @@
+@@ -16514,21 +16305,18 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13071,7 +18955,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -16603,13 +16410,12 @@
+@@ -16543,13 +16331,12 @@ if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -13086,7 +18970,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16634,21 +16440,18 @@
+@@ -16574,21 +16361,18 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13112,7 +18996,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -16663,13 +16466,12 @@
+@@ -16603,13 +16387,12 @@ if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -13127,7 +19011,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16902,7 +16704,7 @@
+@@ -16842,7 +16625,7 @@ if test -z "$aix_libpath"; then aix_libp
link_all_deplibs_F77=yes
;;
@@ -13136,7 +19020,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
-@@ -17121,8 +16923,8 @@
+@@ -17061,8 +16844,8 @@ if test -z "$aix_libpath"; then aix_libp
esac
fi
@@ -13147,7 +19031,7 @@
test "$ld_shlibs_F77" = no && can_build_shared=no
#
-@@ -17142,15 +16944,15 @@
+@@ -17082,15 +16865,15 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -13166,7 +19050,7 @@
(exit $ac_status); } 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -17168,7 +16970,7 @@
+@@ -17108,7 +16891,7 @@ $as_echo_n "checking whether -lc should
if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
(eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
@@ -13175,7 +19059,7 @@
(exit $ac_status); }
then
archive_cmds_need_lc_F77=no
-@@ -17180,16 +16982,16 @@
+@@ -17120,16 +16903,16 @@ $as_echo_n "checking whether -lc should
cat conftest.err 1>&5
fi
$rm conftest*
@@ -13196,7 +19080,22 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -17561,6 +17363,18 @@
+@@ -17485,13 +17268,11 @@ linux* | k*bsd*-gnu)
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -17503,6 +17284,18 @@ linux* | k*bsd*-gnu)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -13215,7 +19114,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17738,19 +17552,19 @@
+@@ -17680,19 +17473,19 @@ uts4*)
dynamic_linker=no
;;
esac
@@ -13239,7 +19138,7 @@
else
lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
-@@ -17762,8 +17576,8 @@
+@@ -17704,8 +17497,8 @@ if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -13250,7 +19149,7 @@
hardcode_action_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
test -n "$runpath_var_F77" || \
-@@ -17787,8 +17601,8 @@
+@@ -17729,8 +17522,8 @@ else
# directories.
hardcode_action_F77=unsupported
fi
@@ -13261,7 +19160,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -18298,10 +18112,10 @@
+@@ -18240,10 +18033,10 @@ if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -13275,21 +19174,21 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
-@@ -18316,11 +18130,11 @@
+@@ -18258,11 +18051,11 @@ else
-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:18319: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18133: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18261: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18054: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18323: \$? = $ac_status" >&5
-+ echo "$as_me:18137: \$? = $ac_status" >&5
+- echo "$as_me:18265: \$? = $ac_status" >&5
++ echo "$as_me:18058: \$? = $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.
-@@ -18333,8 +18147,8 @@
+@@ -18275,8 +18068,8 @@ else
$rm conftest*
fi
@@ -13300,7 +19199,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -18348,8 +18162,8 @@
+@@ -18290,8 +18083,8 @@ lt_prog_compiler_wl_GCJ=
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -13311,7 +19210,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18580,18 +18394,18 @@
+@@ -18522,18 +18315,18 @@ $as_echo_n "checking for $compiler optio
esac
fi
@@ -13335,21 +19234,21 @@
else
lt_cv_prog_compiler_pic_works_GCJ=no
ac_outfile=conftest.$ac_objext
-@@ -18606,11 +18420,11 @@
+@@ -18548,11 +18341,11 @@ else
-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:18609: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18423: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18551: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18344: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18613: \$? = $ac_status" >&5
-+ echo "$as_me:18427: \$? = $ac_status" >&5
+- echo "$as_me:18555: \$? = $ac_status" >&5
++ echo "$as_me:18348: \$? = $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.
-@@ -18623,8 +18437,8 @@
+@@ -18565,8 +18358,8 @@ else
$rm conftest*
fi
@@ -13360,7 +19259,7 @@
if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18651,10 +18465,10 @@
+@@ -18593,10 +18386,10 @@ esac
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
@@ -13374,7 +19273,7 @@
else
lt_cv_prog_compiler_static_works_GCJ=no
save_LDFLAGS="$LDFLAGS"
-@@ -18679,8 +18493,8 @@
+@@ -18621,8 +18414,8 @@ else
LDFLAGS="$save_LDFLAGS"
fi
@@ -13385,7 +19284,7 @@
if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
:
-@@ -18689,10 +18503,10 @@
+@@ -18631,10 +18424,10 @@ else
fi
@@ -13399,21 +19298,21 @@
else
lt_cv_prog_compiler_c_o_GCJ=no
$rm -r conftest 2>/dev/null
-@@ -18710,11 +18524,11 @@
+@@ -18652,11 +18445,11 @@ else
-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:18713: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18527: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18655: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18448: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18717: \$? = $ac_status" >&5
-+ echo "$as_me:18531: \$? = $ac_status" >&5
+- echo "$as_me:18659: \$? = $ac_status" >&5
++ echo "$as_me:18452: \$? = $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
-@@ -18736,34 +18550,34 @@
+@@ -18678,34 +18471,34 @@ else
$rm conftest*
fi
@@ -13458,7 +19357,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -18975,12 +18789,13 @@
+@@ -18917,12 +18710,13 @@ EOF
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -13473,7 +19372,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -19193,21 +19008,18 @@
+@@ -19135,21 +18929,18 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13499,7 +19398,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -19222,13 +19034,12 @@
+@@ -19164,13 +18955,12 @@ if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -13514,7 +19413,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19263,21 +19074,18 @@
+@@ -19205,21 +18995,18 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13540,7 +19439,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -19292,13 +19100,12 @@
+@@ -19234,13 +19021,12 @@ if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -13555,7 +19454,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19531,7 +19338,7 @@
+@@ -19473,7 +19259,7 @@ if test -z "$aix_libpath"; then aix_libp
link_all_deplibs_GCJ=yes
;;
@@ -13564,7 +19463,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
-@@ -19750,8 +19557,8 @@
+@@ -19692,8 +19478,8 @@ if test -z "$aix_libpath"; then aix_libp
esac
fi
@@ -13575,7 +19474,7 @@
test "$ld_shlibs_GCJ" = no && can_build_shared=no
#
-@@ -19771,15 +19578,15 @@
+@@ -19713,15 +19499,15 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -13594,7 +19493,7 @@
(exit $ac_status); } 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -19797,7 +19604,7 @@
+@@ -19739,7 +19525,7 @@ $as_echo_n "checking whether -lc should
if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
(eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
@@ -13603,7 +19502,7 @@
(exit $ac_status); }
then
archive_cmds_need_lc_GCJ=no
-@@ -19809,16 +19616,16 @@
+@@ -19751,16 +19537,16 @@ $as_echo_n "checking whether -lc should
cat conftest.err 1>&5
fi
$rm conftest*
@@ -13624,7 +19523,22 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -20190,6 +19997,18 @@
+@@ -20116,13 +19902,11 @@ linux* | k*bsd*-gnu)
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -20134,6 +19918,18 @@ linux* | k*bsd*-gnu)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -13643,7 +19557,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -20367,19 +20186,19 @@
+@@ -20311,19 +20107,19 @@ uts4*)
dynamic_linker=no
;;
esac
@@ -13667,7 +19581,7 @@
else
lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
-@@ -20391,8 +20210,8 @@
+@@ -20335,8 +20131,8 @@ if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -13678,7 +19592,7 @@
hardcode_action_GCJ=
if test -n "$hardcode_libdir_flag_spec_GCJ" || \
test -n "$runpath_var_GCJ" || \
-@@ -20416,8 +20235,8 @@
+@@ -20360,8 +20156,8 @@ else
# directories.
hardcode_action_GCJ=unsupported
fi
@@ -13689,7 +19603,7 @@
if test "$hardcode_action_GCJ" = relink; then
# Fast installation is not supported
-@@ -21340,8 +21159,8 @@
+@@ -21284,8 +21080,8 @@ CC="$lt_save_CC"
;;
*)
@@ -13700,7 +19614,7 @@
{ (exit 1); exit 1; }; }
;;
esac
-@@ -21360,8 +21179,8 @@
+@@ -21304,8 +21100,8 @@ $as_echo "$as_me: error: Unsupported tag
chmod +x "$ofile"
else
rm -f "${ofile}T"
@@ -13711,7 +19625,7 @@
{ (exit 1); exit 1; }; }
fi
fi
-@@ -21403,10 +21222,10 @@
+@@ -21347,10 +21143,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -13725,7 +19639,7 @@
else
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
-@@ -21421,7 +21240,7 @@
+@@ -21365,7 +21161,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
@@ -13734,7 +19648,7 @@
break 2
fi
done
-@@ -21433,11 +21252,11 @@
+@@ -21377,11 +21173,11 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -13750,7 +19664,7 @@
fi
-@@ -21446,10 +21265,10 @@
+@@ -21390,10 +21186,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -13764,7 +19678,7 @@
else
case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
-@@ -21464,7 +21283,7 @@
+@@ -21408,7 +21204,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
@@ -13773,7 +19687,7 @@
break 2
fi
done
-@@ -21476,11 +21295,11 @@
+@@ -21420,11 +21216,11 @@ esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -13789,7 +19703,7 @@
fi
if test "x$ac_pt_PKG_CONFIG" = x; then
-@@ -21488,10 +21307,10 @@
+@@ -21432,10 +21228,10 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -13802,7 +19716,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -21505,14 +21324,14 @@
+@@ -21449,14 +21245,14 @@ fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -13823,7 +19737,7 @@
PKG_CONFIG=""
fi
-@@ -21521,10 +21340,10 @@
+@@ -21465,10 +21261,10 @@ fi
gdu_cv_version_required=0.3.2
if test -n "$PKG_CONFIG" && \
@@ -13836,7 +19750,7 @@
(exit $ac_status); }; then
gdu_cv_have_gdu=yes
else
-@@ -21534,8 +21353,8 @@
+@@ -21478,8 +21274,8 @@ fi
if test "$gdu_cv_have_gdu" = "yes"; then
:
else
@@ -13847,7 +19761,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -21623,8 +21442,8 @@
+@@ -21566,8 +21362,8 @@ fi
case "$am__api_version" in
1.01234)
@@ -13858,32 +19772,151 @@
{ (exit 1); exit 1; }; }
;;
*)
-@@ -21632,18 +21451,18 @@
+@@ -21575,27 +21371,27 @@ $as_echo "$as_me: error: Automake 1.5 or
esac
- if test -n "0.35.0"; then
-- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5
--$as_echo_n "checking for intltool >= 0.35.0... " >&6; }
-+ { echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5
-+echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; }
-
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
- INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
+ if test -n "0.37.1"; then
+- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.37.1" >&5
+-$as_echo_n "checking for intltool >= 0.37.1... " >&6; }
++ { echo "$as_me:$LINENO: checking for intltool >= 0.37.1" >&5
++echo $ECHO_N "checking for intltool >= 0.37.1... $ECHO_C" >&6; }
+
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.37.1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+ INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
-$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
+ { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5
--$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}
-+ { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5
-+echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}
+- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.37.1 or later." >&5
+-$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.37.1 or later." >&2;}
++ { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.37.1 or later." >&5
++echo "$as_me: error: Your intltool is too old. You need intltool 0.37.1 or later." >&2;}
{ (exit 1); exit 1; }; }
fi
-@@ -21690,10 +21509,10 @@
+ # Extract the first word of "intltool-update", so it can be a program name with args.
+ set dummy intltool-update; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $INTLTOOL_UPDATE in
+ [\\/]* | ?:[\\/]*)
+@@ -21610,7 +21406,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -21622,20 +21418,20 @@ esac
+ fi
+ INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
+ if test -n "$INTLTOOL_UPDATE"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
+-$as_echo "$INTLTOOL_UPDATE" >&6; }
++ { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
++echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+ # Extract the first word of "intltool-merge", so it can be a program name with args.
+ set dummy intltool-merge; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $INTLTOOL_MERGE in
+ [\\/]* | ?:[\\/]*)
+@@ -21650,7 +21446,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -21662,20 +21458,20 @@ esac
+ fi
+ INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
+ if test -n "$INTLTOOL_MERGE"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
+-$as_echo "$INTLTOOL_MERGE" >&6; }
++ { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
++echo "${ECHO_T}$INTLTOOL_MERGE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+ # Extract the first word of "intltool-extract", so it can be a program name with args.
+ set dummy intltool-extract; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $INTLTOOL_EXTRACT in
+ [\\/]* | ?:[\\/]*)
+@@ -21690,7 +21486,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -21702,17 +21498,17 @@ esac
+ fi
+ INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
+ if test -n "$INTLTOOL_EXTRACT"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
+-$as_echo "$INTLTOOL_EXTRACT" >&6; }
++ { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
++echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
+-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
++ { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
++echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+@@ -21759,10 +21555,10 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -13897,7 +19930,7 @@
else
case $XGETTEXT in
[\\/]* | ?:[\\/]*)
-@@ -21708,7 +21527,7 @@
+@@ -21777,7 +21573,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
@@ -13906,7 +19939,7 @@
break 2
fi
done
-@@ -21720,20 +21539,20 @@
+@@ -21789,20 +21585,20 @@ esac
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -13934,7 +19967,7 @@
else
case $MSGMERGE in
[\\/]* | ?:[\\/]*)
-@@ -21748,7 +21567,7 @@
+@@ -21817,7 +21613,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
@@ -13943,7 +19976,7 @@
break 2
fi
done
-@@ -21760,20 +21579,20 @@
+@@ -21829,20 +21625,20 @@ esac
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -13971,7 +20004,7 @@
else
case $MSGFMT in
[\\/]* | ?:[\\/]*)
-@@ -21788,7 +21607,7 @@
+@@ -21857,7 +21653,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
@@ -13980,7 +20013,7 @@
break 2
fi
done
-@@ -21800,25 +21619,25 @@
+@@ -21869,34 +21665,34 @@ esac
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -14014,8 +20047,6 @@
{ (exit 1); exit 1; }; }
fi
-@@ -21832,10 +21651,10 @@
-
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -14028,7 +20059,7 @@
else
case $INTLTOOL_PERL in
[\\/]* | ?:[\\/]*)
-@@ -21850,7 +21669,7 @@
+@@ -21911,7 +21707,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
@@ -14037,7 +20068,7 @@
break 2
fi
done
-@@ -21862,33 +21681,33 @@
+@@ -21923,33 +21719,33 @@ esac
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -14085,7 +20116,7 @@
{ (exit 1); exit 1; }; }
fi
fi
-@@ -21921,32 +21740,29 @@
+@@ -21982,32 +21778,29 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14126,7 +20157,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -21999,35 +21815,31 @@
+@@ -22060,35 +21853,31 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14169,7 +20200,7 @@
if test $ac_cv_func_bind_textdomain_codeset = yes; then
DATADIRNAME=share
else
-@@ -22041,7 +21853,6 @@
+@@ -22102,7 +21891,6 @@ fi
esac
fi
@@ -14177,7 +20208,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -22067,21 +21878,20 @@
+@@ -22124,21 +21912,20 @@ _ACEOF
for ac_header in locale.h
do
@@ -14208,7 +20239,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22097,33 +21907,32 @@
+@@ -22154,33 +21941,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14249,7 +20280,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22137,52 +21946,51 @@
+@@ -22194,52 +21980,51 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14323,7 +20354,7 @@
( cat <<\_ASBOX
## ----------------------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center ##
-@@ -22191,23 +21999,21 @@
+@@ -22248,23 +22033,21 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -14355,7 +20386,7 @@
_ACEOF
fi
-@@ -22215,10 +22021,10 @@
+@@ -22272,10 +22055,10 @@ fi
done
if test $ac_cv_header_locale_h = yes; then
@@ -14369,7 +20400,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -22241,35 +22047,31 @@
+@@ -22298,35 +22081,31 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14412,7 +20443,7 @@
if test $am_cv_val_LC_MESSAGES = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -22288,17 +22090,17 @@
+@@ -22345,17 +22124,17 @@ _ACEOF
INTLLIBS=
if test "${ac_cv_header_libintl_h+set}" = set; then
@@ -14437,7 +20468,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22314,33 +22116,32 @@
+@@ -22371,33 +22150,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14478,7 +20509,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22354,52 +22155,51 @@
+@@ -22411,52 +22189,51 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14552,7 +20583,7 @@
( cat <<\_ASBOX
## ----------------------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center ##
-@@ -22408,15 +22208,15 @@
+@@ -22465,15 +22242,15 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -14573,7 +20604,7 @@
fi
if test $ac_cv_header_libintl_h = yes; then
-@@ -22426,10 +22226,10 @@
+@@ -22483,10 +22260,10 @@ if test $ac_cv_header_libintl_h = yes; t
#
# First check in libc
#
@@ -14587,7 +20618,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -22454,42 +22254,38 @@
+@@ -22511,42 +22288,38 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14640,7 +20671,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -22514,47 +22310,43 @@
+@@ -22571,47 +22344,43 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14699,7 +20730,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -22607,41 +22399,35 @@
+@@ -22664,41 +22433,35 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14751,7 +20782,7 @@
_ACEOF
fi
-@@ -22656,10 +22442,10 @@
+@@ -22713,10 +22476,10 @@ done
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -14765,7 +20796,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-@@ -22691,41 +22477,37 @@
+@@ -22748,41 +22511,37 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14817,7 +20848,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-@@ -22757,41 +22539,37 @@
+@@ -22814,41 +22573,37 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14869,7 +20900,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-@@ -22823,36 +22601,32 @@
+@@ -22880,36 +22635,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14913,7 +20944,7 @@
if test $ac_cv_lib_intl_dgettext = yes; then
gt_cv_func_dgettext_libintl=yes
fi
-@@ -22863,14 +22637,14 @@
+@@ -22920,14 +22671,14 @@ fi
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -14935,7 +20966,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl -liconv $LIBS"
-@@ -22902,41 +22676,37 @@
+@@ -22959,41 +22710,37 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14987,7 +21018,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl -liconv $LIBS"
-@@ -22968,36 +22738,32 @@
+@@ -23025,36 +22772,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15031,7 +21062,7 @@
if test $ac_cv_lib_intl_dcgettext = yes; then
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
-@@ -23023,11 +22789,11 @@
+@@ -23080,11 +22823,11 @@ fi
for ac_func in bind_textdomain_codeset
do
@@ -15047,7 +21078,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -23080,41 +22846,35 @@
+@@ -23137,41 +22880,35 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15099,7 +21130,7 @@
_ACEOF
fi
-@@ -23150,10 +22910,10 @@
+@@ -23207,10 +22944,10 @@ _ACEOF
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -15113,7 +21144,7 @@
else
case "$MSGFMT" in
/*)
-@@ -23177,11 +22937,11 @@
+@@ -23234,11 +22971,11 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -15129,7 +21160,7 @@
fi
if test "$MSGFMT" != "no"; then
glib_save_LIBS="$LIBS"
-@@ -23189,11 +22949,11 @@
+@@ -23246,11 +22983,11 @@ fi
for ac_func in dcgettext
do
@@ -15145,7 +21176,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -23246,49 +23006,43 @@
+@@ -23303,49 +23040,43 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15207,7 +21238,7 @@
cat >conftest.foo <<_ACEOF
msgid ""
-@@ -23302,25 +23056,25 @@
+@@ -23359,25 +23090,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -15242,7 +21273,7 @@
else
case $GMSGFMT in
[\\/]* | ?:[\\/]*)
-@@ -23335,7 +23089,7 @@
+@@ -23392,7 +23123,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
@@ -15251,7 +21282,7 @@
break 2
fi
done
-@@ -23348,20 +23102,20 @@
+@@ -23405,20 +23136,20 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -15279,7 +21310,7 @@
else
case "$XGETTEXT" in
/*)
-@@ -23385,11 +23139,11 @@
+@@ -23442,11 +23173,11 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -15295,7 +21326,7 @@
fi
cat >conftest.$ac_ext <<_ACEOF
-@@ -23414,33 +23168,30 @@
+@@ -23471,33 +23202,30 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15337,7 +21368,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -23493,35 +23244,31 @@
+@@ -23550,35 +23278,31 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15380,7 +21411,7 @@
if test $ac_cv_func_bind_textdomain_codeset = yes; then
CATOBJEXT=.gmo
DATADIRNAME=share
-@@ -23538,7 +23285,6 @@
+@@ -23595,7 +23319,6 @@ fi
esac
fi
@@ -15388,7 +21419,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
-@@ -23564,8 +23310,8 @@
+@@ -23621,8 +23344,8 @@ _ACEOF
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -15399,7 +21430,7 @@
XGETTEXT=":"
fi
fi
-@@ -23597,8 +23343,8 @@
+@@ -23654,8 +23377,8 @@ $as_echo "found xgettext program is not
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -15410,7 +21441,7 @@
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
useit=no
-@@ -23622,8 +23368,8 @@
+@@ -23679,8 +23402,8 @@ $as_echo_n "checking for catalogs to be
fi
done
LINGUAS=$NEW_LINGUAS
@@ -15421,7 +21452,7 @@
fi
if test -n "$LINGUAS"; then
-@@ -23716,8 +23462,8 @@
+@@ -23773,8 +23496,8 @@ fi
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -15432,7 +21463,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23739,21 +23485,20 @@
+@@ -23796,21 +23519,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15457,7 +21488,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
has_option=no
-@@ -23761,8 +23506,8 @@
+@@ -23818,8 +23540,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$SAVE_CFLAGS"
@@ -15468,7 +21499,7 @@
if test $has_option = yes; then
warning_flags="$warning_flags $option"
fi
-@@ -23775,16 +23520,16 @@
+@@ -23832,16 +23554,16 @@ $as_echo "$has_option" >&6; }
fi
;;
*)
@@ -15491,7 +21522,7 @@
# Check whether --enable-iso-c was given.
if test "${enable_iso_c+set}" = set; then
-@@ -23794,8 +23539,8 @@
+@@ -23851,8 +23573,8 @@ else
fi
@@ -15502,7 +21533,7 @@
complCFLAGS=
if test "x$enable_iso_c" != "xno"; then
if test "x$GCC" = "xyes"; then
-@@ -23809,8 +23554,8 @@
+@@ -23866,8 +23588,8 @@ $as_echo_n "checking what language compl
esac
fi
fi
@@ -15513,7 +21544,7 @@
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -23826,8 +23571,8 @@
+@@ -23883,8 +23605,8 @@ $as_echo "$complCFLAGS" >&6; }
@@ -15524,7 +21555,7 @@
# Check whether --with-x was given.
-@@ -23841,11 +23586,11 @@
+@@ -23898,11 +23620,11 @@ if test "x$with_x" = xno; then
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -15539,7 +21570,7 @@
else
# One or both of the vars are not set, and there is no cached value.
ac_x_includes=no ac_x_libraries=no
-@@ -23866,7 +23611,7 @@
+@@ -23923,7 +23645,7 @@ _ACEOF
eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
done
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
@@ -15548,7 +21579,7 @@
if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
test -f "$ac_im_libdir/libX11.$ac_extension"; then
ac_im_usrlibdir=$ac_im_libdir; break
-@@ -23941,14 +23686,13 @@
+@@ -23998,14 +23720,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15565,7 +21596,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -23956,7 +23700,7 @@
+@@ -24013,7 +23734,7 @@ $as_echo "$ac_try_echo") >&5
# We can compile using X headers with no special include directory.
ac_x_includes=
else
@@ -15574,7 +21605,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
-@@ -23997,33 +23741,30 @@
+@@ -24054,33 +23775,30 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15615,7 +21646,7 @@
if test -r "$ac_dir/libX11.$ac_extension"; then
ac_x_libraries=$ac_dir
break 2
-@@ -24032,7 +23773,6 @@
+@@ -24089,7 +23807,6 @@ do
done
fi
@@ -15623,7 +21654,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
-@@ -24055,8 +23795,8 @@
+@@ -24112,8 +23829,8 @@ fi
fi # $with_x != no
if test "$have_x" != yes; then
@@ -15634,7 +21665,7 @@
no_x=yes
else
# If each of the values was on the command line, it overrides each guess.
-@@ -24066,8 +23806,8 @@
+@@ -24123,8 +23840,8 @@ else
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -15645,7 +21676,7 @@
fi
if test "$no_x" = yes; then
-@@ -24088,8 +23828,8 @@
+@@ -24145,8 +23862,8 @@ else
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
@@ -15656,7 +21687,7 @@
ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
ac_xsave_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
-@@ -24114,26 +23854,23 @@
+@@ -24171,26 +23888,23 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15690,7 +21721,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
LIBS="$ac_xsave_LIBS -R $x_libraries"
-@@ -24158,38 +23895,33 @@
+@@ -24215,38 +23929,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15738,7 +21769,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_c_werror_flag=$ac_xsave_c_werror_flag
-@@ -24235,30 +23967,27 @@
+@@ -24292,30 +24001,27 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15777,7 +21808,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet $LIBS"
-@@ -24290,45 +24019,41 @@
+@@ -24347,45 +24053,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15833,7 +21864,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet_stub $LIBS"
-@@ -24360,36 +24085,32 @@
+@@ -24417,36 +24119,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15877,7 +21908,7 @@
if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
fi
-@@ -24397,7 +24118,6 @@
+@@ -24454,7 +24152,6 @@ fi
fi
fi
@@ -15885,7 +21916,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
-@@ -24410,10 +24130,10 @@
+@@ -24467,10 +24164,10 @@ rm -f core conftest.err conftest.$ac_obj
# on Irix 5.2, according to T.E. Dickey.
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
@@ -15899,7 +21930,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -24466,41 +24186,37 @@
+@@ -24523,41 +24220,37 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15951,7 +21982,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnsl $LIBS"
-@@ -24532,45 +24248,41 @@
+@@ -24589,45 +24282,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16007,7 +22038,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbsd $LIBS"
-@@ -24602,36 +24314,32 @@
+@@ -24659,36 +24348,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16051,7 +22082,7 @@
if test $ac_cv_lib_bsd_gethostbyname = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
-@@ -24646,10 +24354,10 @@
+@@ -24703,10 +24388,10 @@ fi
# variants that don't use the name server (or something). -lsocket
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
@@ -16065,7 +22096,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -24702,41 +24410,37 @@
+@@ -24759,41 +24444,37 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16117,7 +22148,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-@@ -24768,36 +24472,32 @@
+@@ -24825,36 +24506,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16161,7 +22192,7 @@
if test $ac_cv_lib_socket_connect = yes; then
X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
fi
-@@ -24805,10 +24505,10 @@
+@@ -24862,10 +24539,10 @@ fi
fi
# Guillermo Gomez says -lposix is necessary on A/UX.
@@ -16175,7 +22206,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -24861,41 +24561,37 @@
+@@ -24918,41 +24595,37 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16227,7 +22258,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lposix $LIBS"
-@@ -24927,36 +24623,32 @@
+@@ -24984,36 +24657,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16271,7 +22302,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -24964,10 +24656,10 @@
+@@ -25021,10 +24690,10 @@ fi
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -16285,7 +22316,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25020,41 +24712,37 @@
+@@ -25077,41 +24746,37 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16337,7 +22368,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lipc $LIBS"
-@@ -25086,36 +24774,32 @@
+@@ -25143,36 +24808,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16381,7 +22412,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -25132,10 +24816,10 @@
+@@ -25189,10 +24850,10 @@ fi
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# John Interrante, Karl Berry
@@ -16395,7 +22426,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-@@ -25167,36 +24851,32 @@
+@@ -25224,36 +24885,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16439,7 +22470,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -25207,10 +24887,10 @@
+@@ -25264,10 +24921,10 @@ fi
x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
@@ -16453,7 +22484,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25263,35 +24943,31 @@
+@@ -25320,35 +24977,31 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16496,7 +22527,7 @@
if test $ac_cv_func_XScreenSaverQueryInfo = yes; then
TYPING_BREAK="typing-break"
-@@ -25299,10 +24975,10 @@
+@@ -25356,10 +25009,10 @@ else
save_LIBS=$LIBS
LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lXss -lXext -lX11"
@@ -16510,7 +22541,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXss $LIBS"
-@@ -25334,36 +25010,32 @@
+@@ -25391,36 +25044,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16554,7 +22585,7 @@
if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then
TYPING_BREAK="typing-break"
-@@ -25372,10 +25044,10 @@
+@@ -25429,10 +25078,10 @@ else
LIBS=$save_LIBS
LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lXext -lX11"
@@ -16568,7 +22599,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXext $LIBS"
-@@ -25407,36 +25079,32 @@
+@@ -25464,36 +25113,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16612,7 +22643,7 @@
if test $ac_cv_lib_Xext_XScreenSaverQueryInfo = yes; then
TYPING_BREAK="typing-break"
-@@ -25456,21 +25124,20 @@
+@@ -25522,21 +25167,20 @@ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
for ac_header in X11/Xlib.h
do
@@ -16643,7 +22674,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25486,33 +25153,32 @@
+@@ -25552,33 +25196,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16684,7 +22715,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25526,52 +25192,51 @@
+@@ -25592,52 +25235,51 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16758,7 +22789,7 @@
( cat <<\_ASBOX
## ----------------------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center ##
-@@ -25580,33 +25245,31 @@
+@@ -25646,33 +25288,31 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -16803,7 +22834,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXxf86misc $LIBS"
-@@ -25638,46 +25301,42 @@
+@@ -25704,46 +25344,42 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16861,7 +22892,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25698,21 +25357,20 @@
+@@ -25764,21 +25400,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16886,7 +22917,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
-@@ -25720,14 +25378,12 @@
+@@ -25786,14 +25421,12 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -16906,7 +22937,7 @@
_ACEOF
XF86MISC_LIBS="-lXxf86misc"
fi
-@@ -25740,21 +25396,20 @@
+@@ -25806,21 +25439,20 @@ fi
for ac_header in X11/extensions/XKB.h
do
@@ -16937,7 +22968,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25770,33 +25425,32 @@
+@@ -25836,33 +25468,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16978,7 +23009,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25810,52 +25464,51 @@
+@@ -25876,52 +25507,51 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17052,7 +23083,7 @@
( cat <<\_ASBOX
## ----------------------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center ##
-@@ -25864,23 +25517,21 @@
+@@ -25930,23 +25560,21 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -17084,7 +23115,7 @@
_ACEOF
fi
-@@ -25890,142 +25541,21 @@
+@@ -25956,53 +25584,47 @@ done
CPPFLAGS=$savecppflags
@@ -17098,47 +23129,334 @@
-fi
-
-
- COMMON_MODULES="gtk+-2.0 >= 2.11.6 gio-2.0 gconf-2.0 libgnomeui-2.0 >= 2.2.0 libglade-2.0 >= 2.0.0 libbonobo-2.0 libbonoboui-2.0 gnome-desktop-2.0 >= 2.21.4"
+ COMMON_MODULES="gtk+-2.0 >= 2.11.6 glib-2.0 >= 2.17.4 gio-2.0 gconf-2.0 libgnomeui-2.0 >= 2.2.0 libglade-2.0 >= 2.0.0 gnome-desktop-2.0 >= 2.23.90"
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for LIBSLAB" >&5
-$as_echo_n "checking for LIBSLAB... " >&6; }
--
--if test -n "$PKG_CONFIG"; then
-- if test -n "$LIBSLAB_CFLAGS"; then
-- pkg_cv_LIBSLAB_CFLAGS="$LIBSLAB_CFLAGS"
-- else
-- if test -n "$PKG_CONFIG" && \
++{ echo "$as_me:$LINENO: checking for CAPPLET" >&5
++echo $ECHO_N "checking for CAPPLET... $ECHO_C" >&6; }
+
+-if test -n "$LIBSLAB_CFLAGS"; then
+- pkg_cv_LIBSLAB_CFLAGS="$LIBSLAB_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0") 2>&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$CAPPLET_CFLAGS"; then
++ pkg_cv_CAPPLET_CFLAGS="$CAPPLET_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
++ ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_LIBSLAB_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0" 2>/dev/null`
++ pkg_cv_CAPPLET_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LIBSLAB_LIBS"; then
+- pkg_cv_LIBSLAB_LIBS="$LIBSLAB_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0") 2>&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$CAPPLET_LIBS"; then
++ pkg_cv_CAPPLET_LIBS="$CAPPLET_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
++ ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_LIBSLAB_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0" 2>/dev/null`
++ pkg_cv_CAPPLET_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -26015,101 +25637,105 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBSLAB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0" 2>&1`
++ CAPPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$COMMON_MODULES"`
+ else
+- LIBSLAB_PKG_ERRORS=`$PKG_CONFIG --print-errors "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0" 2>&1`
++ CAPPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$COMMON_MODULES"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+- echo "$LIBSLAB_PKG_ERRORS" >&5
++ echo "$CAPPLET_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES) were not met:
+
+-$LIBSLAB_PKG_ERRORS
++$CAPPLET_PKG_ERRORS
+
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-Alternatively, you may set the environment variables LIBSLAB_CFLAGS
+-and LIBSLAB_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables CAPPLET_CFLAGS
++and CAPPLET_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-$as_echo "$as_me: error: Package requirements ($COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0) were not met:
++echo "$as_me: error: Package requirements ($COMMON_MODULES) were not met:
+
+-$LIBSLAB_PKG_ERRORS
++$CAPPLET_PKG_ERRORS
+
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-Alternatively, you may set the environment variables LIBSLAB_CFLAGS
+-and LIBSLAB_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables CAPPLET_CFLAGS
++and CAPPLET_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&2;}
+ { (exit 1); exit 1; }; }
+ elif test $pkg_failed = untried; then
+- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+-Alternatively, you may set the environment variables LIBSLAB_CFLAGS
+-and LIBSLAB_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables CAPPLET_CFLAGS
++and CAPPLET_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+-Alternatively, you may set the environment variables LIBSLAB_CFLAGS
+-and LIBSLAB_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables CAPPLET_CFLAGS
++and CAPPLET_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+- LIBSLAB_CFLAGS=$pkg_cv_LIBSLAB_CFLAGS
+- LIBSLAB_LIBS=$pkg_cv_LIBSLAB_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ CAPPLET_CFLAGS=$pkg_cv_CAPPLET_CFLAGS
++ CAPPLET_LIBS=$pkg_cv_CAPPLET_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ fi
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for CAPPLET" >&5
+-$as_echo_n "checking for CAPPLET... " >&6; }
++{ echo "$as_me:$LINENO: checking for GNOMECC" >&5
++echo $ECHO_N "checking for GNOMECC... $ECHO_C" >&6; }
+
+-if test -n "$CAPPLET_CFLAGS"; then
+- pkg_cv_CAPPLET_CFLAGS="$CAPPLET_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
+- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 2>&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GNOMECC_CFLAGS"; then
++ pkg_cv_GNOMECC_CFLAGS="$GNOMECC_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_CAPPLET_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES" 2>/dev/null`
++ pkg_cv_GNOMECC_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$CAPPLET_LIBS"; then
+- pkg_cv_CAPPLET_LIBS="$CAPPLET_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
+- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 2>&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GNOMECC_LIBS"; then
++ pkg_cv_GNOMECC_LIBS="$GNOMECC_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_CAPPLET_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES" 2>/dev/null`
++ pkg_cv_GNOMECC_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -26122,155 +25748,48 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- CAPPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$COMMON_MODULES" 2>&1`
++ GNOMECC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0"`
+ else
+- CAPPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "$COMMON_MODULES" 2>&1`
++ GNOMECC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+- echo "$CAPPLET_PKG_ERRORS" >&5
++ echo "$GNOMECC_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0) were not met:
+
+-$CAPPLET_PKG_ERRORS
++$GNOMECC_PKG_ERRORS
+
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-Alternatively, you may set the environment variables CAPPLET_CFLAGS
+-and CAPPLET_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables GNOMECC_CFLAGS
++and GNOMECC_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-$as_echo "$as_me: error: Package requirements ($COMMON_MODULES) were not met:
++echo "$as_me: error: Package requirements ($COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0) were not met:
+
+-$CAPPLET_PKG_ERRORS
++$GNOMECC_PKG_ERRORS
+
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-Alternatively, you may set the environment variables CAPPLET_CFLAGS
+-and CAPPLET_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables GNOMECC_CFLAGS
++and GNOMECC_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&2;}
+ { (exit 1); exit 1; }; }
+ elif test $pkg_failed = untried; then
+- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+-Alternatively, you may set the environment variables CAPPLET_CFLAGS
+-and CAPPLET_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables GNOMECC_CFLAGS
++and GNOMECC_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables CAPPLET_CFLAGS
+-and CAPPLET_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-else
+- CAPPLET_CFLAGS=$pkg_cv_CAPPLET_CFLAGS
+- CAPPLET_LIBS=$pkg_cv_CAPPLET_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- :
+-fi
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for GNOMECC" >&5
+-$as_echo_n "checking for GNOMECC... " >&6; }
+-
+-if test -n "$GNOMECC_CFLAGS"; then
+- pkg_cv_GNOMECC_CFLAGS="$GNOMECC_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_LIBSLAB_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0" 2>/dev/null`
+- pkg_cv_GNOMECC_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
-- fi
--else
-- pkg_failed=untried
+- else
+- pkg_failed=untried
-fi
--if test -n "$PKG_CONFIG"; then
-- if test -n "$LIBSLAB_LIBS"; then
-- pkg_cv_LIBSLAB_LIBS="$LIBSLAB_LIBS"
-- else
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0\"") >&5
-- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0") 2>&5
+-if test -n "$GNOMECC_LIBS"; then
+- pkg_cv_GNOMECC_LIBS="$GNOMECC_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_LIBSLAB_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0" 2>/dev/null`
+- pkg_cv_GNOMECC_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
-- fi
--else
-- pkg_failed=untried
+- else
+- pkg_failed=untried
-fi
-
-
@@ -17151,33 +23469,33 @@
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
-- LIBSLAB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0"`
+- GNOMECC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0" 2>&1`
- else
-- LIBSLAB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0"`
+- GNOMECC_PKG_ERRORS=`$PKG_CONFIG --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
-- echo "$LIBSLAB_PKG_ERRORS" >&5
+- echo "$GNOMECC_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0) were not met:
+- { { $as_echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0) were not met:
-
--$LIBSLAB_PKG_ERRORS
+-$GNOMECC_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
--Alternatively, you may set the environment variables LIBSLAB_CFLAGS
--and LIBSLAB_LIBS to avoid the need to call pkg-config.
+-Alternatively, you may set the environment variables GNOMECC_CFLAGS
+-and GNOMECC_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
--$as_echo "$as_me: error: Package requirements ($COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0) were not met:
+-$as_echo "$as_me: error: Package requirements ($COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0) were not met:
-
--$LIBSLAB_PKG_ERRORS
+-$GNOMECC_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
--Alternatively, you may set the environment variables LIBSLAB_CFLAGS
--and LIBSLAB_LIBS to avoid the need to call pkg-config.
+-Alternatively, you may set the environment variables GNOMECC_CFLAGS
+-and GNOMECC_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
@@ -17186,83 +23504,116 @@
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
--Alternatively, you may set the environment variables LIBSLAB_CFLAGS
--and LIBSLAB_LIBS to avoid the need to call pkg-config.
+-Alternatively, you may set the environment variables GNOMECC_CFLAGS
+-and GNOMECC_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables LIBSLAB_CFLAGS
--and LIBSLAB_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
--else
-- LIBSLAB_CFLAGS=$pkg_cv_LIBSLAB_CFLAGS
-- LIBSLAB_LIBS=$pkg_cv_LIBSLAB_LIBS
++echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -26284,46 +25803,50 @@ See \`config.log' for more details." >&2
+ else
+ GNOMECC_CFLAGS=$pkg_cv_GNOMECC_CFLAGS
+ GNOMECC_LIBS=$pkg_cv_GNOMECC_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-- :
--fi
--
--pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for CAPPLET" >&5
--$as_echo_n "checking for CAPPLET... " >&6; }
-+{ echo "$as_me:$LINENO: checking for CAPPLET" >&5
-+echo $ECHO_N "checking for CAPPLET... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$CAPPLET_CFLAGS"; then
- pkg_cv_CAPPLET_CFLAGS="$CAPPLET_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 2>&5
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ fi
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for GNOME" >&5
+-$as_echo_n "checking for GNOME... " >&6; }
++{ echo "$as_me:$LINENO: checking for GNOME" >&5
++echo $ECHO_N "checking for GNOME... $ECHO_C" >&6; }
+
+-if test -n "$GNOME_CFLAGS"; then
+- pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GNOME_CFLAGS"; then
++ pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_CAPPLET_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES" 2>/dev/null`
- else
-@@ -26040,10 +25570,10 @@
- pkg_cv_CAPPLET_LIBS="$CAPPLET_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 2>&5
+ pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$GNOME_LIBS"; then
+- pkg_cv_GNOME_LIBS="$GNOME_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GNOME_LIBS"; then
++ pkg_cv_GNOME_LIBS="$GNOME_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_CAPPLET_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES" 2>/dev/null`
- else
-@@ -26071,7 +25601,7 @@
+ pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -26336,14 +25859,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgnomeui-2.0" 2>&1`
++ GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomeui-2.0"`
+ else
+- GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgnomeui-2.0" 2>&1`
++ GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeui-2.0"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$CAPPLET_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES) were not met:
-
- $CAPPLET_PKG_ERRORS
-
-@@ -26082,7 +25612,7 @@
- and CAPPLET_LIBS to avoid the need to call pkg-config.
+ echo "$GNOME_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (libgnomeui-2.0) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (libgnomeui-2.0) were not met:
+
+ $GNOME_PKG_ERRORS
+
+@@ -26354,7 +25877,7 @@ Alternatively, you may set the environme
+ and GNOME_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
--$as_echo "$as_me: error: Package requirements ($COMMON_MODULES) were not met:
-+echo "$as_me: error: Package requirements ($COMMON_MODULES) were not met:
-
- $CAPPLET_PKG_ERRORS
-
-@@ -26095,7 +25625,7 @@
+-$as_echo "$as_me: error: Package requirements (libgnomeui-2.0) were not met:
++echo "$as_me: error: Package requirements (libgnomeui-2.0) were not met:
+
+ $GNOME_PKG_ERRORS
+
+@@ -26367,7 +25890,7 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -17271,29 +23622,19 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -26103,9 +25633,9 @@
- and CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+@@ -26377,7 +25900,7 @@ See the pkg-config man page for more det
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -26113,30 +25643,30 @@
- and CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- CAPPLET_CFLAGS=$pkg_cv_CAPPLET_CFLAGS
- CAPPLET_LIBS=$pkg_cv_CAPPLET_LIBS
+@@ -26391,46 +25914,50 @@ See \`config.log' for more details." >&2
+ else
+ GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS
+ GNOME_LIBS=$pkg_cv_GNOME_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
@@ -17302,57 +23643,93 @@
fi
pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for GNOMECC" >&5
--$as_echo_n "checking for GNOMECC... " >&6; }
-+{ echo "$as_me:$LINENO: checking for GNOMECC" >&5
-+echo $ECHO_N "checking for GNOMECC... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$GNOMECC_CFLAGS"; then
- pkg_cv_GNOMECC_CFLAGS="$GNOMECC_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0") 2>&5
+-{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5
+-$as_echo_n "checking for DBUS... " >&6; }
++{ echo "$as_me:$LINENO: checking for DBUS" >&5
++echo $ECHO_N "checking for DBUS... $ECHO_C" >&6; }
+
+-if test -n "$DBUS_CFLAGS"; then
+- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 dbus-glib-1\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DBUS_CFLAGS"; then
++ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 dbus-glib-1\"") >&5
+ ($PKG_CONFIG --exists --print-errors "dbus-1 dbus-glib-1") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GNOMECC_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0" 2>/dev/null`
- else
-@@ -26151,10 +25681,10 @@
- pkg_cv_GNOMECC_LIBS="$GNOMECC_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0") 2>&5
+ pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 dbus-glib-1" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$DBUS_LIBS"; then
+- pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 dbus-glib-1\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DBUS_LIBS"; then
++ pkg_cv_DBUS_LIBS="$DBUS_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 dbus-glib-1\"") >&5
+ ($PKG_CONFIG --exists --print-errors "dbus-1 dbus-glib-1") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GNOMECC_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0" 2>/dev/null`
- else
-@@ -26182,7 +25712,7 @@
+ pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 dbus-glib-1" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -26443,14 +25970,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 dbus-glib-1" 2>&1`
++ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1 dbus-glib-1"`
+ else
+- DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 dbus-glib-1" 2>&1`
++ DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 dbus-glib-1"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$GNOMECC_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0) were not met:
-
- $GNOMECC_PKG_ERRORS
-
-@@ -26193,7 +25723,7 @@
- and GNOMECC_LIBS to avoid the need to call pkg-config.
+ echo "$DBUS_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-1 dbus-glib-1) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (dbus-1 dbus-glib-1) were not met:
+
+ $DBUS_PKG_ERRORS
+
+@@ -26461,7 +25988,7 @@ Alternatively, you may set the environme
+ and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
--$as_echo "$as_me: error: Package requirements ($COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0) were not met:
-+echo "$as_me: error: Package requirements ($COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0) were not met:
-
- $GNOMECC_PKG_ERRORS
-
-@@ -26206,7 +25736,7 @@
+-$as_echo "$as_me: error: Package requirements (dbus-1 dbus-glib-1) were not met:
++echo "$as_me: error: Package requirements (dbus-1 dbus-glib-1) were not met:
+
+ $DBUS_PKG_ERRORS
+
+@@ -26474,7 +26001,7 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -17361,29 +23738,19 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -26214,9 +25744,9 @@
- and GNOMECC_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+@@ -26484,7 +26011,7 @@ See the pkg-config man page for more det
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -26224,30 +25754,30 @@
- and GNOMECC_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- GNOMECC_CFLAGS=$pkg_cv_GNOMECC_CFLAGS
- GNOMECC_LIBS=$pkg_cv_GNOMECC_LIBS
+@@ -26498,46 +26025,50 @@ See \`config.log' for more details." >&2
+ else
+ DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
+ DBUS_LIBS=$pkg_cv_DBUS_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
@@ -17392,57 +23759,93 @@
fi
pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for GNOME" >&5
--$as_echo_n "checking for GNOME... " >&6; }
-+{ echo "$as_me:$LINENO: checking for GNOME" >&5
-+echo $ECHO_N "checking for GNOME... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$GNOME_CFLAGS"; then
- pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0") 2>&5
+-{ $as_echo "$as_me:$LINENO: checking for GNOME_DESKTOP" >&5
+-$as_echo_n "checking for GNOME_DESKTOP... " >&6; }
++{ echo "$as_me:$LINENO: checking for GNOME_DESKTOP" >&5
++echo $ECHO_N "checking for GNOME_DESKTOP... $ECHO_C" >&6; }
+
+-if test -n "$GNOME_DESKTOP_CFLAGS"; then
+- pkg_cv_GNOME_DESKTOP_CFLAGS="$GNOME_DESKTOP_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GNOME_DESKTOP_CFLAGS"; then
++ pkg_cv_GNOME_DESKTOP_CFLAGS="$GNOME_DESKTOP_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0" 2>/dev/null`
- else
-@@ -26262,10 +25792,10 @@
- pkg_cv_GNOME_LIBS="$GNOME_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0") 2>&5
+ pkg_cv_GNOME_DESKTOP_CFLAGS=`$PKG_CONFIG --cflags "gnome-desktop-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$GNOME_DESKTOP_LIBS"; then
+- pkg_cv_GNOME_DESKTOP_LIBS="$GNOME_DESKTOP_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GNOME_DESKTOP_LIBS"; then
++ pkg_cv_GNOME_DESKTOP_LIBS="$GNOME_DESKTOP_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0" 2>/dev/null`
- else
-@@ -26293,7 +25823,7 @@
+ pkg_cv_GNOME_DESKTOP_LIBS=`$PKG_CONFIG --libs "gnome-desktop-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -26550,14 +26081,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GNOME_DESKTOP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-desktop-2.0" 2>&1`
++ GNOME_DESKTOP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-desktop-2.0"`
+ else
+- GNOME_DESKTOP_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-desktop-2.0" 2>&1`
++ GNOME_DESKTOP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-desktop-2.0"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$GNOME_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (libgnomeui-2.0) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (libgnomeui-2.0) were not met:
-
- $GNOME_PKG_ERRORS
-
-@@ -26304,7 +25834,7 @@
- and GNOME_LIBS to avoid the need to call pkg-config.
+ echo "$GNOME_DESKTOP_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-desktop-2.0) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (gnome-desktop-2.0) were not met:
+
+ $GNOME_DESKTOP_PKG_ERRORS
+
+@@ -26568,7 +26099,7 @@ Alternatively, you may set the environme
+ and GNOME_DESKTOP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
--$as_echo "$as_me: error: Package requirements (libgnomeui-2.0) were not met:
-+echo "$as_me: error: Package requirements (libgnomeui-2.0) were not met:
-
- $GNOME_PKG_ERRORS
-
-@@ -26317,7 +25847,7 @@
+-$as_echo "$as_me: error: Package requirements (gnome-desktop-2.0) were not met:
++echo "$as_me: error: Package requirements (gnome-desktop-2.0) were not met:
+
+ $GNOME_DESKTOP_PKG_ERRORS
+
+@@ -26581,7 +26112,7 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -17451,29 +23854,19 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -26325,9 +25855,9 @@
- and GNOME_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+@@ -26591,7 +26122,7 @@ See the pkg-config man page for more det
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -26335,30 +25865,30 @@
- and GNOME_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS
- GNOME_LIBS=$pkg_cv_GNOME_LIBS
+@@ -26605,46 +26136,50 @@ See \`config.log' for more details." >&2
+ else
+ GNOME_DESKTOP_CFLAGS=$pkg_cv_GNOME_DESKTOP_CFLAGS
+ GNOME_DESKTOP_LIBS=$pkg_cv_GNOME_DESKTOP_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
@@ -17482,57 +23875,93 @@
fi
pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5
--$as_echo_n "checking for DBUS... " >&6; }
-+{ echo "$as_me:$LINENO: checking for DBUS" >&5
-+echo $ECHO_N "checking for DBUS... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$DBUS_CFLAGS"; then
- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 dbus-glib-1\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 dbus-glib-1\"") >&5
- ($PKG_CONFIG --exists --print-errors "dbus-1 dbus-glib-1") 2>&5
+-{ $as_echo "$as_me:$LINENO: checking for DEFAULT_APPLICATIONS_CAPPLET" >&5
+-$as_echo_n "checking for DEFAULT_APPLICATIONS_CAPPLET... " >&6; }
++{ echo "$as_me:$LINENO: checking for DEFAULT_APPLICATIONS_CAPPLET" >&5
++echo $ECHO_N "checking for DEFAULT_APPLICATIONS_CAPPLET... $ECHO_C" >&6; }
+
+-if test -n "$DEFAULT_APPLICATIONS_CAPPLET_CFLAGS"; then
+- pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_CFLAGS="$DEFAULT_APPLICATIONS_CAPPLET_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DEFAULT_APPLICATIONS_CAPPLET_CFLAGS"; then
++ pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_CFLAGS="$DEFAULT_APPLICATIONS_CAPPLET_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 dbus-glib-1" 2>/dev/null`
- else
-@@ -26373,10 +25903,10 @@
- pkg_cv_DBUS_LIBS="$DBUS_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 dbus-glib-1\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 dbus-glib-1\"") >&5
- ($PKG_CONFIG --exists --print-errors "dbus-1 dbus-glib-1") 2>&5
+ pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$DEFAULT_APPLICATIONS_CAPPLET_LIBS"; then
+- pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_LIBS="$DEFAULT_APPLICATIONS_CAPPLET_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DEFAULT_APPLICATIONS_CAPPLET_LIBS"; then
++ pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_LIBS="$DEFAULT_APPLICATIONS_CAPPLET_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 dbus-glib-1" 2>/dev/null`
- else
-@@ -26404,7 +25934,7 @@
+ pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -26657,14 +26192,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DEFAULT_APPLICATIONS_CAPPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0" 2>&1`
++ DEFAULT_APPLICATIONS_CAPPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0"`
+ else
+- DEFAULT_APPLICATIONS_CAPPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0" 2>&1`
++ DEFAULT_APPLICATIONS_CAPPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$DBUS_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-1 dbus-glib-1) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (dbus-1 dbus-glib-1) were not met:
-
- $DBUS_PKG_ERRORS
-
-@@ -26415,7 +25945,7 @@
- and DBUS_LIBS to avoid the need to call pkg-config.
+ echo "$DEFAULT_APPLICATIONS_CAPPLET_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (libxml-2.0) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (libxml-2.0) were not met:
+
+ $DEFAULT_APPLICATIONS_CAPPLET_PKG_ERRORS
+
+@@ -26675,7 +26210,7 @@ Alternatively, you may set the environme
+ and DEFAULT_APPLICATIONS_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
--$as_echo "$as_me: error: Package requirements (dbus-1 dbus-glib-1) were not met:
-+echo "$as_me: error: Package requirements (dbus-1 dbus-glib-1) were not met:
-
- $DBUS_PKG_ERRORS
-
-@@ -26428,7 +25958,7 @@
+-$as_echo "$as_me: error: Package requirements (libxml-2.0) were not met:
++echo "$as_me: error: Package requirements (libxml-2.0) were not met:
+
+ $DEFAULT_APPLICATIONS_CAPPLET_PKG_ERRORS
+
+@@ -26688,7 +26223,7 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -17541,29 +23970,19 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -26436,9 +25966,9 @@
- and DBUS_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+@@ -26698,7 +26233,7 @@ See the pkg-config man page for more det
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -26446,30 +25976,30 @@
- and DBUS_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
- DBUS_LIBS=$pkg_cv_DBUS_LIBS
+@@ -26712,46 +26247,50 @@ See \`config.log' for more details." >&2
+ else
+ DEFAULT_APPLICATIONS_CAPPLET_CFLAGS=$pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_CFLAGS
+ DEFAULT_APPLICATIONS_CAPPLET_LIBS=$pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
@@ -17572,57 +23991,93 @@
fi
pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for VFS_CAPPLET" >&5
--$as_echo_n "checking for VFS_CAPPLET... " >&6; }
-+{ echo "$as_me:$LINENO: checking for VFS_CAPPLET" >&5
-+echo $ECHO_N "checking for VFS_CAPPLET... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$VFS_CAPPLET_CFLAGS"; then
- pkg_cv_VFS_CAPPLET_CFLAGS="$VFS_CAPPLET_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.0") 2>&5
+-{ $as_echo "$as_me:$LINENO: checking for METACITY" >&5
+-$as_echo_n "checking for METACITY... " >&6; }
++{ echo "$as_me:$LINENO: checking for METACITY" >&5
++echo $ECHO_N "checking for METACITY... $ECHO_C" >&6; }
+
+-if test -n "$METACITY_CFLAGS"; then
+- pkg_cv_METACITY_CFLAGS="$METACITY_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.23.1\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$METACITY_CFLAGS"; then
++ pkg_cv_METACITY_CFLAGS="$METACITY_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.23.1\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libmetacity-private >= 2.23.1") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_VFS_CAPPLET_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.0" 2>/dev/null`
- else
-@@ -26484,10 +26014,10 @@
- pkg_cv_VFS_CAPPLET_LIBS="$VFS_CAPPLET_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.0") 2>&5
+ pkg_cv_METACITY_CFLAGS=`$PKG_CONFIG --cflags "libmetacity-private >= 2.23.1" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$METACITY_LIBS"; then
+- pkg_cv_METACITY_LIBS="$METACITY_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.23.1\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$METACITY_LIBS"; then
++ pkg_cv_METACITY_LIBS="$METACITY_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.23.1\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libmetacity-private >= 2.23.1") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_VFS_CAPPLET_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.0" 2>/dev/null`
- else
-@@ -26515,7 +26045,7 @@
+ pkg_cv_METACITY_LIBS=`$PKG_CONFIG --libs "libmetacity-private >= 2.23.1" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -26764,14 +26303,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- METACITY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libmetacity-private >= 2.23.1" 2>&1`
++ METACITY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmetacity-private >= 2.23.1"`
+ else
+- METACITY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libmetacity-private >= 2.23.1" 2>&1`
++ METACITY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmetacity-private >= 2.23.1"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$VFS_CAPPLET_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.0) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.0) were not met:
-
- $VFS_CAPPLET_PKG_ERRORS
-
-@@ -26526,7 +26056,7 @@
- and VFS_CAPPLET_LIBS to avoid the need to call pkg-config.
+ echo "$METACITY_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (libmetacity-private >= 2.23.1) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (libmetacity-private >= 2.23.1) were not met:
+
+ $METACITY_PKG_ERRORS
+
+@@ -26782,7 +26321,7 @@ Alternatively, you may set the environme
+ and METACITY_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
--$as_echo "$as_me: error: Package requirements ($COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.0) were not met:
-+echo "$as_me: error: Package requirements ($COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.0) were not met:
-
- $VFS_CAPPLET_PKG_ERRORS
-
-@@ -26539,7 +26069,7 @@
+-$as_echo "$as_me: error: Package requirements (libmetacity-private >= 2.23.1) were not met:
++echo "$as_me: error: Package requirements (libmetacity-private >= 2.23.1) were not met:
+
+ $METACITY_PKG_ERRORS
+
+@@ -26795,7 +26334,7 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -17631,296 +24086,16 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -26547,9 +26077,9 @@
- and VFS_CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+@@ -26805,7 +26344,7 @@ See the pkg-config man page for more det
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -26557,30 +26087,30 @@
- and VFS_CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- VFS_CAPPLET_CFLAGS=$pkg_cv_VFS_CAPPLET_CFLAGS
- VFS_CAPPLET_LIBS=$pkg_cv_VFS_CAPPLET_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- :
- fi
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for GNOME_DESKTOP" >&5
--$as_echo_n "checking for GNOME_DESKTOP... " >&6; }
-+{ echo "$as_me:$LINENO: checking for GNOME_DESKTOP" >&5
-+echo $ECHO_N "checking for GNOME_DESKTOP... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$GNOME_DESKTOP_CFLAGS"; then
- pkg_cv_GNOME_DESKTOP_CFLAGS="$GNOME_DESKTOP_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_GNOME_DESKTOP_CFLAGS=`$PKG_CONFIG --cflags "gnome-desktop-2.0" 2>/dev/null`
- else
-@@ -26595,10 +26125,10 @@
- pkg_cv_GNOME_DESKTOP_LIBS="$GNOME_DESKTOP_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_GNOME_DESKTOP_LIBS=`$PKG_CONFIG --libs "gnome-desktop-2.0" 2>/dev/null`
- else
-@@ -26626,7 +26156,7 @@
- # Put the nasty error message in config.log where it belongs
- echo "$GNOME_DESKTOP_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-desktop-2.0) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (gnome-desktop-2.0) were not met:
-
- $GNOME_DESKTOP_PKG_ERRORS
-
-@@ -26637,7 +26167,7 @@
- and GNOME_DESKTOP_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (gnome-desktop-2.0) were not met:
-+echo "$as_me: error: Package requirements (gnome-desktop-2.0) were not met:
-
- $GNOME_DESKTOP_PKG_ERRORS
-
-@@ -26650,7 +26180,7 @@
- " >&2;}
- { (exit 1); exit 1; }; }
- elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -26658,9 +26188,9 @@
- and GNOME_DESKTOP_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -26668,30 +26198,30 @@
- and GNOME_DESKTOP_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- GNOME_DESKTOP_CFLAGS=$pkg_cv_GNOME_DESKTOP_CFLAGS
- GNOME_DESKTOP_LIBS=$pkg_cv_GNOME_DESKTOP_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- :
- fi
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for DEFAULT_APPLICATIONS_CAPPLET" >&5
--$as_echo_n "checking for DEFAULT_APPLICATIONS_CAPPLET... " >&6; }
-+{ echo "$as_me:$LINENO: checking for DEFAULT_APPLICATIONS_CAPPLET" >&5
-+echo $ECHO_N "checking for DEFAULT_APPLICATIONS_CAPPLET... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$DEFAULT_APPLICATIONS_CAPPLET_CFLAGS"; then
- pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_CFLAGS="$DEFAULT_APPLICATIONS_CAPPLET_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
- else
-@@ -26706,10 +26236,10 @@
- pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_LIBS="$DEFAULT_APPLICATIONS_CAPPLET_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
- else
-@@ -26737,7 +26267,7 @@
- # Put the nasty error message in config.log where it belongs
- echo "$DEFAULT_APPLICATIONS_CAPPLET_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (libxml-2.0) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (libxml-2.0) were not met:
-
- $DEFAULT_APPLICATIONS_CAPPLET_PKG_ERRORS
-
-@@ -26748,7 +26278,7 @@
- and DEFAULT_APPLICATIONS_CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (libxml-2.0) were not met:
-+echo "$as_me: error: Package requirements (libxml-2.0) were not met:
-
- $DEFAULT_APPLICATIONS_CAPPLET_PKG_ERRORS
-
-@@ -26761,7 +26291,7 @@
- " >&2;}
- { (exit 1); exit 1; }; }
- elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -26769,9 +26299,9 @@
- and DEFAULT_APPLICATIONS_CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -26779,30 +26309,30 @@
- and DEFAULT_APPLICATIONS_CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- DEFAULT_APPLICATIONS_CAPPLET_CFLAGS=$pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_CFLAGS
- DEFAULT_APPLICATIONS_CAPPLET_LIBS=$pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- :
- fi
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for METACITY" >&5
--$as_echo_n "checking for METACITY... " >&6; }
-+{ echo "$as_me:$LINENO: checking for METACITY" >&5
-+echo $ECHO_N "checking for METACITY... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$METACITY_CFLAGS"; then
- pkg_cv_METACITY_CFLAGS="$METACITY_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.21.21\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.21.21\"") >&5
- ($PKG_CONFIG --exists --print-errors "libmetacity-private >= 2.21.21") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_METACITY_CFLAGS=`$PKG_CONFIG --cflags "libmetacity-private >= 2.21.21" 2>/dev/null`
- else
-@@ -26817,10 +26347,10 @@
- pkg_cv_METACITY_LIBS="$METACITY_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.21.21\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.21.21\"") >&5
- ($PKG_CONFIG --exists --print-errors "libmetacity-private >= 2.21.21") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_METACITY_LIBS=`$PKG_CONFIG --libs "libmetacity-private >= 2.21.21" 2>/dev/null`
- else
-@@ -26848,7 +26378,7 @@
- # Put the nasty error message in config.log where it belongs
- echo "$METACITY_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (libmetacity-private >= 2.21.21) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (libmetacity-private >= 2.21.21) were not met:
-
- $METACITY_PKG_ERRORS
-
-@@ -26859,7 +26389,7 @@
- and METACITY_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (libmetacity-private >= 2.21.21) were not met:
-+echo "$as_me: error: Package requirements (libmetacity-private >= 2.21.21) were not met:
-
- $METACITY_PKG_ERRORS
-
-@@ -26872,7 +26402,7 @@
- " >&2;}
- { (exit 1); exit 1; }; }
- elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -26880,9 +26410,9 @@
- and METACITY_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -26890,30 +26420,141 @@
- and METACITY_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+@@ -26819,46 +26358,161 @@ See \`config.log' for more details." >&2
else
METACITY_CFLAGS=$pkg_cv_METACITY_CFLAGS
METACITY_LIBS=$pkg_cv_METACITY_LIBS
@@ -17994,7 +24169,12 @@
+ { { echo "$as_me:$LINENO: error: Package requirements (libslab) were not met:
+
+$SLAB_PKG_ERRORS
-+
+
+-if test -n "$TYPING_CFLAGS"; then
+- pkg_cv_TYPING_CFLAGS="$TYPING_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 > 2.11 gconf-2.0 gtk+-2.0\"") >&5
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
@@ -18047,13 +24227,12 @@
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for TYPING" >&5
+echo $ECHO_N "checking for TYPING... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$TYPING_CFLAGS"; then
- pkg_cv_TYPING_CFLAGS="$TYPING_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 > 2.11 gconf-2.0 gtk+-2.0\"") >&5
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$TYPING_CFLAGS"; then
++ pkg_cv_TYPING_CFLAGS="$TYPING_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 > 2.11 gconf-2.0 gtk+-2.0\"") >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 > 2.11 gconf-2.0 gtk+-2.0") 2>&5
ac_status=$?
@@ -18062,11 +24241,24 @@
(exit $ac_status); }; then
pkg_cv_TYPING_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 > 2.11 gconf-2.0 gtk+-2.0" 2>/dev/null`
else
-@@ -26928,10 +26569,10 @@
- pkg_cv_TYPING_LIBS="$TYPING_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$TYPING_LIBS"; then
+- pkg_cv_TYPING_LIBS="$TYPING_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 > 2.11 gconf-2.0 gtk+-2.0\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$TYPING_LIBS"; then
++ pkg_cv_TYPING_LIBS="$TYPING_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 > 2.11 gconf-2.0 gtk+-2.0\"") >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 > 2.11 gconf-2.0 gtk+-2.0") 2>&5
ac_status=$?
@@ -18075,7 +24267,26 @@
(exit $ac_status); }; then
pkg_cv_TYPING_LIBS=`$PKG_CONFIG --libs "glib-2.0 > 2.11 gconf-2.0 gtk+-2.0" 2>/dev/null`
else
-@@ -26959,7 +26600,7 @@
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -26871,14 +26525,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- TYPING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 > 2.11 gconf-2.0 gtk+-2.0" 2>&1`
++ TYPING_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 > 2.11 gconf-2.0 gtk+-2.0"`
+ else
+- TYPING_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 > 2.11 gconf-2.0 gtk+-2.0" 2>&1`
++ TYPING_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 > 2.11 gconf-2.0 gtk+-2.0"`
+ fi
# Put the nasty error message in config.log where it belongs
echo "$TYPING_PKG_ERRORS" >&5
@@ -18084,7 +24295,7 @@
$TYPING_PKG_ERRORS
-@@ -26970,7 +26611,7 @@
+@@ -26889,7 +26543,7 @@ Alternatively, you may set the environme
and TYPING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -18093,7 +24304,7 @@
$TYPING_PKG_ERRORS
-@@ -26983,7 +26624,7 @@
+@@ -26902,7 +26556,7 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -18102,26 +24313,16 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -26991,9 +26632,9 @@
- and TYPING_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+@@ -26912,7 +26566,7 @@ See the pkg-config man page for more det
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -27001,30 +26642,30 @@
- and TYPING_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+@@ -26926,46 +26580,50 @@ See \`config.log' for more details." >&2
else
TYPING_CFLAGS=$pkg_cv_TYPING_CFLAGS
TYPING_LIBS=$pkg_cv_TYPING_LIBS
@@ -18133,57 +24334,93 @@
fi
pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for LIBBACKGROUND" >&5
--$as_echo_n "checking for LIBBACKGROUND... " >&6; }
-+{ echo "$as_me:$LINENO: checking for LIBBACKGROUND" >&5
-+echo $ECHO_N "checking for LIBBACKGROUND... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$LIBBACKGROUND_CFLAGS"; then
- pkg_cv_LIBBACKGROUND_CFLAGS="$LIBBACKGROUND_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gobject-2.0 gdk-2.0 gconf-2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gobject-2.0 gdk-2.0 gconf-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 gobject-2.0 gdk-2.0 gconf-2.0") 2>&5
+-{ $as_echo "$as_me:$LINENO: checking for GSD_DBUS" >&5
+-$as_echo_n "checking for GSD_DBUS... " >&6; }
++{ echo "$as_me:$LINENO: checking for GSD_DBUS" >&5
++echo $ECHO_N "checking for GSD_DBUS... $ECHO_C" >&6; }
+
+-if test -n "$GSD_DBUS_CFLAGS"; then
+- pkg_cv_GSD_DBUS_CFLAGS="$GSD_DBUS_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GSD_DBUS_CFLAGS"; then
++ pkg_cv_GSD_DBUS_CFLAGS="$GSD_DBUS_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-settings-daemon") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_LIBBACKGROUND_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 gobject-2.0 gdk-2.0 gconf-2.0" 2>/dev/null`
- else
-@@ -27039,10 +26680,10 @@
- pkg_cv_LIBBACKGROUND_LIBS="$LIBBACKGROUND_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gobject-2.0 gdk-2.0 gconf-2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gobject-2.0 gdk-2.0 gconf-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 gobject-2.0 gdk-2.0 gconf-2.0") 2>&5
+ pkg_cv_GSD_DBUS_CFLAGS=`$PKG_CONFIG --cflags "gnome-settings-daemon" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$GSD_DBUS_LIBS"; then
+- pkg_cv_GSD_DBUS_LIBS="$GSD_DBUS_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GSD_DBUS_LIBS"; then
++ pkg_cv_GSD_DBUS_LIBS="$GSD_DBUS_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-settings-daemon") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_LIBBACKGROUND_LIBS=`$PKG_CONFIG --libs "glib-2.0 gobject-2.0 gdk-2.0 gconf-2.0" 2>/dev/null`
- else
-@@ -27070,7 +26711,7 @@
+ pkg_cv_GSD_DBUS_LIBS=`$PKG_CONFIG --libs "gnome-settings-daemon" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -26978,14 +26636,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GSD_DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-settings-daemon" 2>&1`
++ GSD_DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-settings-daemon"`
+ else
+- GSD_DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-settings-daemon" 2>&1`
++ GSD_DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-settings-daemon"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$LIBBACKGROUND_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 gobject-2.0 gdk-2.0 gconf-2.0) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 gobject-2.0 gdk-2.0 gconf-2.0) were not met:
-
- $LIBBACKGROUND_PKG_ERRORS
-
-@@ -27081,7 +26722,7 @@
- and LIBBACKGROUND_LIBS to avoid the need to call pkg-config.
+ echo "$GSD_DBUS_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-settings-daemon) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (gnome-settings-daemon) were not met:
+
+ $GSD_DBUS_PKG_ERRORS
+
+@@ -26996,7 +26654,7 @@ Alternatively, you may set the environme
+ and GSD_DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
--$as_echo "$as_me: error: Package requirements (glib-2.0 gobject-2.0 gdk-2.0 gconf-2.0) were not met:
-+echo "$as_me: error: Package requirements (glib-2.0 gobject-2.0 gdk-2.0 gconf-2.0) were not met:
-
- $LIBBACKGROUND_PKG_ERRORS
-
-@@ -27094,7 +26735,7 @@
+-$as_echo "$as_me: error: Package requirements (gnome-settings-daemon) were not met:
++echo "$as_me: error: Package requirements (gnome-settings-daemon) were not met:
+
+ $GSD_DBUS_PKG_ERRORS
+
+@@ -27009,7 +26667,7 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -18192,29 +24429,19 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -27102,9 +26743,9 @@
- and LIBBACKGROUND_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+@@ -27019,7 +26677,7 @@ See the pkg-config man page for more det
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -27112,30 +26753,30 @@
- and LIBBACKGROUND_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- LIBBACKGROUND_CFLAGS=$pkg_cv_LIBBACKGROUND_CFLAGS
- LIBBACKGROUND_LIBS=$pkg_cv_LIBBACKGROUND_LIBS
+@@ -27033,46 +26691,50 @@ See \`config.log' for more details." >&2
+ else
+ GSD_DBUS_CFLAGS=$pkg_cv_GSD_DBUS_CFLAGS
+ GSD_DBUS_LIBS=$pkg_cv_GSD_DBUS_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
@@ -18223,57 +24450,93 @@
fi
pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for LIBSOUNDS" >&5
--$as_echo_n "checking for LIBSOUNDS... " >&6; }
-+{ echo "$as_me:$LINENO: checking for LIBSOUNDS" >&5
-+echo $ECHO_N "checking for LIBSOUNDS... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$LIBSOUNDS_CFLAGS"; then
- pkg_cv_LIBSOUNDS_CFLAGS="$LIBSOUNDS_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0 libgnome-2.0 libgnomeui-2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0 libgnome-2.0 libgnomeui-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gio-2.0 libgnome-2.0 libgnomeui-2.0") 2>&5
+-{ $as_echo "$as_me:$LINENO: checking for GIO" >&5
+-$as_echo_n "checking for GIO... " >&6; }
++{ echo "$as_me:$LINENO: checking for GIO" >&5
++echo $ECHO_N "checking for GIO... $ECHO_C" >&6; }
+
+-if test -n "$GIO_CFLAGS"; then
+- pkg_cv_GIO_CFLAGS="$GIO_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GIO_CFLAGS"; then
++ pkg_cv_GIO_CFLAGS="$GIO_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_LIBSOUNDS_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 libgnome-2.0 libgnomeui-2.0" 2>/dev/null`
- else
-@@ -27150,10 +26791,10 @@
- pkg_cv_LIBSOUNDS_LIBS="$LIBSOUNDS_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0 libgnome-2.0 libgnomeui-2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0 libgnome-2.0 libgnomeui-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gio-2.0 libgnome-2.0 libgnomeui-2.0") 2>&5
+ pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$GIO_LIBS"; then
+- pkg_cv_GIO_LIBS="$GIO_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GIO_LIBS"; then
++ pkg_cv_GIO_LIBS="$GIO_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_LIBSOUNDS_LIBS=`$PKG_CONFIG --libs "gio-2.0 libgnome-2.0 libgnomeui-2.0" 2>/dev/null`
- else
-@@ -27181,7 +26822,7 @@
+ pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -27085,14 +26747,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0" 2>&1`
++ GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gio-2.0"`
+ else
+- GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0" 2>&1`
++ GIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gio-2.0"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$LIBSOUNDS_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (gio-2.0 libgnome-2.0 libgnomeui-2.0) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (gio-2.0 libgnome-2.0 libgnomeui-2.0) were not met:
-
- $LIBSOUNDS_PKG_ERRORS
-
-@@ -27192,7 +26833,7 @@
- and LIBSOUNDS_LIBS to avoid the need to call pkg-config.
+ echo "$GIO_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (gio-2.0) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (gio-2.0) were not met:
+
+ $GIO_PKG_ERRORS
+
+@@ -27103,7 +26765,7 @@ Alternatively, you may set the environme
+ and GIO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
--$as_echo "$as_me: error: Package requirements (gio-2.0 libgnome-2.0 libgnomeui-2.0) were not met:
-+echo "$as_me: error: Package requirements (gio-2.0 libgnome-2.0 libgnomeui-2.0) were not met:
-
- $LIBSOUNDS_PKG_ERRORS
-
-@@ -27205,7 +26846,7 @@
+-$as_echo "$as_me: error: Package requirements (gio-2.0) were not met:
++echo "$as_me: error: Package requirements (gio-2.0) were not met:
+
+ $GIO_PKG_ERRORS
+
+@@ -27116,7 +26778,7 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -18282,29 +24545,19 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -27213,9 +26854,9 @@
- and LIBSOUNDS_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+@@ -27126,7 +26788,7 @@ See the pkg-config man page for more det
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -27223,30 +26864,30 @@
- and LIBSOUNDS_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- LIBSOUNDS_CFLAGS=$pkg_cv_LIBSOUNDS_CFLAGS
- LIBSOUNDS_LIBS=$pkg_cv_LIBSOUNDS_LIBS
+@@ -27140,8 +26802,8 @@ See \`config.log' for more details." >&2
+ else
+ GIO_CFLAGS=$pkg_cv_GIO_CFLAGS
+ GIO_LIBS=$pkg_cv_GIO_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
@@ -18312,58 +24565,105 @@
:
fi
+@@ -27155,47 +26817,51 @@ if $PKG_CONFIG --exists xft ; then
+ xft_modules="xft"
+
+ cat >>confdefs.h <<\_ACEOF
+-#define HAVE_XFT2 /**/
++#define HAVE_XFT2
+ _ACEOF
+
+ fi
+
+
pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for GSD_DBUS" >&5
--$as_echo_n "checking for GSD_DBUS... " >&6; }
-+{ echo "$as_me:$LINENO: checking for GSD_DBUS" >&5
-+echo $ECHO_N "checking for GSD_DBUS... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$GSD_DBUS_CFLAGS"; then
- pkg_cv_GSD_DBUS_CFLAGS="$GSD_DBUS_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon\"") >&5
- ($PKG_CONFIG --exists --print-errors "gnome-settings-daemon") 2>&5
+-{ $as_echo "$as_me:$LINENO: checking for FONT_CAPPLET" >&5
+-$as_echo_n "checking for FONT_CAPPLET... " >&6; }
++{ echo "$as_me:$LINENO: checking for FONT_CAPPLET" >&5
++echo $ECHO_N "checking for FONT_CAPPLET... $ECHO_C" >&6; }
+
+-if test -n "$FONT_CAPPLET_CFLAGS"; then
+- pkg_cv_FONT_CAPPLET_CFLAGS="$FONT_CAPPLET_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES \$xft_modules\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$FONT_CAPPLET_CFLAGS"; then
++ pkg_cv_FONT_CAPPLET_CFLAGS="$FONT_CAPPLET_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES \$xft_modules\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES $xft_modules") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GSD_DBUS_CFLAGS=`$PKG_CONFIG --cflags "gnome-settings-daemon" 2>/dev/null`
- else
-@@ -27261,10 +26902,10 @@
- pkg_cv_GSD_DBUS_LIBS="$GSD_DBUS_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon\"") >&5
- ($PKG_CONFIG --exists --print-errors "gnome-settings-daemon") 2>&5
+ pkg_cv_FONT_CAPPLET_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES $xft_modules" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$FONT_CAPPLET_LIBS"; then
+- pkg_cv_FONT_CAPPLET_LIBS="$FONT_CAPPLET_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES \$xft_modules\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$FONT_CAPPLET_LIBS"; then
++ pkg_cv_FONT_CAPPLET_LIBS="$FONT_CAPPLET_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES \$xft_modules\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES $xft_modules") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GSD_DBUS_LIBS=`$PKG_CONFIG --libs "gnome-settings-daemon" 2>/dev/null`
- else
-@@ -27292,7 +26933,7 @@
+ pkg_cv_FONT_CAPPLET_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES $xft_modules" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -27208,14 +26874,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- FONT_CAPPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$COMMON_MODULES $xft_modules" 2>&1`
++ FONT_CAPPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$COMMON_MODULES $xft_modules"`
+ else
+- FONT_CAPPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "$COMMON_MODULES $xft_modules" 2>&1`
++ FONT_CAPPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$COMMON_MODULES $xft_modules"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$GSD_DBUS_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-settings-daemon) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (gnome-settings-daemon) were not met:
-
- $GSD_DBUS_PKG_ERRORS
-
-@@ -27303,7 +26944,7 @@
- and GSD_DBUS_LIBS to avoid the need to call pkg-config.
+ echo "$FONT_CAPPLET_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES $xft_modules) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES $xft_modules) were not met:
+
+ $FONT_CAPPLET_PKG_ERRORS
+
+@@ -27226,7 +26892,7 @@ Alternatively, you may set the environme
+ and FONT_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
--$as_echo "$as_me: error: Package requirements (gnome-settings-daemon) were not met:
-+echo "$as_me: error: Package requirements (gnome-settings-daemon) were not met:
-
- $GSD_DBUS_PKG_ERRORS
-
-@@ -27316,7 +26957,7 @@
+-$as_echo "$as_me: error: Package requirements ($COMMON_MODULES $xft_modules) were not met:
++echo "$as_me: error: Package requirements ($COMMON_MODULES $xft_modules) were not met:
+
+ $FONT_CAPPLET_PKG_ERRORS
+
+@@ -27239,7 +26905,7 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -18372,29 +24672,19 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -27324,9 +26965,9 @@
- and GSD_DBUS_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+@@ -27249,7 +26915,7 @@ See the pkg-config man page for more det
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -27334,14 +26975,14 @@
- and GSD_DBUS_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- GSD_DBUS_CFLAGS=$pkg_cv_GSD_DBUS_CFLAGS
- GSD_DBUS_LIBS=$pkg_cv_GSD_DBUS_LIBS
+@@ -27263,47 +26929,51 @@ See \`config.log' for more details." >&2
+ else
+ FONT_CAPPLET_CFLAGS=$pkg_cv_FONT_CAPPLET_CFLAGS
+ FONT_CAPPLET_LIBS=$pkg_cv_FONT_CAPPLET_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
@@ -18402,69 +24692,95 @@
:
fi
-@@ -27350,25 +26991,25 @@
- xft_modules="xft"
-
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_XFT2 /**/
-+#define HAVE_XFT2
- _ACEOF
-
- fi
-
pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for FONT_CAPPLET" >&5
--$as_echo_n "checking for FONT_CAPPLET... " >&6; }
-+{ echo "$as_me:$LINENO: checking for FONT_CAPPLET" >&5
-+echo $ECHO_N "checking for FONT_CAPPLET... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$FONT_CAPPLET_CFLAGS"; then
- pkg_cv_FONT_CAPPLET_CFLAGS="$FONT_CAPPLET_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES \$xft_modules\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES \$xft_modules\"") >&5
- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES $xft_modules") 2>&5
+-{ $as_echo "$as_me:$LINENO: checking for AT_CAPPLET" >&5
+-$as_echo_n "checking for AT_CAPPLET... " >&6; }
++{ echo "$as_me:$LINENO: checking for AT_CAPPLET" >&5
++echo $ECHO_N "checking for AT_CAPPLET... $ECHO_C" >&6; }
+
+-if test -n "$AT_CAPPLET_CFLAGS"; then
+- pkg_cv_AT_CAPPLET_CFLAGS="$AT_CAPPLET_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$AT_CAPPLET_CFLAGS"; then
++ pkg_cv_AT_CAPPLET_CFLAGS="$AT_CAPPLET_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_FONT_CAPPLET_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES $xft_modules" 2>/dev/null`
- else
-@@ -27383,10 +27024,10 @@
- pkg_cv_FONT_CAPPLET_LIBS="$FONT_CAPPLET_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES \$xft_modules\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES \$xft_modules\"") >&5
- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES $xft_modules") 2>&5
+ pkg_cv_AT_CAPPLET_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$AT_CAPPLET_LIBS"; then
+- pkg_cv_AT_CAPPLET_LIBS="$AT_CAPPLET_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$AT_CAPPLET_LIBS"; then
++ pkg_cv_AT_CAPPLET_LIBS="$AT_CAPPLET_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_FONT_CAPPLET_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES $xft_modules" 2>/dev/null`
- else
-@@ -27414,7 +27055,7 @@
+ pkg_cv_AT_CAPPLET_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -27316,14 +26986,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- AT_CAPPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$COMMON_MODULES" 2>&1`
++ AT_CAPPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$COMMON_MODULES"`
+ else
+- AT_CAPPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "$COMMON_MODULES" 2>&1`
++ AT_CAPPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$COMMON_MODULES"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$FONT_CAPPLET_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES $xft_modules) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES $xft_modules) were not met:
-
- $FONT_CAPPLET_PKG_ERRORS
-
-@@ -27425,7 +27066,7 @@
- and FONT_CAPPLET_LIBS to avoid the need to call pkg-config.
+ echo "$AT_CAPPLET_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES) were not met:
+
+ $AT_CAPPLET_PKG_ERRORS
+
+@@ -27334,7 +27004,7 @@ Alternatively, you may set the environme
+ and AT_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
--$as_echo "$as_me: error: Package requirements ($COMMON_MODULES $xft_modules) were not met:
-+echo "$as_me: error: Package requirements ($COMMON_MODULES $xft_modules) were not met:
-
- $FONT_CAPPLET_PKG_ERRORS
-
-@@ -27438,7 +27079,7 @@
+-$as_echo "$as_me: error: Package requirements ($COMMON_MODULES) were not met:
++echo "$as_me: error: Package requirements ($COMMON_MODULES) were not met:
+
+ $AT_CAPPLET_PKG_ERRORS
+
+@@ -27347,7 +27017,7 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -18473,117 +24789,16 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -27446,9 +27087,9 @@
- and FONT_CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+@@ -27357,7 +27027,7 @@ See the pkg-config man page for more det
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -27456,31 +27097,31 @@
- and FONT_CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- FONT_CAPPLET_CFLAGS=$pkg_cv_FONT_CAPPLET_CFLAGS
- FONT_CAPPLET_LIBS=$pkg_cv_FONT_CAPPLET_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- :
- fi
-
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for AT_CAPPLET" >&5
--$as_echo_n "checking for AT_CAPPLET... " >&6; }
-+{ echo "$as_me:$LINENO: checking for AT_CAPPLET" >&5
-+echo $ECHO_N "checking for AT_CAPPLET... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$AT_CAPPLET_CFLAGS"; then
- pkg_cv_AT_CAPPLET_CFLAGS="$AT_CAPPLET_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_AT_CAPPLET_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES" 2>/dev/null`
- else
-@@ -27495,10 +27136,10 @@
- pkg_cv_AT_CAPPLET_LIBS="$AT_CAPPLET_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_AT_CAPPLET_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES" 2>/dev/null`
- else
-@@ -27526,7 +27167,7 @@
- # Put the nasty error message in config.log where it belongs
- echo "$AT_CAPPLET_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES) were not met:
-
- $AT_CAPPLET_PKG_ERRORS
-
-@@ -27537,7 +27178,7 @@
- and AT_CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements ($COMMON_MODULES) were not met:
-+echo "$as_me: error: Package requirements ($COMMON_MODULES) were not met:
-
- $AT_CAPPLET_PKG_ERRORS
-
-@@ -27550,7 +27191,7 @@
- " >&2;}
- { (exit 1); exit 1; }; }
- elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -27558,9 +27199,9 @@
- and AT_CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -27568,23 +27209,23 @@
- and AT_CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+@@ -27371,17 +27041,17 @@ See \`config.log' for more details." >&2
else
AT_CAPPLET_CFLAGS=$pkg_cv_AT_CAPPLET_CFLAGS
AT_CAPPLET_LIBS=$pkg_cv_AT_CAPPLET_LIBS
@@ -18606,7 +24821,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXrandr -lXrandr -lXrender $x_libs $LIBS"
-@@ -27616,41 +27257,37 @@
+@@ -27413,41 +27083,37 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18658,7 +24873,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27668,21 +27305,20 @@
+@@ -27465,21 +27131,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18683,7 +24898,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_X11_extensions_Xrandr_h=no
-@@ -27690,8 +27326,8 @@
+@@ -27487,8 +27152,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -18694,7 +24909,7 @@
if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then
have_randr=yes
RANDR_LIBS="-lXrandr -lXrender"
-@@ -27720,18 +27356,18 @@
+@@ -27517,40 +27182,44 @@ fi
pkg_failed=no
@@ -18703,12 +24918,16 @@
+{ echo "$as_me:$LINENO: checking for DISPLAY_CAPPLET" >&5
+echo $ECHO_N "checking for DISPLAY_CAPPLET... $ECHO_C" >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$DISPLAY_CAPPLET_CFLAGS"; then
- pkg_cv_DISPLAY_CAPPLET_CFLAGS="$DISPLAY_CAPPLET_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+-if test -n "$DISPLAY_CAPPLET_CFLAGS"; then
+- pkg_cv_DISPLAY_CAPPLET_CFLAGS="$DISPLAY_CAPPLET_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DISPLAY_CAPPLET_CFLAGS"; then
++ pkg_cv_DISPLAY_CAPPLET_CFLAGS="$DISPLAY_CAPPLET_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 2>&5
ac_status=$?
@@ -18717,11 +24936,24 @@
(exit $ac_status); }; then
pkg_cv_DISPLAY_CAPPLET_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES" 2>/dev/null`
else
-@@ -27746,10 +27382,10 @@
- pkg_cv_DISPLAY_CAPPLET_LIBS="$DISPLAY_CAPPLET_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$DISPLAY_CAPPLET_LIBS"; then
+- pkg_cv_DISPLAY_CAPPLET_LIBS="$DISPLAY_CAPPLET_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DISPLAY_CAPPLET_LIBS"; then
++ pkg_cv_DISPLAY_CAPPLET_LIBS="$DISPLAY_CAPPLET_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 2>&5
ac_status=$?
@@ -18730,7 +24962,26 @@
(exit $ac_status); }; then
pkg_cv_DISPLAY_CAPPLET_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES" 2>/dev/null`
else
-@@ -27777,7 +27413,7 @@
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -27563,14 +27232,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DISPLAY_CAPPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$COMMON_MODULES" 2>&1`
++ DISPLAY_CAPPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$COMMON_MODULES"`
+ else
+- DISPLAY_CAPPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "$COMMON_MODULES" 2>&1`
++ DISPLAY_CAPPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$COMMON_MODULES"`
+ fi
# Put the nasty error message in config.log where it belongs
echo "$DISPLAY_CAPPLET_PKG_ERRORS" >&5
@@ -18739,7 +24990,7 @@
$DISPLAY_CAPPLET_PKG_ERRORS
-@@ -27788,7 +27424,7 @@
+@@ -27581,7 +27250,7 @@ Alternatively, you may set the environme
and DISPLAY_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -18748,7 +24999,7 @@
$DISPLAY_CAPPLET_PKG_ERRORS
-@@ -27801,7 +27437,7 @@
+@@ -27594,7 +27263,7 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -18757,26 +25008,16 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -27809,9 +27445,9 @@
- and DISPLAY_CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+@@ -27604,7 +27273,7 @@ See the pkg-config man page for more det
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -27819,14 +27455,14 @@
- and DISPLAY_CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+@@ -27618,8 +27287,8 @@ See \`config.log' for more details." >&2
else
DISPLAY_CAPPLET_CFLAGS=$pkg_cv_DISPLAY_CAPPLET_CFLAGS
DISPLAY_CAPPLET_LIBS=$pkg_cv_DISPLAY_CAPPLET_LIBS
@@ -18787,7 +25028,7 @@
:
fi
-@@ -27838,22 +27474,22 @@
+@@ -27631,21 +27300,22 @@ GNOMECC_LIBS="$GNOMECC_LIBS $x_libs"
have_xcursor=no
pkg_failed=no
@@ -18796,12 +25037,16 @@
+{ echo "$as_me:$LINENO: checking for XCURSOR" >&5
+echo $ECHO_N "checking for XCURSOR... $ECHO_C" >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$XCURSOR_CFLAGS"; then
- pkg_cv_XCURSOR_CFLAGS="$XCURSOR_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+-if test -n "$XCURSOR_CFLAGS"; then
+- pkg_cv_XCURSOR_CFLAGS="$XCURSOR_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCURSOR_CFLAGS"; then
++ pkg_cv_XCURSOR_CFLAGS="$XCURSOR_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
xcursor
\"") >&5
@@ -18814,11 +25059,26 @@
(exit $ac_status); }; then
pkg_cv_XCURSOR_CFLAGS=`$PKG_CONFIG --cflags "
xcursor
-@@ -27870,14 +27506,14 @@
- pkg_cv_XCURSOR_LIBS="$XCURSOR_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+@@ -27653,21 +27323,23 @@ if test -n "$XCURSOR_CFLAGS"; then
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$XCURSOR_LIBS"; then
+- pkg_cv_XCURSOR_LIBS="$XCURSOR_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XCURSOR_LIBS"; then
++ pkg_cv_XCURSOR_LIBS="$XCURSOR_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
xcursor
\"") >&5
@@ -18831,7 +25091,34 @@
(exit $ac_status); }; then
pkg_cv_XCURSOR_LIBS=`$PKG_CONFIG --libs "
xcursor
-@@ -27911,16 +27547,16 @@
+@@ -27675,8 +27347,9 @@ if test -n "$XCURSOR_LIBS"; then
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -27689,27 +27362,27 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- XCURSOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
++ XCURSOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
+ xcursor
+- " 2>&1`
++ "`
+ else
+- XCURSOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "
++ XCURSOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+ xcursor
+- " 2>&1`
++ "`
+ fi
# Put the nasty error message in config.log where it belongs
echo "$XCURSOR_PKG_ERRORS" >&5
@@ -18852,7 +25139,7 @@
have_xcursor=yes
cat >>confdefs.h <<\_ACEOF
-@@ -27940,8 +27576,8 @@
+@@ -27729,8 +27402,8 @@ fi
if test x$have_xcursor = xyes; then
@@ -18863,7 +25150,7 @@
XCURSOR_ICONDIR=$($PKG_CONFIG --variable=icondir xcursor)
if test "x$XCURSOR_ICONDIR" != x; then
-@@ -27952,26 +27588,26 @@
+@@ -27741,48 +27414,52 @@ _ACEOF
else
XCURSOR_ICONDIR=none
fi
@@ -18882,52 +25169,88 @@
+{ echo "$as_me:$LINENO: checking for LIBGNOMEKBD" >&5
+echo $ECHO_N "checking for LIBGNOMEKBD... $ECHO_C" >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$LIBGNOMEKBD_CFLAGS"; then
- pkg_cv_LIBGNOMEKBD_CFLAGS="$LIBGNOMEKBD_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4.1 libxklavier >= 3.3\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4.1 libxklavier >= 3.3\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgnomekbd >= 2.21.4.1 libxklavier >= 3.3") 2>&5
+-if test -n "$LIBGNOMEKBD_CFLAGS"; then
+- pkg_cv_LIBGNOMEKBD_CFLAGS="$LIBGNOMEKBD_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4.1 libxklavier >= 3.6\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBGNOMEKBD_CFLAGS"; then
++ pkg_cv_LIBGNOMEKBD_CFLAGS="$LIBGNOMEKBD_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4.1 libxklavier >= 3.6\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgnomekbd >= 2.21.4.1 libxklavier >= 3.6") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_LIBGNOMEKBD_CFLAGS=`$PKG_CONFIG --cflags "libgnomekbd >= 2.21.4.1 libxklavier >= 3.3" 2>/dev/null`
- else
-@@ -27986,10 +27622,10 @@
- pkg_cv_LIBGNOMEKBD_LIBS="$LIBGNOMEKBD_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4.1 libxklavier >= 3.3\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4.1 libxklavier >= 3.3\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgnomekbd >= 2.21.4.1 libxklavier >= 3.3") 2>&5
+ pkg_cv_LIBGNOMEKBD_CFLAGS=`$PKG_CONFIG --cflags "libgnomekbd >= 2.21.4.1 libxklavier >= 3.6" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LIBGNOMEKBD_LIBS"; then
+- pkg_cv_LIBGNOMEKBD_LIBS="$LIBGNOMEKBD_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4.1 libxklavier >= 3.6\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBGNOMEKBD_LIBS"; then
++ pkg_cv_LIBGNOMEKBD_LIBS="$LIBGNOMEKBD_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4.1 libxklavier >= 3.6\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgnomekbd >= 2.21.4.1 libxklavier >= 3.6") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_LIBGNOMEKBD_LIBS=`$PKG_CONFIG --libs "libgnomekbd >= 2.21.4.1 libxklavier >= 3.3" 2>/dev/null`
- else
-@@ -28017,7 +27653,7 @@
+ pkg_cv_LIBGNOMEKBD_LIBS=`$PKG_CONFIG --libs "libgnomekbd >= 2.21.4.1 libxklavier >= 3.6" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -27795,14 +27472,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBGNOMEKBD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgnomekbd >= 2.21.4.1 libxklavier >= 3.6" 2>&1`
++ LIBGNOMEKBD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomekbd >= 2.21.4.1 libxklavier >= 3.6"`
+ else
+- LIBGNOMEKBD_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgnomekbd >= 2.21.4.1 libxklavier >= 3.6" 2>&1`
++ LIBGNOMEKBD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomekbd >= 2.21.4.1 libxklavier >= 3.6"`
+ fi
# Put the nasty error message in config.log where it belongs
echo "$LIBGNOMEKBD_PKG_ERRORS" >&5
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (libgnomekbd >= 2.21.4.1 libxklavier >= 3.3) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (libgnomekbd >= 2.21.4.1 libxklavier >= 3.3) were not met:
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (libgnomekbd >= 2.21.4.1 libxklavier >= 3.6) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (libgnomekbd >= 2.21.4.1 libxklavier >= 3.6) were not met:
$LIBGNOMEKBD_PKG_ERRORS
-@@ -28028,7 +27664,7 @@
+@@ -27813,7 +27490,7 @@ Alternatively, you may set the environme
and LIBGNOMEKBD_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
--$as_echo "$as_me: error: Package requirements (libgnomekbd >= 2.21.4.1 libxklavier >= 3.3) were not met:
-+echo "$as_me: error: Package requirements (libgnomekbd >= 2.21.4.1 libxklavier >= 3.3) were not met:
+-$as_echo "$as_me: error: Package requirements (libgnomekbd >= 2.21.4.1 libxklavier >= 3.6) were not met:
++echo "$as_me: error: Package requirements (libgnomekbd >= 2.21.4.1 libxklavier >= 3.6) were not met:
$LIBGNOMEKBD_PKG_ERRORS
-@@ -28041,7 +27677,7 @@
+@@ -27826,7 +27503,7 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -18936,26 +25259,16 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -28049,9 +27685,9 @@
- and LIBGNOMEKBD_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+@@ -27836,7 +27513,7 @@ See the pkg-config man page for more det
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -28059,14 +27695,14 @@
- and LIBGNOMEKBD_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+@@ -27850,8 +27527,8 @@ See \`config.log' for more details." >&2
else
LIBGNOMEKBD_CFLAGS=$pkg_cv_LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS=$pkg_cv_LIBGNOMEKBD_LIBS
@@ -18966,7 +25279,7 @@
:
fi
-@@ -28074,18 +27710,18 @@
+@@ -27859,40 +27536,44 @@ fi
pkg_failed=no
@@ -18975,12 +25288,16 @@
+{ echo "$as_me:$LINENO: checking for LIBGNOMEKBDUI" >&5
+echo $ECHO_N "checking for LIBGNOMEKBDUI... $ECHO_C" >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$LIBGNOMEKBDUI_CFLAGS"; then
- pkg_cv_LIBGNOMEKBDUI_CFLAGS="$LIBGNOMEKBDUI_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+-if test -n "$LIBGNOMEKBDUI_CFLAGS"; then
+- pkg_cv_LIBGNOMEKBDUI_CFLAGS="$LIBGNOMEKBDUI_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbdui >= 2.21\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBGNOMEKBDUI_CFLAGS"; then
++ pkg_cv_LIBGNOMEKBDUI_CFLAGS="$LIBGNOMEKBDUI_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbdui >= 2.21\"") >&5
($PKG_CONFIG --exists --print-errors "libgnomekbdui >= 2.21") 2>&5
ac_status=$?
@@ -18989,11 +25306,24 @@
(exit $ac_status); }; then
pkg_cv_LIBGNOMEKBDUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomekbdui >= 2.21" 2>/dev/null`
else
-@@ -28100,10 +27736,10 @@
- pkg_cv_LIBGNOMEKBDUI_LIBS="$LIBGNOMEKBDUI_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LIBGNOMEKBDUI_LIBS"; then
+- pkg_cv_LIBGNOMEKBDUI_LIBS="$LIBGNOMEKBDUI_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbdui >= 2.21\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBGNOMEKBDUI_LIBS"; then
++ pkg_cv_LIBGNOMEKBDUI_LIBS="$LIBGNOMEKBDUI_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbdui >= 2.21\"") >&5
($PKG_CONFIG --exists --print-errors "libgnomekbdui >= 2.21") 2>&5
ac_status=$?
@@ -19002,7 +25332,26 @@
(exit $ac_status); }; then
pkg_cv_LIBGNOMEKBDUI_LIBS=`$PKG_CONFIG --libs "libgnomekbdui >= 2.21" 2>/dev/null`
else
-@@ -28131,7 +27767,7 @@
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -27905,14 +27586,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBGNOMEKBDUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgnomekbdui >= 2.21" 2>&1`
++ LIBGNOMEKBDUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomekbdui >= 2.21"`
+ else
+- LIBGNOMEKBDUI_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgnomekbdui >= 2.21" 2>&1`
++ LIBGNOMEKBDUI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomekbdui >= 2.21"`
+ fi
# Put the nasty error message in config.log where it belongs
echo "$LIBGNOMEKBDUI_PKG_ERRORS" >&5
@@ -19011,7 +25360,7 @@
$LIBGNOMEKBDUI_PKG_ERRORS
-@@ -28142,7 +27778,7 @@
+@@ -27923,7 +27604,7 @@ Alternatively, you may set the environme
and LIBGNOMEKBDUI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -19020,7 +25369,7 @@
$LIBGNOMEKBDUI_PKG_ERRORS
-@@ -28155,7 +27791,7 @@
+@@ -27936,7 +27617,7 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -19029,26 +25378,16 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -28163,9 +27799,9 @@
- and LIBGNOMEKBDUI_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+@@ -27946,7 +27627,7 @@ See the pkg-config man page for more det
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -28173,14 +27809,14 @@
- and LIBGNOMEKBDUI_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+@@ -27960,16 +27641,16 @@ See \`config.log' for more details." >&2
else
LIBGNOMEKBDUI_CFLAGS=$pkg_cv_LIBGNOMEKBDUI_CFLAGS
LIBGNOMEKBDUI_LIBS=$pkg_cv_LIBGNOMEKBDUI_LIBS
@@ -19059,61 +25398,115 @@
:
fi
-@@ -28199,18 +27835,18 @@
-
+
+
+
+-{ $as_echo "$as_me:$LINENO: checking whether to enable About Me" >&5
+-$as_echo_n "checking whether to enable About Me... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to enable About Me" >&5
++echo $ECHO_N "checking whether to enable About Me... $ECHO_C" >&6; }
+ # Check whether --enable-aboutme was given.
+ if test "${enable_aboutme+set}" = set; then
+ enableval=$enable_aboutme;
+@@ -27977,46 +27658,50 @@ else
+ enable_aboutme=no
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $enable_aboutme" >&5
+-$as_echo "$enable_aboutme" >&6; }
++{ echo "$as_me:$LINENO: result: $enable_aboutme" >&5
++echo "${ECHO_T}$enable_aboutme" >&6; }
+
+ if test "x$enable_aboutme" = "xyes"; then
pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for THEME_METHOD" >&5
--$as_echo_n "checking for THEME_METHOD... " >&6; }
-+{ echo "$as_me:$LINENO: checking for THEME_METHOD" >&5
-+echo $ECHO_N "checking for THEME_METHOD... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$THEME_METHOD_CFLAGS"; then
- pkg_cv_THEME_METHOD_CFLAGS="$THEME_METHOD_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-module-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-module-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gnome-vfs-module-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0") 2>&5
+-{ $as_echo "$as_me:$LINENO: checking for LIBEBOOK" >&5
+-$as_echo_n "checking for LIBEBOOK... " >&6; }
++{ echo "$as_me:$LINENO: checking for LIBEBOOK" >&5
++echo $ECHO_N "checking for LIBEBOOK... $ECHO_C" >&6; }
+
+-if test -n "$LIBEBOOK_CFLAGS"; then
+- pkg_cv_LIBEBOOK_CFLAGS="$LIBEBOOK_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libebook-1.2 >= 1.7.90\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBEBOOK_CFLAGS"; then
++ pkg_cv_LIBEBOOK_CFLAGS="$LIBEBOOK_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libebook-1.2 >= 1.7.90\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libebook-1.2 >= 1.7.90") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_THEME_METHOD_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-module-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0" 2>/dev/null`
- else
-@@ -28225,10 +27861,10 @@
- pkg_cv_THEME_METHOD_LIBS="$THEME_METHOD_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-module-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-module-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gnome-vfs-module-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0") 2>&5
+ pkg_cv_LIBEBOOK_CFLAGS=`$PKG_CONFIG --cflags "libebook-1.2 >= 1.7.90" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$LIBEBOOK_LIBS"; then
+- pkg_cv_LIBEBOOK_LIBS="$LIBEBOOK_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libebook-1.2 >= 1.7.90\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBEBOOK_LIBS"; then
++ pkg_cv_LIBEBOOK_LIBS="$LIBEBOOK_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libebook-1.2 >= 1.7.90\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libebook-1.2 >= 1.7.90") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_THEME_METHOD_LIBS=`$PKG_CONFIG --libs "gnome-vfs-module-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0" 2>/dev/null`
- else
-@@ -28256,7 +27892,7 @@
+ pkg_cv_LIBEBOOK_LIBS=`$PKG_CONFIG --libs "libebook-1.2 >= 1.7.90" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -28029,14 +27714,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBEBOOK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libebook-1.2 >= 1.7.90" 2>&1`
++ LIBEBOOK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libebook-1.2 >= 1.7.90"`
+ else
+- LIBEBOOK_PKG_ERRORS=`$PKG_CONFIG --print-errors "libebook-1.2 >= 1.7.90" 2>&1`
++ LIBEBOOK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libebook-1.2 >= 1.7.90"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$THEME_METHOD_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-vfs-module-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (gnome-vfs-module-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0) were not met:
-
- $THEME_METHOD_PKG_ERRORS
-
-@@ -28267,7 +27903,7 @@
- and THEME_METHOD_LIBS to avoid the need to call pkg-config.
+ echo "$LIBEBOOK_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (libebook-1.2 >= 1.7.90) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (libebook-1.2 >= 1.7.90) were not met:
+
+ $LIBEBOOK_PKG_ERRORS
+
+@@ -28047,7 +27732,7 @@ Alternatively, you may set the environme
+ and LIBEBOOK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
--$as_echo "$as_me: error: Package requirements (gnome-vfs-module-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0) were not met:
-+echo "$as_me: error: Package requirements (gnome-vfs-module-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0) were not met:
-
- $THEME_METHOD_PKG_ERRORS
-
-@@ -28280,7 +27916,7 @@
+-$as_echo "$as_me: error: Package requirements (libebook-1.2 >= 1.7.90) were not met:
++echo "$as_me: error: Package requirements (libebook-1.2 >= 1.7.90) were not met:
+
+ $LIBEBOOK_PKG_ERRORS
+
+@@ -28060,7 +27745,7 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -19122,88 +25515,117 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -28288,9 +27924,9 @@
- and THEME_METHOD_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+@@ -28070,7 +27755,7 @@ See the pkg-config man page for more det
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -28298,30 +27934,30 @@
- and THEME_METHOD_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- THEME_METHOD_CFLAGS=$pkg_cv_THEME_METHOD_CFLAGS
- THEME_METHOD_LIBS=$pkg_cv_THEME_METHOD_LIBS
+@@ -28084,8 +27769,8 @@ See \`config.log' for more details." >&2
+ else
+ LIBEBOOK_CFLAGS=$pkg_cv_LIBEBOOK_CFLAGS
+ LIBEBOOK_LIBS=$pkg_cv_LIBEBOOK_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
- :
- fi
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LIBEBOOK 1
+@@ -28111,40 +27796,44 @@ fi
+ if test "x$enable_hal" != "xno"; then
pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for THEMUS_THUMBNAILER" >&5
--$as_echo_n "checking for THEMUS_THUMBNAILER... " >&6; }
-+{ echo "$as_me:$LINENO: checking for THEMUS_THUMBNAILER" >&5
-+echo $ECHO_N "checking for THEMUS_THUMBNAILER... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$THEMUS_THUMBNAILER_CFLAGS"; then
- pkg_cv_THEMUS_THUMBNAILER_CFLAGS="$THEMUS_THUMBNAILER_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 libmetacity-private gnome-vfs-2.0 >= 2.2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 libmetacity-private gnome-vfs-2.0 >= 2.2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 libmetacity-private gnome-vfs-2.0 >= 2.2.0") 2>&5
+-{ $as_echo "$as_me:$LINENO: checking for HAL" >&5
+-$as_echo_n "checking for HAL... " >&6; }
++{ echo "$as_me:$LINENO: checking for HAL" >&5
++echo $ECHO_N "checking for HAL... $ECHO_C" >&6; }
+
+-if test -n "$HAL_CFLAGS"; then
+- pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$HAL_CFLAGS"; then
++ pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32\"") >&5
+ ($PKG_CONFIG --exists --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_THEMUS_THUMBNAILER_CFLAGS=`$PKG_CONFIG --cflags "gdk-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 libmetacity-private gnome-vfs-2.0 >= 2.2.0" 2>/dev/null`
- else
-@@ -28336,10 +27972,10 @@
- pkg_cv_THEMUS_THUMBNAILER_LIBS="$THEMUS_THUMBNAILER_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 libmetacity-private gnome-vfs-2.0 >= 2.2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 libmetacity-private gnome-vfs-2.0 >= 2.2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 libmetacity-private gnome-vfs-2.0 >= 2.2.0") 2>&5
+ pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$HAL_LIBS"; then
+- pkg_cv_HAL_LIBS="$HAL_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$HAL_LIBS"; then
++ pkg_cv_HAL_LIBS="$HAL_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32\"") >&5
+ ($PKG_CONFIG --exists --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_THEMUS_THUMBNAILER_LIBS=`$PKG_CONFIG --libs "gdk-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 libmetacity-private gnome-vfs-2.0 >= 2.2.0" 2>/dev/null`
- else
-@@ -28367,7 +28003,7 @@
+ pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -28157,14 +27846,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32" 2>&1`
++ HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32"`
+ else
+- HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32" 2>&1`
++ HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$THEMUS_THUMBNAILER_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (gdk-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 libmetacity-private gnome-vfs-2.0 >= 2.2.0) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (gdk-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 libmetacity-private gnome-vfs-2.0 >= 2.2.0) were not met:
-
- $THEMUS_THUMBNAILER_PKG_ERRORS
-
-@@ -28378,7 +28014,7 @@
- and THEMUS_THUMBNAILER_LIBS to avoid the need to call pkg-config.
+ echo "$HAL_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32) were not met:
+
+ $HAL_PKG_ERRORS
+
+@@ -28175,7 +27864,7 @@ Alternatively, you may set the environme
+ and HAL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
--$as_echo "$as_me: error: Package requirements (gdk-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 libmetacity-private gnome-vfs-2.0 >= 2.2.0) were not met:
-+echo "$as_me: error: Package requirements (gdk-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 libmetacity-private gnome-vfs-2.0 >= 2.2.0) were not met:
-
- $THEMUS_THUMBNAILER_PKG_ERRORS
-
-@@ -28391,7 +28027,7 @@
+-$as_echo "$as_me: error: Package requirements (hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32) were not met:
++echo "$as_me: error: Package requirements (hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32) were not met:
+
+ $HAL_PKG_ERRORS
+
+@@ -28188,7 +27877,7 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -19212,817 +25634,16 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -28399,9 +28035,9 @@
- and THEMUS_THUMBNAILER_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+@@ -28198,7 +27887,7 @@ See the pkg-config man page for more det
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -28409,30 +28045,30 @@
- and THEMUS_THUMBNAILER_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- THEMUS_THUMBNAILER_CFLAGS=$pkg_cv_THEMUS_THUMBNAILER_CFLAGS
- THEMUS_THUMBNAILER_LIBS=$pkg_cv_THEMUS_THUMBNAILER_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- :
- fi
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for THEMUS_COMPONENT" >&5
--$as_echo_n "checking for THEMUS_COMPONENT... " >&6; }
-+{ echo "$as_me:$LINENO: checking for THEMUS_COMPONENT" >&5
-+echo $ECHO_N "checking for THEMUS_COMPONENT... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$THEMUS_COMPONENT_CFLAGS"; then
- pkg_cv_THEMUS_COMPONENT_CFLAGS="$THEMUS_COMPONENT_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.8.0 gtk+-2.0 >= 2.4.0 libnautilus-extension >= 2.6.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.8.0 gtk+-2.0 >= 2.4.0 libnautilus-extension >= 2.6.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.8.0 gtk+-2.0 >= 2.4.0 libnautilus-extension >= 2.6.0") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_THEMUS_COMPONENT_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.8.0 gtk+-2.0 >= 2.4.0 libnautilus-extension >= 2.6.0" 2>/dev/null`
- else
-@@ -28447,10 +28083,10 @@
- pkg_cv_THEMUS_COMPONENT_LIBS="$THEMUS_COMPONENT_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.8.0 gtk+-2.0 >= 2.4.0 libnautilus-extension >= 2.6.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.8.0 gtk+-2.0 >= 2.4.0 libnautilus-extension >= 2.6.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.8.0 gtk+-2.0 >= 2.4.0 libnautilus-extension >= 2.6.0") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_THEMUS_COMPONENT_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.8.0 gtk+-2.0 >= 2.4.0 libnautilus-extension >= 2.6.0" 2>/dev/null`
- else
-@@ -28478,7 +28114,7 @@
- # Put the nasty error message in config.log where it belongs
- echo "$THEMUS_COMPONENT_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.8.0 gtk+-2.0 >= 2.4.0 libnautilus-extension >= 2.6.0) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.8.0 gtk+-2.0 >= 2.4.0 libnautilus-extension >= 2.6.0) were not met:
-
- $THEMUS_COMPONENT_PKG_ERRORS
-
-@@ -28489,7 +28125,7 @@
- and THEMUS_COMPONENT_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.8.0 gtk+-2.0 >= 2.4.0 libnautilus-extension >= 2.6.0) were not met:
-+echo "$as_me: error: Package requirements (glib-2.0 >= 2.8.0 gtk+-2.0 >= 2.4.0 libnautilus-extension >= 2.6.0) were not met:
-
- $THEMUS_COMPONENT_PKG_ERRORS
-
-@@ -28502,7 +28138,7 @@
- " >&2;}
- { (exit 1); exit 1; }; }
- elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -28510,9 +28146,9 @@
- and THEMUS_COMPONENT_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -28520,30 +28156,30 @@
- and THEMUS_COMPONENT_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- THEMUS_COMPONENT_CFLAGS=$pkg_cv_THEMUS_COMPONENT_CFLAGS
- THEMUS_COMPONENT_LIBS=$pkg_cv_THEMUS_COMPONENT_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- :
- fi
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for THEMUS_APPLIER" >&5
--$as_echo_n "checking for THEMUS_APPLIER... " >&6; }
-+{ echo "$as_me:$LINENO: checking for THEMUS_APPLIER" >&5
-+echo $ECHO_N "checking for THEMUS_APPLIER... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$THEMUS_APPLIER_CFLAGS"; then
- pkg_cv_THEMUS_APPLIER_CFLAGS="$THEMUS_APPLIER_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.4.0 libglade-2.0 >= 2.0 gnome-vfs-2.0 >= 2.2.0 libgnome-2.0 >= 2.2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.4.0 libglade-2.0 >= 2.0 gnome-vfs-2.0 >= 2.2.0 libgnome-2.0 >= 2.2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.4.0 libglade-2.0 >= 2.0 gnome-vfs-2.0 >= 2.2.0 libgnome-2.0 >= 2.2.0") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_THEMUS_APPLIER_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4.0 libglade-2.0 >= 2.0 gnome-vfs-2.0 >= 2.2.0 libgnome-2.0 >= 2.2.0" 2>/dev/null`
- else
-@@ -28558,10 +28194,10 @@
- pkg_cv_THEMUS_APPLIER_LIBS="$THEMUS_APPLIER_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.4.0 libglade-2.0 >= 2.0 gnome-vfs-2.0 >= 2.2.0 libgnome-2.0 >= 2.2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.4.0 libglade-2.0 >= 2.0 gnome-vfs-2.0 >= 2.2.0 libgnome-2.0 >= 2.2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.4.0 libglade-2.0 >= 2.0 gnome-vfs-2.0 >= 2.2.0 libgnome-2.0 >= 2.2.0") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_THEMUS_APPLIER_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4.0 libglade-2.0 >= 2.0 gnome-vfs-2.0 >= 2.2.0 libgnome-2.0 >= 2.2.0" 2>/dev/null`
- else
-@@ -28589,7 +28225,7 @@
- # Put the nasty error message in config.log where it belongs
- echo "$THEMUS_APPLIER_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= 2.4.0 libglade-2.0 >= 2.0 gnome-vfs-2.0 >= 2.2.0 libgnome-2.0 >= 2.2.0) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= 2.4.0 libglade-2.0 >= 2.0 gnome-vfs-2.0 >= 2.2.0 libgnome-2.0 >= 2.2.0) were not met:
-
- $THEMUS_APPLIER_PKG_ERRORS
-
-@@ -28600,7 +28236,7 @@
- and THEMUS_APPLIER_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (gtk+-2.0 >= 2.4.0 libglade-2.0 >= 2.0 gnome-vfs-2.0 >= 2.2.0 libgnome-2.0 >= 2.2.0) were not met:
-+echo "$as_me: error: Package requirements (gtk+-2.0 >= 2.4.0 libglade-2.0 >= 2.0 gnome-vfs-2.0 >= 2.2.0 libgnome-2.0 >= 2.2.0) were not met:
-
- $THEMUS_APPLIER_PKG_ERRORS
-
-@@ -28613,7 +28249,7 @@
- " >&2;}
- { (exit 1); exit 1; }; }
- elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -28621,9 +28257,9 @@
- and THEMUS_APPLIER_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -28631,30 +28267,30 @@
- and THEMUS_APPLIER_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- THEMUS_APPLIER_CFLAGS=$pkg_cv_THEMUS_APPLIER_CFLAGS
- THEMUS_APPLIER_LIBS=$pkg_cv_THEMUS_APPLIER_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- :
- fi
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for FONT_METHOD" >&5
--$as_echo_n "checking for FONT_METHOD... " >&6; }
-+{ echo "$as_me:$LINENO: checking for FONT_METHOD" >&5
-+echo $ECHO_N "checking for FONT_METHOD... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$FONT_METHOD_CFLAGS"; then
- pkg_cv_FONT_METHOD_CFLAGS="$FONT_METHOD_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-module-2.0 >= 2.0.0 fontconfig >= 1.0.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-module-2.0 >= 2.0.0 fontconfig >= 1.0.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gnome-vfs-module-2.0 >= 2.0.0 fontconfig >= 1.0.0") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_FONT_METHOD_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-module-2.0 >= 2.0.0 fontconfig >= 1.0.0" 2>/dev/null`
- else
-@@ -28669,10 +28305,10 @@
- pkg_cv_FONT_METHOD_LIBS="$FONT_METHOD_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-module-2.0 >= 2.0.0 fontconfig >= 1.0.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-module-2.0 >= 2.0.0 fontconfig >= 1.0.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gnome-vfs-module-2.0 >= 2.0.0 fontconfig >= 1.0.0") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_FONT_METHOD_LIBS=`$PKG_CONFIG --libs "gnome-vfs-module-2.0 >= 2.0.0 fontconfig >= 1.0.0" 2>/dev/null`
- else
-@@ -28700,7 +28336,7 @@
- # Put the nasty error message in config.log where it belongs
- echo "$FONT_METHOD_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-vfs-module-2.0 >= 2.0.0 fontconfig >= 1.0.0) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (gnome-vfs-module-2.0 >= 2.0.0 fontconfig >= 1.0.0) were not met:
-
- $FONT_METHOD_PKG_ERRORS
-
-@@ -28711,7 +28347,7 @@
- and FONT_METHOD_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (gnome-vfs-module-2.0 >= 2.0.0 fontconfig >= 1.0.0) were not met:
-+echo "$as_me: error: Package requirements (gnome-vfs-module-2.0 >= 2.0.0 fontconfig >= 1.0.0) were not met:
-
- $FONT_METHOD_PKG_ERRORS
-
-@@ -28724,7 +28360,7 @@
- " >&2;}
- { (exit 1); exit 1; }; }
- elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -28732,9 +28368,9 @@
- and FONT_METHOD_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -28742,30 +28378,30 @@
- and FONT_METHOD_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- FONT_METHOD_CFLAGS=$pkg_cv_FONT_METHOD_CFLAGS
- FONT_METHOD_LIBS=$pkg_cv_FONT_METHOD_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- :
- fi
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for FONT_THUMBNAILER" >&5
--$as_echo_n "checking for FONT_THUMBNAILER... " >&6; }
-+{ echo "$as_me:$LINENO: checking for FONT_THUMBNAILER" >&5
-+echo $ECHO_N "checking for FONT_THUMBNAILER... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$FONT_THUMBNAILER_CFLAGS"; then
- pkg_cv_FONT_THUMBNAILER_CFLAGS="$FONT_THUMBNAILER_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0.0 gdk-pixbuf-2.0 >= 2.11.6\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0.0 gdk-pixbuf-2.0 >= 2.11.6\"") >&5
- ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.0.0 gdk-pixbuf-2.0 >= 2.11.6") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_FONT_THUMBNAILER_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.0.0 gdk-pixbuf-2.0 >= 2.11.6" 2>/dev/null`
- else
-@@ -28780,10 +28416,10 @@
- pkg_cv_FONT_THUMBNAILER_LIBS="$FONT_THUMBNAILER_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0.0 gdk-pixbuf-2.0 >= 2.11.6\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0.0 gdk-pixbuf-2.0 >= 2.11.6\"") >&5
- ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.0.0 gdk-pixbuf-2.0 >= 2.11.6") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_FONT_THUMBNAILER_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.0.0 gdk-pixbuf-2.0 >= 2.11.6" 2>/dev/null`
- else
-@@ -28811,7 +28447,7 @@
- # Put the nasty error message in config.log where it belongs
- echo "$FONT_THUMBNAILER_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-vfs-2.0 >= 2.0.0 gdk-pixbuf-2.0 >= 2.11.6) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (gnome-vfs-2.0 >= 2.0.0 gdk-pixbuf-2.0 >= 2.11.6) were not met:
-
- $FONT_THUMBNAILER_PKG_ERRORS
-
-@@ -28822,7 +28458,7 @@
- and FONT_THUMBNAILER_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (gnome-vfs-2.0 >= 2.0.0 gdk-pixbuf-2.0 >= 2.11.6) were not met:
-+echo "$as_me: error: Package requirements (gnome-vfs-2.0 >= 2.0.0 gdk-pixbuf-2.0 >= 2.11.6) were not met:
-
- $FONT_THUMBNAILER_PKG_ERRORS
-
-@@ -28835,7 +28471,7 @@
- " >&2;}
- { (exit 1); exit 1; }; }
- elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -28843,9 +28479,9 @@
- and FONT_THUMBNAILER_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -28853,30 +28489,30 @@
- and FONT_THUMBNAILER_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- FONT_THUMBNAILER_CFLAGS=$pkg_cv_FONT_THUMBNAILER_CFLAGS
- FONT_THUMBNAILER_LIBS=$pkg_cv_FONT_THUMBNAILER_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- :
- fi
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for FONT_CONTEXT_MENU" >&5
--$as_echo_n "checking for FONT_CONTEXT_MENU... " >&6; }
-+{ echo "$as_me:$LINENO: checking for FONT_CONTEXT_MENU" >&5
-+echo $ECHO_N "checking for FONT_CONTEXT_MENU... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$FONT_CONTEXT_MENU_CFLAGS"; then
- pkg_cv_FONT_CONTEXT_MENU_CFLAGS="$FONT_CONTEXT_MENU_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.8.0 gnome-vfs-2.0 >= 2.0.0 libnautilus-extension >= 2.6.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.8.0 gnome-vfs-2.0 >= 2.0.0 libnautilus-extension >= 2.6.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.8.0 gnome-vfs-2.0 >= 2.0.0 libnautilus-extension >= 2.6.0") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_FONT_CONTEXT_MENU_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.8.0 gnome-vfs-2.0 >= 2.0.0 libnautilus-extension >= 2.6.0" 2>/dev/null`
- else
-@@ -28891,10 +28527,10 @@
- pkg_cv_FONT_CONTEXT_MENU_LIBS="$FONT_CONTEXT_MENU_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.8.0 gnome-vfs-2.0 >= 2.0.0 libnautilus-extension >= 2.6.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.8.0 gnome-vfs-2.0 >= 2.0.0 libnautilus-extension >= 2.6.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.8.0 gnome-vfs-2.0 >= 2.0.0 libnautilus-extension >= 2.6.0") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_FONT_CONTEXT_MENU_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.8.0 gnome-vfs-2.0 >= 2.0.0 libnautilus-extension >= 2.6.0" 2>/dev/null`
- else
-@@ -28922,7 +28558,7 @@
- # Put the nasty error message in config.log where it belongs
- echo "$FONT_CONTEXT_MENU_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.8.0 gnome-vfs-2.0 >= 2.0.0 libnautilus-extension >= 2.6.0) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.8.0 gnome-vfs-2.0 >= 2.0.0 libnautilus-extension >= 2.6.0) were not met:
-
- $FONT_CONTEXT_MENU_PKG_ERRORS
-
-@@ -28933,7 +28569,7 @@
- and FONT_CONTEXT_MENU_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.8.0 gnome-vfs-2.0 >= 2.0.0 libnautilus-extension >= 2.6.0) were not met:
-+echo "$as_me: error: Package requirements (glib-2.0 >= 2.8.0 gnome-vfs-2.0 >= 2.0.0 libnautilus-extension >= 2.6.0) were not met:
-
- $FONT_CONTEXT_MENU_PKG_ERRORS
-
-@@ -28946,7 +28582,7 @@
- " >&2;}
- { (exit 1); exit 1; }; }
- elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -28954,9 +28590,9 @@
- and FONT_CONTEXT_MENU_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -28964,30 +28600,30 @@
- and FONT_CONTEXT_MENU_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- FONT_CONTEXT_MENU_CFLAGS=$pkg_cv_FONT_CONTEXT_MENU_CFLAGS
- FONT_CONTEXT_MENU_LIBS=$pkg_cv_FONT_CONTEXT_MENU_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- :
- fi
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for FONT_VIEW" >&5
--$as_echo_n "checking for FONT_VIEW... " >&6; }
-+{ echo "$as_me:$LINENO: checking for FONT_VIEW" >&5
-+echo $ECHO_N "checking for FONT_VIEW... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$FONT_VIEW_CFLAGS"; then
- pkg_cv_FONT_VIEW_CFLAGS="$FONT_VIEW_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0.0 xft >= 2.1.2 gtk+-2.0 >= 2.11.6 libgnomeui-2.0 >= 2.2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0.0 xft >= 2.1.2 gtk+-2.0 >= 2.11.6 libgnomeui-2.0 >= 2.2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.0.0 xft >= 2.1.2 gtk+-2.0 >= 2.11.6 libgnomeui-2.0 >= 2.2.0") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_FONT_VIEW_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.0.0 xft >= 2.1.2 gtk+-2.0 >= 2.11.6 libgnomeui-2.0 >= 2.2.0" 2>/dev/null`
- else
-@@ -29002,10 +28638,10 @@
- pkg_cv_FONT_VIEW_LIBS="$FONT_VIEW_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0.0 xft >= 2.1.2 gtk+-2.0 >= 2.11.6 libgnomeui-2.0 >= 2.2.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0.0 xft >= 2.1.2 gtk+-2.0 >= 2.11.6 libgnomeui-2.0 >= 2.2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.0.0 xft >= 2.1.2 gtk+-2.0 >= 2.11.6 libgnomeui-2.0 >= 2.2.0") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_FONT_VIEW_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.0.0 xft >= 2.1.2 gtk+-2.0 >= 2.11.6 libgnomeui-2.0 >= 2.2.0" 2>/dev/null`
- else
-@@ -29033,7 +28669,7 @@
- # Put the nasty error message in config.log where it belongs
- echo "$FONT_VIEW_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-vfs-2.0 >= 2.0.0 xft >= 2.1.2 gtk+-2.0 >= 2.11.6 libgnomeui-2.0 >= 2.2.0) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (gnome-vfs-2.0 >= 2.0.0 xft >= 2.1.2 gtk+-2.0 >= 2.11.6 libgnomeui-2.0 >= 2.2.0) were not met:
-
- $FONT_VIEW_PKG_ERRORS
-
-@@ -29044,7 +28680,7 @@
- and FONT_VIEW_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (gnome-vfs-2.0 >= 2.0.0 xft >= 2.1.2 gtk+-2.0 >= 2.11.6 libgnomeui-2.0 >= 2.2.0) were not met:
-+echo "$as_me: error: Package requirements (gnome-vfs-2.0 >= 2.0.0 xft >= 2.1.2 gtk+-2.0 >= 2.11.6 libgnomeui-2.0 >= 2.2.0) were not met:
-
- $FONT_VIEW_PKG_ERRORS
-
-@@ -29057,7 +28693,7 @@
- " >&2;}
- { (exit 1); exit 1; }; }
- elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -29065,9 +28701,9 @@
- and FONT_VIEW_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -29075,24 +28711,24 @@
- and FONT_VIEW_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- FONT_VIEW_CFLAGS=$pkg_cv_FONT_VIEW_CFLAGS
- FONT_VIEW_LIBS=$pkg_cv_FONT_VIEW_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- :
- fi
-
- # Add freetype flags to the thumbnailer script
- # Extract the first word of "freetype-config", so it can be a program name with args.
- set dummy freetype-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_FREETYPE_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $FREETYPE_CONFIG in
- [\\/]* | ?:[\\/]*)
-@@ -29107,7 +28743,7 @@
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_FREETYPE_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -29120,17 +28756,17 @@
- fi
- FREETYPE_CONFIG=$ac_cv_path_FREETYPE_CONFIG
- if test -n "$FREETYPE_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $FREETYPE_CONFIG" >&5
--$as_echo "$FREETYPE_CONFIG" >&6; }
-+ { echo "$as_me:$LINENO: result: $FREETYPE_CONFIG" >&5
-+echo "${ECHO_T}$FREETYPE_CONFIG" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
- if test "x$FREETYPE_CONFIG" = xno; then
-- { { $as_echo "$as_me:$LINENO: error: Could not find freetype-config script" >&5
--$as_echo "$as_me: error: Could not find freetype-config script" >&2;}
-+ { { echo "$as_me:$LINENO: error: Could not find freetype-config script" >&5
-+echo "$as_me: error: Could not find freetype-config script" >&2;}
- { (exit 1); exit 1; }; }
- fi
- FONT_THUMBNAILER_CFLAGS="$FONT_THUMBNAILER_CFLAGS `$FREETYPE_CONFIG --cflags`"
-@@ -29158,8 +28794,8 @@
- fi
-
-
--{ $as_echo "$as_me:$LINENO: checking whether to enable About Me" >&5
--$as_echo_n "checking whether to enable About Me... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether to enable About Me" >&5
-+echo $ECHO_N "checking whether to enable About Me... $ECHO_C" >&6; }
- # Check whether --enable-aboutme was given.
- if test "${enable_aboutme+set}" = set; then
- enableval=$enable_aboutme;
-@@ -29167,24 +28803,24 @@
- enable_aboutme=no
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $enable_aboutme" >&5
--$as_echo "$enable_aboutme" >&6; }
-+{ echo "$as_me:$LINENO: result: $enable_aboutme" >&5
-+echo "${ECHO_T}$enable_aboutme" >&6; }
-
- if test "x$enable_aboutme" = "xyes"; then
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for LIBEBOOK" >&5
--$as_echo_n "checking for LIBEBOOK... " >&6; }
-+{ echo "$as_me:$LINENO: checking for LIBEBOOK" >&5
-+echo $ECHO_N "checking for LIBEBOOK... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$LIBEBOOK_CFLAGS"; then
- pkg_cv_LIBEBOOK_CFLAGS="$LIBEBOOK_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libebook-1.2 >= 1.7.90\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libebook-1.2 >= 1.7.90\"") >&5
- ($PKG_CONFIG --exists --print-errors "libebook-1.2 >= 1.7.90") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_LIBEBOOK_CFLAGS=`$PKG_CONFIG --cflags "libebook-1.2 >= 1.7.90" 2>/dev/null`
- else
-@@ -29199,10 +28835,10 @@
- pkg_cv_LIBEBOOK_LIBS="$LIBEBOOK_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libebook-1.2 >= 1.7.90\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libebook-1.2 >= 1.7.90\"") >&5
- ($PKG_CONFIG --exists --print-errors "libebook-1.2 >= 1.7.90") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_LIBEBOOK_LIBS=`$PKG_CONFIG --libs "libebook-1.2 >= 1.7.90" 2>/dev/null`
- else
-@@ -29230,7 +28866,7 @@
- # Put the nasty error message in config.log where it belongs
- echo "$LIBEBOOK_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (libebook-1.2 >= 1.7.90) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (libebook-1.2 >= 1.7.90) were not met:
-
- $LIBEBOOK_PKG_ERRORS
-
-@@ -29241,7 +28877,7 @@
- and LIBEBOOK_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (libebook-1.2 >= 1.7.90) were not met:
-+echo "$as_me: error: Package requirements (libebook-1.2 >= 1.7.90) were not met:
-
- $LIBEBOOK_PKG_ERRORS
-
-@@ -29254,7 +28890,7 @@
- " >&2;}
- { (exit 1); exit 1; }; }
- elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -29262,9 +28898,9 @@
- and LIBEBOOK_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -29272,14 +28908,14 @@
- and LIBEBOOK_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- LIBEBOOK_CFLAGS=$pkg_cv_LIBEBOOK_CFLAGS
- LIBEBOOK_LIBS=$pkg_cv_LIBEBOOK_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBEBOOK 1
-@@ -29305,18 +28941,18 @@
- if test "x$enable_hal" != "xno"; then
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for HAL" >&5
--$as_echo_n "checking for HAL... " >&6; }
-+{ echo "$as_me:$LINENO: checking for HAL" >&5
-+echo $ECHO_N "checking for HAL... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$HAL_CFLAGS"; then
- pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32\"") >&5
- ($PKG_CONFIG --exists --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32" 2>/dev/null`
- else
-@@ -29331,10 +28967,10 @@
- pkg_cv_HAL_LIBS="$HAL_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32\"") >&5
- ($PKG_CONFIG --exists --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32" 2>/dev/null`
- else
-@@ -29362,7 +28998,7 @@
- # Put the nasty error message in config.log where it belongs
- echo "$HAL_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32) were not met:
-
- $HAL_PKG_ERRORS
-
-@@ -29373,7 +29009,7 @@
- and HAL_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32) were not met:
-+echo "$as_me: error: Package requirements (hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32) were not met:
-
- $HAL_PKG_ERRORS
-
-@@ -29386,7 +29022,7 @@
- " >&2;}
- { (exit 1); exit 1; }; }
- elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -29394,9 +29030,9 @@
- and HAL_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -29404,14 +29040,14 @@
- and HAL_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+@@ -28212,8 +27901,8 @@ See \`config.log' for more details." >&2
else
HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
HAL_LIBS=$pkg_cv_HAL_LIBS
@@ -20033,7 +25654,7 @@
cat >>confdefs.h <<\_ACEOF
#define USE_HAL 1
-@@ -29425,10 +29061,10 @@
+@@ -28227,10 +27916,10 @@ fi
# Extract the first word of "glib-genmarshal", so it can be a program name with args.
set dummy glib-genmarshal; ac_word=$2
@@ -20047,7 +25668,7 @@
else
case $GLIB_GENMARSHAL in
[\\/]* | ?:[\\/]*)
-@@ -29443,7 +29079,7 @@
+@@ -28245,7 +27934,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
@@ -20056,7 +25677,7 @@
break 2
fi
done
-@@ -29456,18 +29092,18 @@
+@@ -28258,18 +27947,18 @@ esac
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -20081,7 +25702,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -29476,10 +29112,10 @@
+@@ -28278,10 +27967,10 @@ fi
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -20095,7 +25716,7 @@
else
case $GCONFTOOL in
[\\/]* | ?:[\\/]*)
-@@ -29494,7 +29130,7 @@
+@@ -28296,7 +27985,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
@@ -20104,7 +25725,7 @@
break 2
fi
done
-@@ -29507,18 +29143,18 @@
+@@ -28309,18 +27998,18 @@ esac
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -20129,7 +25750,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -29537,8 +29173,8 @@
+@@ -28339,8 +28028,8 @@ fi
@@ -20140,7 +25761,7 @@
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-@@ -29552,15 +29188,15 @@
+@@ -28354,15 +28043,15 @@ fi
@@ -20160,81 +25781,7 @@
{ (exit 1); exit 1; }; } ;;
esac
fi
-@@ -29581,8 +29217,8 @@
- enableval=$enable_esd; case "${enableval}" in
- yes) WANT_ESD=yes ;;
- no) WANT_ESD=no ;;
-- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-esd" >&5
--$as_echo "$as_me: error: bad value ${enableval} for --disable-esd" >&2;}
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-esd" >&5
-+echo "$as_me: error: bad value ${enableval} for --disable-esd" >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
- else
-@@ -29592,18 +29228,18 @@
- if test x$WANT_ESD = xyes ; then
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for ESD" >&5
--$as_echo_n "checking for ESD... " >&6; }
-+{ echo "$as_me:$LINENO: checking for ESD" >&5
-+echo $ECHO_N "checking for ESD... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$ESD_CFLAGS"; then
- pkg_cv_ESD_CFLAGS="$ESD_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"esound >= 0.2.28\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"esound >= 0.2.28\"") >&5
- ($PKG_CONFIG --exists --print-errors "esound >= 0.2.28") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_ESD_CFLAGS=`$PKG_CONFIG --cflags "esound >= 0.2.28" 2>/dev/null`
- else
-@@ -29618,10 +29254,10 @@
- pkg_cv_ESD_LIBS="$ESD_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"esound >= 0.2.28\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"esound >= 0.2.28\"") >&5
- ($PKG_CONFIG --exists --print-errors "esound >= 0.2.28") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_ESD_LIBS=`$PKG_CONFIG --libs "esound >= 0.2.28" 2>/dev/null`
- else
-@@ -29649,18 +29285,18 @@
- # Put the nasty error message in config.log where it belongs
- echo "$ESD_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- { $as_echo "$as_me:$LINENO: result: disabled" >&5
--$as_echo "disabled" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ { echo "$as_me:$LINENO: result: disabled" >&5
-+echo "${ECHO_T}disabled" >&6; }
- elif test $pkg_failed = untried; then
-- { $as_echo "$as_me:$LINENO: result: disabled" >&5
--$as_echo "disabled" >&6; }
-+ { echo "$as_me:$LINENO: result: disabled" >&5
-+echo "${ECHO_T}disabled" >&6; }
- else
- ESD_CFLAGS=$pkg_cv_ESD_CFLAGS
- ESD_LIBS=$pkg_cv_ESD_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- have_esd=yes
-
- cat >>confdefs.h <<\_ACEOF
-@@ -29681,12 +29317,12 @@
+@@ -28385,12 +28074,12 @@ if test "${enable_gstreamer+set}" = set;
yes) ENABLE_GSTREAMER=yes ;;
0.10) ENABLE_GSTREAMER=yes && GST_MAJORMINOR=0.10 ;;
no) ENABLE_GSTREAMER=no ;;
@@ -20249,7 +25796,7 @@
*** Bad value ${enableval} for --enable-gstreamer
*** Please use one of the following:
*** --enable-gstreamer=0.10
-@@ -29704,18 +29340,18 @@
+@@ -28408,40 +28097,44 @@ if test "x$ENABLE_GSTREAMER" = "xyes"; t
pkg_failed=no
@@ -20258,12 +25805,16 @@
+{ echo "$as_me:$LINENO: checking for GST" >&5
+echo $ECHO_N "checking for GST... $ECHO_C" >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$GST_CFLAGS"; then
- pkg_cv_GST_CFLAGS="$GST_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+-if test -n "$GST_CFLAGS"; then
+- pkg_cv_GST_CFLAGS="$GST_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$PKGS\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GST_CFLAGS"; then
++ pkg_cv_GST_CFLAGS="$GST_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$PKGS\"") >&5
($PKG_CONFIG --exists --print-errors "$PKGS") 2>&5
ac_status=$?
@@ -20272,11 +25823,24 @@
(exit $ac_status); }; then
pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "$PKGS" 2>/dev/null`
else
-@@ -29730,10 +29366,10 @@
- pkg_cv_GST_LIBS="$GST_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$GST_LIBS"; then
+- pkg_cv_GST_LIBS="$GST_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$PKGS\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GST_LIBS"; then
++ pkg_cv_GST_LIBS="$GST_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$PKGS\"") >&5
($PKG_CONFIG --exists --print-errors "$PKGS") 2>&5
ac_status=$?
@@ -20285,7 +25849,26 @@
(exit $ac_status); }; then
pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "$PKGS" 2>/dev/null`
else
-@@ -29761,25 +29397,25 @@
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -28454,32 +28147,32 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$PKGS" 2>&1`
++ GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$PKGS"`
+ else
+- GST_PKG_ERRORS=`$PKG_CONFIG --print-errors "$PKGS" 2>&1`
++ GST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$PKGS"`
+ fi
# Put the nasty error message in config.log where it belongs
echo "$GST_PKG_ERRORS" >&5
@@ -20321,18 +25904,123 @@
fi
if test "x$have_gstreamer" = "xyes"; then
HAVE_GSTREAMER_TRUE=
-@@ -29798,8 +29434,8 @@
-
-
+@@ -28505,40 +28198,44 @@ fi
+ if test "x$with_libcanberra" != "xno"; then
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for CANBERRA" >&5
+-$as_echo_n "checking for CANBERRA... " >&6; }
++{ echo "$as_me:$LINENO: checking for CANBERRA" >&5
++echo $ECHO_N "checking for CANBERRA... $ECHO_C" >&6; }
+
+-if test -n "$CANBERRA_CFLAGS"; then
+- pkg_cv_CANBERRA_CFLAGS="$CANBERRA_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= 0.4 gio-2.0\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$CANBERRA_CFLAGS"; then
++ pkg_cv_CANBERRA_CFLAGS="$CANBERRA_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= 0.4 gio-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libcanberra-gtk >= 0.4 gio-2.0") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_CANBERRA_CFLAGS=`$PKG_CONFIG --cflags "libcanberra-gtk >= 0.4 gio-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$CANBERRA_LIBS"; then
+- pkg_cv_CANBERRA_LIBS="$CANBERRA_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= 0.4 gio-2.0\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$CANBERRA_LIBS"; then
++ pkg_cv_CANBERRA_LIBS="$CANBERRA_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= 0.4 gio-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libcanberra-gtk >= 0.4 gio-2.0") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_CANBERRA_LIBS=`$PKG_CONFIG --libs "libcanberra-gtk >= 0.4 gio-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -28551,23 +28248,23 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- CANBERRA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcanberra-gtk >= 0.4 gio-2.0" 2>&1`
++ CANBERRA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcanberra-gtk >= 0.4 gio-2.0"`
+ else
+- CANBERRA_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcanberra-gtk >= 0.4 gio-2.0" 2>&1`
++ CANBERRA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcanberra-gtk >= 0.4 gio-2.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$CANBERRA_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ have_canberra=no
+ elif test $pkg_failed = untried; then
+ have_canberra=no
+ else
+ CANBERRA_CFLAGS=$pkg_cv_CANBERRA_CFLAGS
+ CANBERRA_LIBS=$pkg_cv_CANBERRA_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ have_canberra=yes
+ fi
+ if test "x$have_gstreamer" = "xyes" && test "x$have_canberra" = "xyes" ; then
+@@ -28577,16 +28274,16 @@ fi
+
+ else
+ if test "x$with_libcanberra" = "xyes" -a "x$have_canberra" = "xno"; then
+- { { $as_echo "$as_me:$LINENO: error: Sound capplet requested but libcanberra not found" >&5
+-$as_echo "$as_me: error: Sound capplet requested but libcanberra not found" >&2;}
++ { { echo "$as_me:$LINENO: error: Sound capplet requested but libcanberra not found" >&5
++echo "$as_me: error: Sound capplet requested but libcanberra not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+- { $as_echo "$as_me:$LINENO: *** Sound capplet will not be built" >&5
+-$as_echo "$as_me: *** Sound capplet will not be built" >&6;};
++ { echo "$as_me:$LINENO: *** Sound capplet will not be built" >&5
++echo "$as_me: *** Sound capplet will not be built" >&6;};
+ fi
else
- { $as_echo "$as_me:$LINENO: *** Sound capplet will not be built" >&5
-$as_echo "$as_me: *** Sound capplet will not be built" >&6;};
+ { echo "$as_me:$LINENO: *** Sound capplet will not be built" >&5
+echo "$as_me: *** Sound capplet will not be built" >&6;};
fi
-
- COMMON_CFLAGS="-I\$(top_srcdir)/capplets/common"
-@@ -29821,10 +29457,10 @@
+ if test "x$with_libcanberra" = "xyes"; then
+ BUILD_SOUND_TRUE=
+@@ -28616,10 +28313,10 @@ GNOMECC_CAPPLETS_EXTRA_DIST="ChangeLog \
# Extract the first word of "update-mime-database", so it can be a program name with args.
set dummy update-mime-database; ac_word=$2
@@ -20346,7 +26034,7 @@
else
case $UPDATE_MIME_DATABASE in
[\\/]* | ?:[\\/]*)
-@@ -29839,7 +29475,7 @@
+@@ -28634,7 +28331,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_UPDATE_MIME_DATABASE="$as_dir/$ac_word$ac_exec_ext"
@@ -20355,7 +26043,7 @@
break 2
fi
done
-@@ -29852,11 +29488,11 @@
+@@ -28647,11 +28344,11 @@ esac
fi
UPDATE_MIME_DATABASE=$ac_cv_path_UPDATE_MIME_DATABASE
if test -n "$UPDATE_MIME_DATABASE"; then
@@ -20371,16 +26059,16 @@
fi
-@@ -29878,7 +29514,7 @@
-
-
-
--ac_config_files="$ac_config_files Makefile capplets/Makefile capplets/about-me/Makefile capplets/about-me/gnome-about-me.desktop.in capplets/accessibility/Makefile capplets/accessibility/at-properties/at-properties.desktop.in capplets/accessibility/at-properties/Makefile capplets/appearance/Makefile capplets/appearance/data/Makefile capplets/appearance/data/gnome-appearance-properties.desktop.in capplets/appearance/data/gnome-theme-installer.desktop.in capplets/common/Makefile capplets/default-applications/Makefile capplets/default-applications/default-applications.desktop.in capplets/default-applications/gnome-at-commandline.in capplets/default-applications/gnome-at-session.desktop.in capplets/display/Makefile capplets/display/display-properties.desktop.in capplets/keybindings/Makefile capplets/keybindings/gnome-keybindings.pc capplets/keybindings/keybinding.desktop.in capplets/keyboard/Makefile capplets/keyboard/keyboard.desktop.in capplets/mouse/Makefile capplets/mouse/gnome-settings-mouse.desktop.in capplets/network/Makefile capplets/network/gnome-network-preferences.desktop.in capplets/sound/Makefile capplets/sound/gnome-settings-sound.desktop.in capplets/windows/Makefile capplets/windows/window-properties.desktop.in help/Makefile libbackground/Makefile libslab/Makefile libslab/libslab.pc libsounds/Makefile libwindow-settings/Makefile libwindow-settings/gnome-window-settings-2.0.pc po/Makefile.in shell/Makefile shell/gnomecc.desktop.in typing-break/Makefile vfs-methods/Makefile vfs-methods/fontilus/Makefile vfs-methods/fontilus/gnome-font-viewer.desktop.in vfs-methods/themus/Makefile vfs-methods/themus/themus-theme-applier.desktop.in"
-+ac_config_files="$ac_config_files Makefile capplets/Makefile capplets/about-me/Makefile capplets/about-me/gnome-about-me.desktop.in capplets/accessibility/Makefile capplets/accessibility/at-properties/at-properties.desktop.in capplets/accessibility/at-properties/Makefile capplets/appearance/Makefile capplets/appearance/data/Makefile capplets/appearance/data/gnome-appearance-properties.desktop.in capplets/appearance/data/gnome-theme-installer.desktop.in capplets/common/Makefile capplets/default-applications/Makefile capplets/default-applications/default-applications.desktop.in capplets/default-applications/gnome-at-commandline.in capplets/default-applications/gnome-at-session.desktop.in capplets/display/Makefile capplets/display/display-properties.desktop.in capplets/keybindings/Makefile capplets/keybindings/gnome-keybindings.pc capplets/keybindings/keybinding.desktop.in capplets/keyboard/Makefile capplets/keyboard/keyboard.desktop.in capplets/mouse/Makefile capplets/mouse/gnome-settings-mouse.desktop.in capplets/network/Makefile capplets/network/gnome-network-preferences.desktop.in capplets/sound/Makefile capplets/sound/gnome-settings-sound.desktop.in capplets/windows/Makefile capplets/windows/window-properties.desktop.in help/Makefile libbackground/Makefile libsounds/Makefile libwindow-settings/Makefile libwindow-settings/gnome-window-settings-2.0.pc po/Makefile.in shell/Makefile shell/gnomecc.desktop.in typing-break/Makefile vfs-methods/Makefile vfs-methods/fontilus/Makefile vfs-methods/fontilus/gnome-font-viewer.desktop.in vfs-methods/themus/Makefile vfs-methods/themus/themus-theme-applier.desktop.in"
+@@ -28673,7 +28370,7 @@ fi
+
+
+
+-ac_config_files="$ac_config_files Makefile capplets/Makefile capplets/about-me/Makefile capplets/about-me/gnome-about-me.desktop.in capplets/accessibility/Makefile capplets/accessibility/at-properties/at-properties.desktop.in capplets/accessibility/at-properties/Makefile capplets/appearance/Makefile capplets/appearance/data/Makefile capplets/appearance/data/gnome-appearance-properties.desktop.in capplets/appearance/data/gnome-theme-installer.desktop.in capplets/common/Makefile capplets/default-applications/Makefile capplets/default-applications/default-applications.desktop.in capplets/default-applications/gnome-at-commandline.in capplets/default-applications/gnome-at-session.desktop.in capplets/default-applications/gnome-default-applications.pc capplets/display/Makefile capplets/display/display-properties.desktop.in capplets/keybindings/Makefile capplets/keybindings/gnome-keybindings.pc capplets/keybindings/keybinding.desktop.in capplets/keyboard/Makefile capplets/keyboard/keyboard.desktop.in capplets/mouse/Makefile capplets/mouse/gnome-settings-mouse.desktop.in capplets/network/Makefile capplets/network/gnome-network-preferences.desktop.in capplets/sound/Makefile capplets/sound/gnome-settings-sound.desktop.in capplets/windows/Makefile capplets/windows/window-properties.desktop.in help/Makefile libslab/Makefile libslab/libslab.pc libwindow-settings/Makefile libwindow-settings/gnome-window-settings-2.0.pc po/Makefile.in shell/Makefile shell/gnomecc.desktop.in typing-break/Makefile"
++ac_config_files="$ac_config_files Makefile capplets/Makefile capplets/about-me/Makefile capplets/about-me/gnome-about-me.desktop.in capplets/accessibility/Makefile capplets/accessibility/at-properties/at-properties.desktop.in capplets/accessibility/at-properties/Makefile capplets/appearance/Makefile capplets/appearance/data/Makefile capplets/appearance/data/gnome-appearance-properties.desktop.in capplets/appearance/data/gnome-theme-installer.desktop.in capplets/common/Makefile capplets/default-applications/Makefile capplets/default-applications/default-applications.desktop.in capplets/default-applications/gnome-at-commandline.in capplets/default-applications/gnome-at-session.desktop.in capplets/default-applications/gnome-default-applications.pc capplets/display/Makefile capplets/display/display-properties.desktop.in capplets/keybindings/Makefile capplets/keybindings/gnome-keybindings.pc capplets/keybindings/keybinding.desktop.in capplets/keyboard/Makefile capplets/keyboard/keyboard.desktop.in capplets/mouse/Makefile capplets/mouse/gnome-settings-mouse.desktop.in capplets/network/Makefile capplets/network/gnome-network-preferences.desktop.in capplets/sound/Makefile capplets/sound/gnome-settings-sound.desktop.in capplets/windows/Makefile capplets/windows/window-properties.desktop.in help/Makefile libwindow-settings/Makefile libwindow-settings/gnome-window-settings-2.0.pc po/Makefile.in shell/Makefile shell/gnomecc.desktop.in typing-break/Makefile"
cat >confcache <<\_ACEOF
-@@ -29908,12 +29544,11 @@
+@@ -28703,12 +28400,11 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -20395,7 +26083,7 @@
*) $as_unset $ac_var ;;
esac ;;
esac
-@@ -29946,12 +29581,12 @@
+@@ -28741,12 +28437,12 @@ $as_echo "$as_me: WARNING: Cache variabl
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -20412,7 +26100,7 @@
fi
fi
rm -f confcache
-@@ -29967,7 +29602,7 @@
+@@ -28762,7 +28458,7 @@ ac_ltlibobjs=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -20421,7 +26109,7 @@
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-@@ -29979,51 +29614,51 @@
+@@ -28774,51 +28470,51 @@ LTLIBOBJS=$ac_ltlibobjs
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -20487,17 +26175,25 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-@@ -30031,63 +29666,55 @@
- ac_config_commands="$ac_config_commands po/stamp-it"
-
-
+@@ -28827,76 +28523,68 @@ fi
+
+
+ if test -z "${HAVE_TYPING_BREAK_TRUE}" && test -z "${HAVE_TYPING_BREAK_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TYPING_BREAK\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_TYPING_BREAK\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"HAVE_TYPING_BREAK\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
-if test -z "${ENABLE_DYNAMIC_LIBSLAB_TRUE}" && test -z "${ENABLE_DYNAMIC_LIBSLAB_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_DYNAMIC_LIBSLAB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"ENABLE_DYNAMIC_LIBSLAB\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
++echo "$as_me: error: conditional \"HAVE_TYPING_BREAK\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
if test -z "${HAVE_RANDR_TRUE}" && test -z "${HAVE_RANDR_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_RANDR\" was never defined.
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_RANDR\" was never defined.
@@ -20540,6 +26236,15 @@
Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_GSTREAMER\" was never defined.
+echo "$as_me: error: conditional \"HAVE_GSTREAMER\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${BUILD_SOUND_TRUE}" && test -z "${BUILD_SOUND_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_SOUND\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"BUILD_SOUND\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"BUILD_SOUND\" was never defined.
++echo "$as_me: error: conditional \"BUILD_SOUND\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -20566,7 +26271,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -30100,7 +29727,7 @@
+@@ -28909,7 +28597,7 @@ ac_cs_silent=false
SHELL=\${CONFIG_SHELL-$SHELL}
_ACEOF
@@ -20575,7 +26280,7 @@
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
-@@ -30110,7 +29737,7 @@
+@@ -28919,7 +28607,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -20584,7 +26289,7 @@
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-@@ -30132,45 +29759,17 @@
+@@ -28941,45 +28629,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
@@ -20639,7 +26344,7 @@
fi
# Support unset when possible.
-@@ -30186,6 +29785,8 @@
+@@ -28995,6 +28655,8 @@ fi
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
@@ -20648,7 +26353,7 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-@@ -30208,7 +29809,7 @@
+@@ -29017,7 +28679,7 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
@@ -20657,7 +26362,7 @@
{ (exit 1); exit 1; }
fi
-@@ -30221,10 +29822,17 @@
+@@ -29030,10 +28692,17 @@ PS2='> '
PS4='+ '
# NLS nuisances.
@@ -20679,7 +26384,7 @@
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -30246,7 +29854,7 @@
+@@ -29055,7 +28724,7 @@ as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
@@ -20688,7 +26393,7 @@
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
-@@ -30297,7 +29905,7 @@
+@@ -29106,7 +28775,7 @@ $as_unset CDPATH
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
@@ -20697,7 +26402,7 @@
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
-@@ -30325,6 +29933,7 @@
+@@ -29134,6 +28803,7 @@ case `echo -n x` in
*)
ECHO_N='-n';;
esac
@@ -20705,7 +26410,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -30337,22 +29946,19 @@
+@@ -29146,22 +28816,19 @@ if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
@@ -20739,7 +26444,7 @@
else
as_ln_s='cp -p'
fi
-@@ -30377,10 +29983,10 @@
+@@ -29186,10 +28853,10 @@ else
as_test_x='
eval sh -c '\''
if test -d "$1"; then
@@ -20752,16 +26457,16 @@
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
-@@ -30403,7 +30009,7 @@
+@@ -29212,7 +28879,7 @@ exec 6>&1
# values after options handling.
ac_log="
- This file was extended by gnome-control-center $as_me 2.22.2.1, which was
+ This file was extended by gnome-control-center $as_me 2.24.0.1, which was
-generated by GNU Autoconf 2.62. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -30416,7 +30022,7 @@
+@@ -29225,7 +28892,7 @@ on `(hostname || uname -n) 2>/dev/null |
_ACEOF
@@ -20770,7 +26475,7 @@
# Files that config.status was made for.
config_files="$ac_config_files"
config_headers="$ac_config_headers"
-@@ -30424,7 +30030,7 @@
+@@ -29233,7 +28900,7 @@ config_commands="$ac_config_commands"
_ACEOF
@@ -20779,7 +26484,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -30437,9 +30043,9 @@
+@@ -29246,9 +28913,9 @@ Usage: $0 [OPTIONS] [FILE]...
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE]
@@ -20791,14 +26496,14 @@
Configuration files:
$config_files
-@@ -30453,13 +30059,13 @@
+@@ -29262,13 +28929,13 @@ $config_commands
Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
- gnome-control-center config.status 2.22.2.1
+ gnome-control-center config.status 2.24.0.1
-configured by $0, generated by GNU Autoconf 2.62,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.61,
@@ -20809,7 +26514,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -30467,12 +30073,11 @@
+@@ -29276,12 +28943,11 @@ ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
MKDIR_P='$MKDIR_P'
@@ -20825,7 +26530,7 @@
ac_need_defaults=:
while test $# != 0
do
-@@ -30494,36 +30099,30 @@
+@@ -29303,36 +28969,30 @@ do
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
@@ -20868,7 +26573,7 @@
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; } ;;
-@@ -30542,29 +30141,27 @@
+@@ -29351,29 +29011,27 @@ if $ac_cs_silent; then
fi
_ACEOF
@@ -20905,7 +26610,7 @@
#
# INIT-COMMANDS
#
-@@ -30576,7 +30173,7 @@
+@@ -29382,7 +29040,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac
_ACEOF
@@ -20914,17 +26619,17 @@
# Handling of arguments.
for ac_config_target in $ac_config_targets
-@@ -30619,8 +30216,6 @@
+@@ -29424,8 +29082,6 @@ do
+ "capplets/windows/Makefile") CONFIG_FILES="$CONFIG_FILES capplets/windows/Makefile" ;;
"capplets/windows/window-properties.desktop.in") CONFIG_FILES="$CONFIG_FILES capplets/windows/window-properties.desktop.in" ;;
"help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
- "libbackground/Makefile") CONFIG_FILES="$CONFIG_FILES libbackground/Makefile" ;;
- "libslab/Makefile") CONFIG_FILES="$CONFIG_FILES libslab/Makefile" ;;
- "libslab/libslab.pc") CONFIG_FILES="$CONFIG_FILES libslab/libslab.pc" ;;
- "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" ;;
-@@ -30635,8 +30230,8 @@
- "vfs-methods/themus/themus-theme-applier.desktop.in") CONFIG_FILES="$CONFIG_FILES vfs-methods/themus/themus-theme-applier.desktop.in" ;;
+ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+@@ -29434,8 +29090,8 @@ do
+ "typing-break/Makefile") CONFIG_FILES="$CONFIG_FILES typing-break/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -20934,7 +26639,7 @@
{ (exit 1); exit 1; }; };;
esac
done
-@@ -30677,143 +30272,407 @@
+@@ -29476,143 +29132,388 @@ $debug ||
(umask 077 && mkdir "$tmp")
} ||
{
@@ -21138,6 +26843,9 @@
+DISTCHECK_CONFIGURE_FLAGS!$DISTCHECK_CONFIGURE_FLAGS$ac_delim
+HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim
+HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim
++INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
++INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
++INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
+INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
+INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
+INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
@@ -21160,9 +26868,6 @@
+XGETTEXT!$XGETTEXT$ac_delim
+MSGMERGE!$MSGMERGE$ac_delim
+MSGFMT!$MSGFMT$ac_delim
-+INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
-+INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
-+INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
+INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
+ALL_LINGUAS!$ALL_LINGUAS$ac_delim
+DATADIRNAME!$DATADIRNAME$ac_delim
@@ -21190,6 +26895,8 @@
+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
+TYPING_BREAK!$TYPING_BREAK$ac_delim
+SCREENSAVER_LIBS!$SCREENSAVER_LIBS$ac_delim
++HAVE_TYPING_BREAK_TRUE!$HAVE_TYPING_BREAK_TRUE$ac_delim
++HAVE_TYPING_BREAK_FALSE!$HAVE_TYPING_BREAK_FALSE$ac_delim
+XF86MISC_LIBS!$XF86MISC_LIBS$ac_delim
+CAPPLET_CFLAGS!$CAPPLET_CFLAGS$ac_delim
+CAPPLET_LIBS!$CAPPLET_LIBS$ac_delim
@@ -21199,8 +26906,6 @@
+GNOME_LIBS!$GNOME_LIBS$ac_delim
+DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim
+DBUS_LIBS!$DBUS_LIBS$ac_delim
-+VFS_CAPPLET_CFLAGS!$VFS_CAPPLET_CFLAGS$ac_delim
-+VFS_CAPPLET_LIBS!$VFS_CAPPLET_LIBS$ac_delim
+GNOME_DESKTOP_CFLAGS!$GNOME_DESKTOP_CFLAGS$ac_delim
+GNOME_DESKTOP_LIBS!$GNOME_DESKTOP_LIBS$ac_delim
+DEFAULT_APPLICATIONS_CAPPLET_CFLAGS!$DEFAULT_APPLICATIONS_CAPPLET_CFLAGS$ac_delim
@@ -21211,11 +26916,11 @@
+SLAB_LIBS!$SLAB_LIBS$ac_delim
+TYPING_CFLAGS!$TYPING_CFLAGS$ac_delim
+TYPING_LIBS!$TYPING_LIBS$ac_delim
-+LIBBACKGROUND_CFLAGS!$LIBBACKGROUND_CFLAGS$ac_delim
-+LIBBACKGROUND_LIBS!$LIBBACKGROUND_LIBS$ac_delim
-+LIBSOUNDS_CFLAGS!$LIBSOUNDS_CFLAGS$ac_delim
-+LIBSOUNDS_LIBS!$LIBSOUNDS_LIBS$ac_delim
+GSD_DBUS_CFLAGS!$GSD_DBUS_CFLAGS$ac_delim
++GSD_DBUS_LIBS!$GSD_DBUS_LIBS$ac_delim
++GIO_CFLAGS!$GIO_CFLAGS$ac_delim
++GIO_LIBS!$GIO_LIBS$ac_delim
++GTK_ENGINE_DIR!$GTK_ENGINE_DIR$ac_delim
+_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
@@ -21333,7 +27038,6 @@
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
-+GSD_DBUS_LIBS!$GSD_DBUS_LIBS$ac_delim
+FONT_CAPPLET_CFLAGS!$FONT_CAPPLET_CFLAGS$ac_delim
+FONT_CAPPLET_LIBS!$FONT_CAPPLET_LIBS$ac_delim
+AT_CAPPLET_CFLAGS!$AT_CAPPLET_CFLAGS$ac_delim
@@ -21350,26 +27054,6 @@
+LIBGNOMEKBD_LIBS!$LIBGNOMEKBD_LIBS$ac_delim
+LIBGNOMEKBDUI_CFLAGS!$LIBGNOMEKBDUI_CFLAGS$ac_delim
+LIBGNOMEKBDUI_LIBS!$LIBGNOMEKBDUI_LIBS$ac_delim
-+THEME_METHOD_CFLAGS!$THEME_METHOD_CFLAGS$ac_delim
-+THEME_METHOD_LIBS!$THEME_METHOD_LIBS$ac_delim
-+THEMUS_THUMBNAILER_CFLAGS!$THEMUS_THUMBNAILER_CFLAGS$ac_delim
-+THEMUS_THUMBNAILER_LIBS!$THEMUS_THUMBNAILER_LIBS$ac_delim
-+THEMUS_COMPONENT_CFLAGS!$THEMUS_COMPONENT_CFLAGS$ac_delim
-+THEMUS_COMPONENT_LIBS!$THEMUS_COMPONENT_LIBS$ac_delim
-+THEMUS_APPLIER_CFLAGS!$THEMUS_APPLIER_CFLAGS$ac_delim
-+THEMUS_APPLIER_LIBS!$THEMUS_APPLIER_LIBS$ac_delim
-+FONT_METHOD_CFLAGS!$FONT_METHOD_CFLAGS$ac_delim
-+FONT_METHOD_LIBS!$FONT_METHOD_LIBS$ac_delim
-+FONT_THUMBNAILER_CFLAGS!$FONT_THUMBNAILER_CFLAGS$ac_delim
-+FONT_THUMBNAILER_LIBS!$FONT_THUMBNAILER_LIBS$ac_delim
-+FONT_CONTEXT_MENU_CFLAGS!$FONT_CONTEXT_MENU_CFLAGS$ac_delim
-+FONT_CONTEXT_MENU_LIBS!$FONT_CONTEXT_MENU_LIBS$ac_delim
-+FONT_VIEW_CFLAGS!$FONT_VIEW_CFLAGS$ac_delim
-+FONT_VIEW_LIBS!$FONT_VIEW_LIBS$ac_delim
-+FREETYPE_CONFIG!$FREETYPE_CONFIG$ac_delim
-+THEMUS!$THEMUS$ac_delim
-+FONTILUS!$FONTILUS$ac_delim
-+NAUTILUSDIR!$NAUTILUSDIR$ac_delim
+LIBEBOOK_CFLAGS!$LIBEBOOK_CFLAGS$ac_delim
+LIBEBOOK_LIBS!$LIBEBOOK_LIBS$ac_delim
+BUILD_ABOUTME_TRUE!$BUILD_ABOUTME_TRUE$ac_delim
@@ -21382,14 +27066,16 @@
+GCONF_SCHEMA_FILE_DIR!$GCONF_SCHEMA_FILE_DIR$ac_delim
+GCONF_SCHEMAS_INSTALL_TRUE!$GCONF_SCHEMAS_INSTALL_TRUE$ac_delim
+GCONF_SCHEMAS_INSTALL_FALSE!$GCONF_SCHEMAS_INSTALL_FALSE$ac_delim
-+ESD_CFLAGS!$ESD_CFLAGS$ac_delim
-+ESD_LIBS!$ESD_LIBS$ac_delim
+GST_CFLAGS!$GST_CFLAGS$ac_delim
+GST_LIBS!$GST_LIBS$ac_delim
+HAVE_GSTREAMER_TRUE!$HAVE_GSTREAMER_TRUE$ac_delim
+HAVE_GSTREAMER_FALSE!$HAVE_GSTREAMER_FALSE$ac_delim
++CANBERRA_CFLAGS!$CANBERRA_CFLAGS$ac_delim
++CANBERRA_LIBS!$CANBERRA_LIBS$ac_delim
+SOUND_CAPPLET_LIBS!$SOUND_CAPPLET_LIBS$ac_delim
+SOUND_CAPPLET_CFLAGS!$SOUND_CAPPLET_CFLAGS$ac_delim
++BUILD_SOUND_TRUE!$BUILD_SOUND_TRUE$ac_delim
++BUILD_SOUND_FALSE!$BUILD_SOUND_FALSE$ac_delim
+GNOMECC_CAPPLETS_EXTRA_DIST!$GNOMECC_CAPPLETS_EXTRA_DIST$ac_delim
+GNOMECC_CAPPLETS_CLEANFILES!$GNOMECC_CAPPLETS_CLEANFILES$ac_delim
+GNOMECC_CAPPLETS_CFLAGS!$GNOMECC_CAPPLETS_CFLAGS$ac_delim
@@ -21409,7 +27095,7 @@
- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 47; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -21450,7 +27136,7 @@
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
-@@ -30829,133 +30688,19 @@
+@@ -29628,133 +29529,19 @@ s/^[^=]*=[ ]*$//
}'
fi
@@ -21489,7 +27175,7 @@
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any. Preserve backslash
-# newline sequences.
-
+-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
@@ -21569,7 +27255,7 @@
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
- { (exit 1); exit 1; }; }
-fi # test -n "$CONFIG_HEADERS"
--
+
-
-eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
-shift
@@ -21588,7 +27274,7 @@
{ (exit 1); exit 1; }; };;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-@@ -30984,38 +30729,26 @@
+@@ -29783,38 +29570,26 @@ $as_echo "$as_me: error: Invalid tag $ac
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -21635,7 +27321,7 @@
esac
;;
esac
-@@ -31025,7 +30758,7 @@
+@@ -29824,7 +29599,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
@@ -21644,7 +27330,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -31051,7 +30784,7 @@
+@@ -29850,7 +29625,7 @@ $as_echo X"$ac_file" |
as_dirs=
while :; do
case $as_dir in #(
@@ -21653,7 +27339,7 @@
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
-@@ -31060,7 +30793,7 @@
+@@ -29859,7 +29634,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
@@ -21662,7 +27348,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -31081,17 +30814,17 @@
+@@ -29880,17 +29655,17 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -21684,7 +27370,7 @@
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -31136,13 +30869,12 @@
+@@ -29935,13 +29710,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
esac
_ACEOF
@@ -21700,7 +27386,7 @@
p
q
}
-@@ -31151,14 +30883,13 @@
+@@ -29950,14 +29724,13 @@ ac_sed_dataroot='
/@infodir@/p
/@localedir@/p
/@mandir@/p
@@ -21719,7 +27405,7 @@
ac_datarootdir_hack='
s&@datadir@&$datadir&g
s&@docdir@&$docdir&g
-@@ -31172,16 +30903,15 @@
+@@ -29971,16 +29744,15 @@ _ACEOF
# Neutralize VPATH when `$srcdir' = `.'.
# Shell code in configure.ac might set extrasub.
# FIXME: do we really want to maintain this feature?
@@ -21740,7 +27426,7 @@
s&@srcdir@&$ac_srcdir&;t t
s&@abs_srcdir@&$ac_abs_srcdir&;t t
s&@top_srcdir@&$ac_top_srcdir&;t t
-@@ -31192,60 +30922,121 @@
+@@ -29991,60 +29763,121 @@ s&@abs_top_builddir@&$ac_abs_top_builddi
s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
@@ -21866,42 +27552,38 @@
- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-- else
++ echo "/* $configure_input */" >"$tmp/config.h"
++ cat "$ac_result" >>"$tmp/config.h"
++ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
++ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
++echo "$as_me: $ac_file is unchanged" >&6;}
+ else
- rm -f "$ac_file"
- mv "$tmp/config.h" "$ac_file" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
-- fi
-- else
++ rm -f $ac_file
++ mv "$tmp/config.h" $ac_file
+ fi
+ else
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
- { (exit 1); exit 1; }; }
-- fi
++ echo "/* $configure_input */"
++ cat "$ac_result"
+ fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-+ echo "/* $configure_input */" >"$tmp/config.h"
-+ cat "$ac_result" >>"$tmp/config.h"
-+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-+ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-+echo "$as_me: $ac_file is unchanged" >&6;}
-+ else
-+ rm -f $ac_file
-+ mv "$tmp/config.h" $ac_file
-+ fi
-+ else
-+ echo "/* $configure_input */"
-+ cat "$ac_result"
-+ fi
+ rm -f "$tmp/out12"
+# Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
-@@ -31260,7 +31051,7 @@
+@@ -30059,7 +29892,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^
X"$_am_arg" : 'X\(//\)[^/]' \| \
X"$_am_arg" : 'X\(//\)$' \| \
X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
@@ -21910,7 +27592,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -31280,8 +31071,8 @@
+@@ -30079,8 +29912,8 @@ $as_echo X"$_am_arg" |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -21921,7 +27603,7 @@
;;
esac
-@@ -31303,7 +31094,7 @@
+@@ -30102,7 +29935,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
@@ -21930,7 +27612,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -31347,7 +31138,7 @@
+@@ -30146,7 +29979,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
X"$file" : 'X\(/\)' \| . 2>/dev/null ||
@@ -21939,7 +27621,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -31373,7 +31164,7 @@
+@@ -30172,7 +30005,7 @@ $as_echo X"$file" |
as_dirs=
while :; do
case $as_dir in #(
@@ -21948,7 +27630,7 @@
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
-@@ -31382,7 +31173,7 @@
+@@ -30181,7 +30014,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
@@ -21957,7 +27639,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -31403,8 +31194,8 @@
+@@ -30202,8 +30035,8 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -21968,7 +27650,7 @@
{ (exit 1); exit 1; }; }; }
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
-@@ -31441,8 +31232,8 @@
+@@ -30223,8 +30056,8 @@ done
"$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
if test ! -f "po/Makefile"; then
@@ -21979,7 +27661,7 @@
{ (exit 1); exit 1; }; }
fi
mv "po/Makefile" "po/Makefile.tmp"
-@@ -31464,11 +31255,6 @@
+@@ -30246,11 +30079,6 @@ _ACEOF
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
@@ -21991,7 +27673,7 @@
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
-@@ -31490,8 +31276,4 @@
+@@ -30272,8 +30100,4 @@ if test "$no_create" != yes; then
# would make configure fail if this is the last instruction.
$ac_cs_success || { (exit 1); exit 1; }
fi
@@ -22000,19 +27682,20 @@
-$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/help/Makefile.in control-center-2.22.2.1/help/Makefile.in
---- control-center-2.22.2.1.old/help/Makefile.in 1974-05-20 03:44:10.000000000 +0100
-+++ control-center-2.22.2.1/help/Makefile.in 2008-05-29 10:35:14.000000000 +0200
-@@ -195,8 +195,6 @@
+Index: gnome-control-center-2.24.0.1/help/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/help/Makefile.in 2008-09-24 18:41:38.000000000 +0200
++++ gnome-control-center-2.24.0.1/help/Makefile.in 2008-12-28 13:26:35.007855187 +0100
+@@ -186,8 +186,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -232,6 +230,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -220,6 +218,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -22021,7 +27704,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -311,7 +311,6 @@
+@@ -288,7 +288,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -22029,19 +27712,20 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/libbackground/Makefile.in control-center-2.22.2.1/libbackground/Makefile.in
---- control-center-2.22.2.1.old/libbackground/Makefile.in 1974-05-20 03:44:10.000000000 +0100
-+++ control-center-2.22.2.1/libbackground/Makefile.in 2008-05-29 10:35:14.000000000 +0200
-@@ -189,8 +189,6 @@
+Index: gnome-control-center-2.24.0.1/libwindow-settings/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/libwindow-settings/Makefile.in 2008-12-28 13:23:47.336356785 +0100
++++ gnome-control-center-2.24.0.1/libwindow-settings/Makefile.in 2008-12-28 13:26:35.203855167 +0100
+@@ -215,8 +215,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -226,6 +224,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -249,6 +247,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -22050,76 +27734,23 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -305,7 +305,6 @@
+@@ -317,10 +317,9 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
- EXTRA_DIST = ChangeLog
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/libsounds/Makefile.in control-center-2.22.2.1/libsounds/Makefile.in
---- control-center-2.22.2.1.old/libsounds/Makefile.in 1974-05-20 03:44:11.000000000 +0100
-+++ control-center-2.22.2.1/libsounds/Makefile.in 2008-05-29 10:35:15.000000000 +0200
-@@ -191,8 +191,6 @@
- LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
--LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
- LIBTOOL = @LIBTOOL@
-@@ -228,6 +226,8 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-+SLAB_CFLAGS = @SLAB_CFLAGS@
-+SLAB_LIBS = @SLAB_LIBS@
- SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
- SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
- STRIP = @STRIP@
-@@ -307,7 +307,6 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- noinst_LTLIBRARIES = libsounds.la
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/libwindow-settings/Makefile.in control-center-2.22.2.1/libwindow-settings/Makefile.in
---- control-center-2.22.2.1.old/libwindow-settings/Makefile.in 2008-05-29 10:34:07.000000000 +0200
-+++ control-center-2.22.2.1/libwindow-settings/Makefile.in 2008-05-29 10:35:16.000000000 +0200
-@@ -224,8 +224,6 @@
- LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
--LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
- LIBTOOL = @LIBTOOL@
-@@ -261,6 +259,8 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-+SLAB_CFLAGS = @SLAB_CFLAGS@
-+SLAB_LIBS = @SLAB_LIBS@
- SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
- SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
- STRIP = @STRIP@
-@@ -340,7 +340,6 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- WM_MODULE_DIR = $(libdir)/libgnome-window-settings1
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/ltmain.sh control-center-2.22.2.1/ltmain.sh
---- control-center-2.22.2.1.old/ltmain.sh 1974-04-03 21:10:50.000000000 +0100
-+++ control-center-2.22.2.1/ltmain.sh 2008-04-29 23:33:55.000000000 +0200
-@@ -43,8 +43,8 @@
+-WM_MODULE_DIR = $(libdir)/window-manager-settings
++WM_MODULE_DIR = $(libdir)/libgnome-window-settings1
+ INCLUDES = \
+ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+ -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" \
+Index: gnome-control-center-2.24.0.1/ltmain.sh
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/ltmain.sh 2008-09-10 04:31:44.000000000 +0200
++++ gnome-control-center-2.24.0.1/ltmain.sh 2008-04-29 22:21:21.000000000 +0200
+@@ -43,8 +43,8 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
@@ -22130,7 +27761,7 @@
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -2135,7 +2135,10 @@
+@@ -2135,7 +2135,10 @@ EOF
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -22142,7 +27773,7 @@
esac
fi
if test "$pass" = dlopen; then
-@@ -3269,6 +3272,11 @@
+@@ -3269,6 +3272,11 @@ EOF
revision="$number_minor"
lt_irix_increment=no
;;
@@ -22154,19 +27785,30 @@
esac
;;
no)
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/Makefile.in control-center-2.22.2.1/Makefile.in
---- control-center-2.22.2.1.old/Makefile.in 1974-05-20 03:44:14.000000000 +0100
-+++ control-center-2.22.2.1/Makefile.in 2008-05-29 10:35:19.000000000 +0200
-@@ -198,8 +198,6 @@
+Index: gnome-control-center-2.24.0.1/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/Makefile.in 2008-09-24 18:41:38.000000000 +0200
++++ gnome-control-center-2.24.0.1/Makefile.in 2008-12-28 13:26:35.775855241 +0100
+@@ -61,8 +61,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
+ distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = po libwindow-settings libslab capplets shell help \
+- typing-break
++DIST_SUBDIRS = po libwindow-settings capplets shell help typing-break
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+@@ -191,8 +190,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -235,6 +233,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -225,6 +222,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -22175,22 +27817,24 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -314,10 +314,9 @@
+@@ -293,11 +292,9 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
--SUBDIRS = po libsounds libbackground libwindow-settings libslab capplets shell help vfs-methods $(TYPING_BREAK)
-+SUBDIRS = po libsounds libbackground libwindow-settings capplets shell help vfs-methods $(TYPING_BREAK)
+-SUBDIRS = po libwindow-settings libslab capplets shell help \
+- $(am__append_1)
++SUBDIRS = po libwindow-settings capplets shell help $(am__append_1)
DISTCLEANFILES = \
- gnome-doc-utils.make \
- intltool-extract \
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/shell/Makefile.in control-center-2.22.2.1/shell/Makefile.in
---- control-center-2.22.2.1.old/shell/Makefile.in 1974-05-20 03:44:12.000000000 +0100
-+++ control-center-2.22.2.1/shell/Makefile.in 2008-05-29 10:35:16.000000000 +0200
-@@ -54,7 +54,7 @@
+ gnome-doc-utils.make
+
+Index: gnome-control-center-2.24.0.1/shell/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/shell/Makefile.in 2008-09-24 18:41:38.000000000 +0200
++++ gnome-control-center-2.24.0.1/shell/Makefile.in 2008-12-28 13:26:35.371855011 +0100
+@@ -54,7 +54,7 @@ am_gnome_control_center_OBJECTS = contro
gnome_control_center_OBJECTS = $(am_gnome_control_center_OBJECTS)
am__DEPENDENCIES_1 =
gnome_control_center_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -22199,16 +27843,16 @@
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@@ -209,8 +209,6 @@
+@@ -200,8 +200,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -246,6 +244,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -234,6 +232,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -22217,7 +27861,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -325,11 +325,10 @@
+@@ -302,11 +302,10 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -22230,7 +27874,7 @@
$(GNOMECC_CFLAGS)
gnome_control_center_SOURCES = \
-@@ -337,7 +336,7 @@
+@@ -314,7 +313,7 @@ gnome_control_center_SOURCES = \
gnome_control_center_LDADD = \
$(GNOMECC_LIBS) \
@@ -22239,19 +27883,20 @@
AM_CPPFLAGS = \
-DGNOMELOCALEDIR="\"$(datadir)/locale\""
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/typing-break/Makefile.in control-center-2.22.2.1/typing-break/Makefile.in
---- control-center-2.22.2.1.old/typing-break/Makefile.in 1974-05-20 03:44:12.000000000 +0100
-+++ control-center-2.22.2.1/typing-break/Makefile.in 2008-05-29 10:35:17.000000000 +0200
-@@ -215,8 +215,6 @@
+Index: gnome-control-center-2.24.0.1/typing-break/Makefile.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/typing-break/Makefile.in 2008-09-24 18:41:38.000000000 +0200
++++ gnome-control-center-2.24.0.1/typing-break/Makefile.in 2008-12-28 13:26:35.580355393 +0100
+@@ -206,8 +206,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
-LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
LIBTOOL = @LIBTOOL@
-@@ -252,6 +250,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -240,6 +238,8 @@ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -22260,7 +27905,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -331,7 +331,6 @@
+@@ -308,7 +308,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -22268,90 +27913,3 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
gnome_typing_monitor_SOURCES = \
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/vfs-methods/fontilus/Makefile.in control-center-2.22.2.1/vfs-methods/fontilus/Makefile.in
---- control-center-2.22.2.1.old/vfs-methods/fontilus/Makefile.in 1974-05-20 03:44:13.000000000 +0100
-+++ control-center-2.22.2.1/vfs-methods/fontilus/Makefile.in 2008-05-29 10:35:18.000000000 +0200
-@@ -237,8 +237,6 @@
- LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
--LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
- LIBTOOL = @LIBTOOL@
-@@ -274,6 +272,8 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-+SLAB_CFLAGS = @SLAB_CFLAGS@
-+SLAB_LIBS = @SLAB_LIBS@
- SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
- SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
- STRIP = @STRIP@
-@@ -353,7 +353,6 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = $(FONT_METHOD_CFLAGS) $(FONT_THUMBNAILER_CFLAGS) $(FONT_VIEW_CFLAGS) \
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/vfs-methods/Makefile.in control-center-2.22.2.1/vfs-methods/Makefile.in
---- control-center-2.22.2.1.old/vfs-methods/Makefile.in 1974-05-20 03:44:13.000000000 +0100
-+++ control-center-2.22.2.1/vfs-methods/Makefile.in 2008-05-29 10:35:17.000000000 +0200
-@@ -182,8 +182,6 @@
- LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
--LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
- LIBTOOL = @LIBTOOL@
-@@ -219,6 +217,8 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-+SLAB_CFLAGS = @SLAB_CFLAGS@
-+SLAB_LIBS = @SLAB_LIBS@
- SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
- SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
- STRIP = @STRIP@
-@@ -298,7 +298,6 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = $(THEMUS) $(FONTILUS)
-diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.22.2.1.old/vfs-methods/themus/Makefile.in control-center-2.22.2.1/vfs-methods/themus/Makefile.in
---- control-center-2.22.2.1.old/vfs-methods/themus/Makefile.in 1974-05-20 03:44:13.000000000 +0100
-+++ control-center-2.22.2.1/vfs-methods/themus/Makefile.in 2008-05-29 10:35:18.000000000 +0200
-@@ -248,8 +248,6 @@
- LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
--LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBSOUNDS_CFLAGS = @LIBSOUNDS_CFLAGS@
- LIBSOUNDS_LIBS = @LIBSOUNDS_LIBS@
- LIBTOOL = @LIBTOOL@
-@@ -285,6 +283,8 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-+SLAB_CFLAGS = @SLAB_CFLAGS@
-+SLAB_LIBS = @SLAB_LIBS@
- SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
- SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
- STRIP = @STRIP@
-@@ -364,7 +364,6 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = $(THEME_METHOD_CFLAGS) \
Added: desktop/experimental/control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/patches/series?rev=18034&op=file
==============================================================================
--- desktop/experimental/control-center/debian/patches/series (added)
+++ desktop/experimental/control-center/debian/patches/series Sun Dec 28 13:23:12 2008
@@ -1,0 +1,5 @@
+01_fix_libslab_build.patch
+03_a11y_logout.patch
+04_path_xtra.patch
+25_window_manager_settings.patch
+70_relibtoolize.patch
Modified: desktop/experimental/control-center/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/rules?rev=18034&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/rules (original)
+++ desktop/experimental/control-center/debian/rules Sun Dec 28 13:23:12 2008
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
@@ -35,9 +35,6 @@
clean::
rm -f $(DEB_INSTALL_MANPAGES_gnome-control-center)
-install/capplets-data::
- rm -rf debian/tmp/etc/gconf/schemas/control-center.schemas
-
binary-post-install/capplets-data::
rm -rf debian/capplets-data/usr/share/applications/mimeinfo.cache
dh_installmime -p$(cdbs_curpkg)
More information about the pkg-gnome-commits
mailing list