--- gnome-control-center-2.24.0.1.orig/debian/gnome-control-center.dirs
+++ gnome-control-center-2.24.0.1/debian/gnome-control-center.dirs
@@ -0,0 +1 @@
+usr/share/themes/metacity-1
--- gnome-control-center-2.24.0.1.orig/debian/libgnome-window-settings-dev.install
+++ gnome-control-center-2.24.0.1/debian/libgnome-window-settings-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/libgnome-window-settings.so
+debian/tmp/usr/include/gnome-window-settings-2.0
+debian/tmp/usr/lib/pkgconfig/gnome-window-settings-2.0.pc
--- gnome-control-center-2.24.0.1.orig/debian/control-center2.xpm
+++ gnome-control-center-2.24.0.1/debian/control-center2.xpm
@@ -0,0 +1,186 @@
+/* XPM */
+static char *control-center2[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 148 2",
+" c #000000",
+". c #02070C",
+"X c #04080A",
+"o c #080807",
+"O c #0C0C0B",
+"+ c #010C16",
+"@ c #090C10",
+"# c #0C1217",
+"$ c #100F0F",
+"% c #11100F",
+"& c #151514",
+"* c #141619",
+"= c #17191B",
+"- c #191816",
+"; c #1B1C1C",
+": c #0C263E",
+"> c #192023",
+", c #1B252D",
+"< c #172B3B",
+"1 c #192B3C",
+"2 c #22211E",
+"3 c #232525",
+"4 c #242529",
+"5 c #21282B",
+"6 c #292824",
+"7 c #2C2B29",
+"8 c #2B2E31",
+"9 c #24313F",
+"0 c #2D3135",
+"q c #2F363B",
+"w c #2F393B",
+"e c #302E2C",
+"r c #34322F",
+"t c #333333",
+"y c #363B3F",
+"u c #3B3A35",
+"i c #3A3A39",
+"p c #0B2946",
+"a c #112C42",
+"s c #1E3344",
+"d c #1C364C",
+"f c #2C3A42",
+"g c #343E47",
+"h c #2F4658",
+"j c #32414B",
+"k c #3C4042",
+"l c #334453",
+"z c #264662",
+"x c #304D67",
+"c c #395168",
+"v c #413D39",
+"b c #42413E",
+"n c #41484E",
+"m c #4A4741",
+"M c #4B4945",
+"N c #4F4D4A",
+"B c #4D565D",
+"V c #555146",
+"C c #52514F",
+"Z c #50585E",
+"A c #595754",
+"S c #5E5C57",
+"D c #585858",
+"F c #455767",
+"G c #43596A",
+"H c #486278",
+"J c #5B6869",
+"K c #576B76",
+"L c #586B79",
+"P c #63615D",
+"I c #656462",
+"U c #6A6760",
+"Y c #6B6A65",
+"T c #6E6E6C",
+"R c #6A737B",
+"E c #73716C",
+"W c #747370",
+"Q c #7E7C74",
+"! c #7E7D7A",
+"~ c #5D758B",
+"^ c #667C8E",
+"/ c #637D94",
+"( c #6E8395",
+") c #6C8499",
+"_ c #708597",
+"` c #71879B",
+"' c #74899A",
+"] c #7B8D9D",
+"[ c #758DA2",
+"{ c #7B93A7",
+"} c #86847E",
+"| c #858482",
+" . c #8A8782",
+".. c #8C8A85",
+"X. c #8C8C8B",
+"o. c #838F9A",
+"O. c #80919D",
+"+. c #908E86",
+"@. c #918F89",
+"#. c #94938D",
+"$. c #9A968E",
+"%. c #999791",
+"&. c #9C9A94",
+"*. c #8597A6",
+"=. c #859AAC",
+"-. c #8A99A6",
+";. c #899DAF",
+":. c #859EB4",
+">. c #8DA3B4",
+",. c #8FA5B8",
+"<. c #99A4AE",
+"1. c #97A7B6",
+"2. c #90A7B9",
+"3. c #9CADBC",
+"4. c #A29E97",
+"5. c #A5A29B",
+"6. c #ACA9A3",
+"7. c #B1AFA7",
+"8. c #B4B2AB",
+"9. c #B9B6AE",
+"0. c #BCB9B3",
+"q. c #99AEC1",
+"w. c #A0B2C2",
+"e. c #ACBBC9",
+"r. c #BDCBD7",
+"t. c #C2BEB2",
+"y. c #C6C3BC",
+"u. c #CAC6BE",
+"i. c #CCC8BE",
+"p. c #CCC9C2",
+"a. c #D1CDC5",
+"s. c #D2CFC8",
+"d. c #D4D0C7",
+"f. c #D5D2CB",
+"g. c #D9D6CD",
+"h. c #DCD8CF",
+"j. c #D6D5D3",
+"k. c #D9D6D1",
+"l. c #DDDAD5",
+"z. c #DBDCDB",
+"x. c #E2DFD7",
+"c. c #E1DFDA",
+"v. c #E5E2DD",
+"b. c #E5E5E2",
+"n. c #E9E7E1",
+"m. c #EFEEEE",
+"M. c #F1F0EC",
+"N. c None",
+/* pixels */
+"N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.",
+"N.N.N.N.N.N.N.N.N. N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.",
+"N.N.N.N.N.N. N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.",
+"N.N.N.N. I W ; N.N.N.N.N.N.N. X # N.N.N.N.N.N.",
+"N.N.N.N. - % ..z.8.U & N.N.N.N.N. X B X.t N.N.N.N.N.",
+"N.N.N. O o & I y.s.! O N.N.N. F j.z.8.7 N.N.N.N.",
+"N.N. A k.8.- N.N. . F k.x.j.7.g o N.N.N.N.",
+" N. O O P l.6.O N.N. k z.b.b.l.E @ N.N.N.N.",
+" X.&.* C p.t...O N. D m.b.v.#.* N.N.N.N.N.",
+" ! z.%.i I l.x.9.| ; o N. T M.l.&.5 N.N.N.N.N.N.",
+" & &.b.j.n.x.t.5.y.0.+.m O i g.0.Q t N.N.N.N.N.N.N.",
+" & | z.f.#.m S 0.f.s.p.%.r o 3 0.&.e N.N.N.N.N.N.N.",
+" o ; 7 $ o v $.g.g.a.i.#.P W - N.N. N.N.N.N.N.N.",
+"N. $ Y p.x.p.a.p.$.u o N.N.N.",
+"N.N. o v 5.l.l.p.d.a.+.u o N.N.N.",
+"N.N.N. O v Y u.v.h.i.d.u.} ; o ",
+"N.N.N.N. o C Q 6 r #.x.v.d.i.d.t.U 2 ",
+"N.N.N.N.N.N. N. o y R n V V O $ M 0.n.v.i.i.s.8.Y - ",
+"N.N.N.N.N.N.N.N. 3 R *.;.{ F 4 ; E f.n.h.i.i.9.%.2 ",
+"N.N.N.N.N.N.N. 8 o.] ) ;./ z + t .x.v.8.v &.Y ",
+"N.N.N.N.N.N. 0 ] ) [ 2.=.x p + O M 6.0...p.P ",
+"N.N.N.N.N. q *.( ' ;.2.c : 1 N. 2 U 4.Q - ",
+"N.N.N.N. t *.) [ :.2.H : l 4 N.N. O o ",
+"N.N.N. 3 <.' [ >.2.~ : s k O N.N.N. ",
+"N.N.N.o R 1.*.q.q./ a 1 g * N.N.N.N.N.N. ",
+"N.N.N.* e.e.r.e.) d a g - N.N.N.N.N.N.N.N.N. ",
+"N.N. , e.w.3.` h < j ; N.N.N.N.N.N.N.N.N.N.N. ",
+"N.N.N.* ] ' / L g f > N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.",
+"N.N.N. 9 G L J w & N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.",
+"N.N.N.N. @ > ; O N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.",
+"N.N.N.N.N. N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.",
+"N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N."
+};
--- gnome-control-center-2.24.0.1.orig/debian/gnome-control-center.manpages
+++ gnome-control-center-2.24.0.1/debian/gnome-control-center.manpages
@@ -0,0 +1 @@
+debian/gnome-keyboard-properties.1
--- gnome-control-center-2.24.0.1.orig/debian/gnome-control-center.sgml
+++ gnome-control-center-2.24.0.1/debian/gnome-control-center.sgml
@@ -0,0 +1,313 @@
+Arnaud">
+ Patard">
+ Mars 22, 2004">
+ 1">
+ arnaud.patard@rtp-net.org">
+
+ gnome-control-center">
+
+
+ Debian">
+ GNU">
+ GPL">
+]>
+
+
+
+
+ &dhemail;
+
+
+ &dhfirstname;
+ &dhsurname;
+
+
+ 2004
+ &dhusername;
+
+ &dhdate;
+
+
+ &dhucpackage;
+
+ &dhsection;
+
+
+ &dhpackage;
+
+ Desktop properties manager
+
+
+
+ &dhpackage;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DESCRIPTION
+
+ This manual page documents briefly the
+ &dhpackage; command.
+
+ This manual page was written for the &debian; distribution
+ because the original program does not have a manual page.
+
+ &dhpackage; is a front-end to configuration applets (capplets)
+ that lets you configure your GNOME desktop. You may set things such as the background,
+ the fonts, or the theme
+
+
+
+ SEE ALSO
+ gtk-options (7).
+
+ OPTIONS
+
+ These programs follow the usual &gnu; command line syntax,
+ with long options starting with two dashes (`-'). A summary of
+ options is included below.
+ Theses options are mainly the standard command line options of gtk.
+
+
+
+
+
+
+ Show the help message.
+
+
+
+
+
+
+ Display brief usage message.
+
+
+
+
+
+
+ Prevent Gnome Control Center from using Nautilus
+
+
+
+
+
+
+ Enable Gdk debugging flags.
+
+
+
+
+
+
+ Disable Gdk debugging flags.
+
+
+
+
+
+
+ X display to use.
+
+
+
+
+
+
+ X screen to use.
+
+
+
+
+
+
+ Make X calls synchronous.
+
+
+
+
+
+
+ Program name as used by the window manager.
+
+
+
+
+
+
+ Program class as used by the window manager
+
+
+
+
+
+
+ Enable Gtk debugging flags.
+
+
+
+
+
+
+ Disable Gtk debugging flags.
+
+
+
+
+
+
+ Make all warnings fatal
+
+
+
+
+
+
+ Load an additional Gtk module.
+
+
+
+
+
+
+ File descriptor to print IOR on
+
+
+
+
+
+
+ IID to activate
+
+
+
+
+
+
+ Prevent registering of server with OAF
+
+
+
+
+
+
+ Disable sound server usage
+
+
+
+
+
+
+ Enable sound server usage
+
+
+
+
+
+
+ Host:port on which the sound server to use is running
+
+
+
+
+
+
+ Show version.
+
+
+
+
+
+
+ Specify session management ID
+
+
+
+
+
+
+ Specify prefix of saved configuration
+
+
+
+
+
+
+ Disable connection to session manager
+
+
+
+
+
+
+ Don't show crash dialog box.
+
+
+
+
+
+
+ AUTHOR
+
+ This manual page was written by &dhusername; &dhemail; for
+ the &debian; system (but may be used by others). Permission is
+ granted to copy, distribute and/or modify this document under
+ the terms of the &gnu; General Public License, Version 2 any
+ later version published by the Free Software Foundation.
+
+
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in /usr/share/common-licenses/GPL.
+
+
+
+
+
+
+
+
--- gnome-control-center-2.24.0.1.orig/debian/control
+++ gnome-control-center-2.24.0.1/debian/control
@@ -0,0 +1,140 @@
+Source: gnome-control-center
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Desktop Team
+XSBC-Original-Maintainer: Marco Cabizza
+Uploaders: Debian GNOME Maintainers
+Standards-Version: 3.7.3
+Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/gnome-control-center/ubuntu
+Build-Depends: cdbs (>= 0.4.41),
+ gnome-pkg-tools (>= 0.10),
+ dpkg-dev (>= 1.13.19),
+ debhelper (>= 5.0.0),
+ libgtk2.0-dev (>= 2.11.6),
+ libgnomeui-dev (>= 2.16.0-2),
+ intltool (>= 0.35.5),
+ libglade2-dev (>= 2.4.0-1),
+ libgnome-desktop-dev (>= 1:2.24.0-0ubuntu2),
+ zlib1g-dev,
+ flex,
+ libmetacity-dev (>= 1:2.23.1),
+ libxcursor-dev,
+ libbonobo2-dev (>= 2.6.2-6),
+ libnautilus-extension-dev (>= 1:2.21.6),
+ libxrandr-dev,
+ docbook-to-man,
+ libgstreamer0.10-dev (>= 0.10.1.2),
+ libgstreamer-plugins-base0.10-dev (>= 0.10.1.2),
+ autotools-dev,
+ libxss-dev,
+ libxinerama-dev,
+ libxft-dev (>= 2.1.2),
+ libxxf86misc-dev,
+ libxkbfile-dev,
+ libebook1.2-dev (>= 1.7.90),
+ 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 (>= 2.21.4.1),
+ shared-mime-info,
+ libpango1.0-dev (>= 1.17),
+ libgnomekbdui-dev (>= 2.21.4.1),
+ scrollkeeper,
+ libxklavier12-dev (>= 3.6),
+ libeel2-dev,
+ gnome-settings-daemon-dev (>= 2.22.0),
+ libcanberra-gtk-dev
+
+Package: gnome-control-center
+Architecture: any
+Section: gnome
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ capplets-data (>= ${gnome:Version}),
+ capplets-data (<< ${gnome:NextVersion}),
+ libgnome-window-settings1 (= ${binary:Version}),
+ gnome-settings-daemon,
+ gnome-menus (>= 2.12.0),
+ gnome-desktop-data,
+ gnome-icon-theme (>= 2.16),
+ desktop-file-utils,
+ gconf2-common (>= 2.23.2-0ubuntu3),
+ ubuntu-system-service (>= 0.1.10)
+Recommends: bzip2,
+ evolution-data-server,
+ gnome-user-guide,
+ mousetweaks,
+ gnome-session,
+ screen-resolution-extra
+Replaces: capplets
+Conflicts: capplets,
+ gnome-session (<< 2.22.0)
+Suggests: esound-clients,
+ gnome-screensaver | xscreensaver,
+ xbase-clients,
+ gstreamer0.10-alsa | gstreamer0.10-audiosink,
+ xrdb
+Description: utilities to configure the GNOME desktop
+ This package contains configuration applets for the GNOME desktop,
+ allowing to set accessibility configuration, desktop fonts, keyboard
+ and mouse properties, sound setup, desktop theme and background, user
+ interface properties, screen resolution, and other GNOME parameters.
+ .
+ It also contains a front end to these applets, which can also be
+ accessed with the GNOME panel or the Nautilus file manager.
+
+Package: capplets-data
+Architecture: all
+Section: gnome
+Depends: scrollkeeper, ${misc:Depends}
+Recommends: gnome-control-center (>= ${source:Version})
+Description: configuration applets for GNOME 2 - data files
+ This package contains data files (icons, pixmaps, locales files) needed by
+ the configuration applets in the gnome-control-center package.
+
+Package: libgnome-window-settings1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: gnome-control-center (<< 1:2.14.1-1),
+ capplets
+Conflicts: capplets
+Description: Utility library for getting window manager settings
+ This package contains the libwindow-settings library, which is used by
+ the GNOME window managers.
+
+Package: libgnome-window-settings-dev
+Architecture: all
+Section: libdevel
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libgnome-window-settings1 (>= ${source:Version})
+Replaces: gnome-control-center (<< 1:2.14.1-1)
+Description: Utility library for getting window manager settings (headers)
+ This package contains the libwindow-settings library header files.
+
+Package: gnome-control-center-dev
+Architecture: all
+Section: devel
+Conflicts: libgnome-settings-daemon-dev
+Replaces: libgnome-settings-daemon-dev
+Depends: ${misc:Depends}
+Description: utilities to configure the GNOME desktop
+ This package contains the file required to get the keydirs location
+
--- gnome-control-center-2.24.0.1.orig/debian/patches/17_default_applications_firefox_3.patch
+++ gnome-control-center-2.24.0.1/debian/patches/17_default_applications_firefox_3.patch
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.22.1/capplets/default-applications/gnome-default-applications.xml.in gnome-control-center-2.22.1.new/capplets/default-applications/gnome-default-applications.xml.in
+--- gnome-control-center-2.22.1/capplets/default-applications/gnome-default-applications.xml.in 2008-04-14 16:00:59.000000000 +0100
++++ gnome-control-center-2.22.1.new/capplets/default-applications/gnome-default-applications.xml.in 2008-04-14 16:01:36.000000000 +0100
+@@ -57,7 +57,7 @@
+ <_name>Firefox
+ firefox
+ firefox %s
+- firefox
++ firefox-3.0
+ false
+ true
+ firefox -new-tab "%s"
--- gnome-control-center-2.24.0.1.orig/debian/patches/01_remove_debian_default_applications.patch
+++ gnome-control-center-2.24.0.1/debian/patches/01_remove_debian_default_applications.patch
@@ -0,0 +1,35 @@
+# Description: remove the Debian entries from the default applications.
+# UbuntuSpecific: these are for Debian, this patch removes them.
+#
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.22.1/capplets/default-applications/gnome-default-applications.xml.in gnome-control-center-2.22.1.new/capplets/default-applications/gnome-default-applications.xml.in
+--- gnome-control-center-2.22.1/capplets/default-applications/gnome-default-applications.xml.in 2008-04-11 16:44:46.000000000 +0100
++++ gnome-control-center-2.22.1.new/capplets/default-applications/gnome-default-applications.xml.in 2008-04-14 15:57:42.000000000 +0100
+@@ -16,14 +16,6 @@
+ opera -newwindow %s
+
+
+- <_name>Debian Sensible Browser
+- sensible-browser
+- sensible-browser %s
+-
+- false
+- false
+-
+-
+ <_name>Epiphany Web Browser
+ epiphany
+ epiphany %s
+@@ -245,13 +237,6 @@
+
+
+
+- <_name>Debian Terminal Emulator
+- x-terminal-emulator
+- x-terminal-emulator
+- gnome-mime-application-x-executable
+- -e
+-
+-
+ <_name>GNOME Terminal
+ gnome-terminal
+ gnome-terminal
--- gnome-control-center-2.24.0.1.orig/debian/patches/04_path_xtra.patch
+++ gnome-control-center-2.24.0.1/debian/patches/04_path_xtra.patch
@@ -0,0 +1,12 @@
+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)
+
+-AC_PATH_XTRA
++AC_PATH_XTRA( [X11], [X11/Xlib.h], [XSync ()])
+ x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+
+ AC_CHECK_FUNC(XScreenSaverQueryInfo, [
--- gnome-control-center-2.24.0.1.orig/debian/patches/71_at_properties_gksudo_gdmsetup.patch
+++ gnome-control-center-2.24.0.1/debian/patches/71_at_properties_gksudo_gdmsetup.patch
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.23.3/capplets/accessibility/at-properties/main.c gnome-control-center-2.23.3.new/capplets/accessibility/at-properties/main.c
+--- gnome-control-center-2.23.3/capplets/accessibility/at-properties/main.c 2008-06-09 18:23:26.000000000 +0200
++++ gnome-control-center-2.23.3.new/capplets/accessibility/at-properties/main.c 2008-06-09 18:23:55.000000000 +0200
+@@ -78,7 +78,7 @@
+ static void
+ cb_login_preferences (GtkDialog *dialog, gint response_id)
+ {
+- g_spawn_command_line_async ("gdmsetup", NULL);
++ g_spawn_command_line_async ("gksu gdmsetup", NULL);
+ }
+
+ static void
--- gnome-control-center-2.24.0.1.orig/debian/patches/80_aspect_in_dropdown.patch
+++ gnome-control-center-2.24.0.1/debian/patches/80_aspect_in_dropdown.patch
@@ -0,0 +1,82 @@
+diff -Nur -x '*.orig' -x '*~' ubuntu/capplets/display/xrandr-capplet.c ubuntu.new/capplets/display/xrandr-capplet.c
+--- ubuntu/capplets/display/xrandr-capplet.c 2008-09-09 12:20:05.000000000 +0200
++++ ubuntu.new/capplets/display/xrandr-capplet.c 2008-09-09 12:21:36.000000000 +0200
+@@ -523,6 +523,48 @@
+ return i;
+ }
+
++static const char *
++generate_mode_text (int width, int height)
++{
++ int ratio;
++ const char *aspect = NULL;
++
++ if (width && height) {
++ if (width > height) ratio = width * 10 / height;
++ else ratio = height * 10 / width;
++
++ switch (ratio) {
++ case 13:
++ aspect = "4:3";
++ break;
++ case 16:
++ aspect = "16:10";
++ break;
++ case 17:
++ aspect = "16:9";
++ break;
++ case 12:
++ aspect = "5:4";
++ break;
++ // This catches 1.5625 as well (1600x1024) when maybe it shouldn't.
++ case 15:
++ aspect = "3:2";
++ break;
++ case 18:
++ aspect = "9:5";
++ break;
++ case 10:
++ aspect = "1:1";
++ break;
++ }
++ }
++
++ if (aspect)
++ return idle_free (g_strdup_printf (_("%d x %d (%s)"), width, height, aspect));
++ else
++ return idle_free (g_strdup_printf (_("%d x %d"), width, height));
++}
++
+ static void
+ rebuild_resolution_combo (App *app)
+ {
+@@ -546,7 +588,7 @@
+ height = gnome_rr_mode_get_height (modes[i]);
+
+ add_key (app->resolution_combo,
+- idle_free (g_strdup_printf (_("%d x %d"), width, height)),
++ generate_mode_text (width, height),
+ width, height, 0, -1);
+
+ if (width * height > best_w * best_h)
+@@ -565,17 +607,15 @@
+ }
+ else
+ {
+- current = idle_free (g_strdup_printf (_("%d x %d"),
+- app->current_output->width,
+- app->current_output->height));
++ current = generate_mode_text (app->current_output->width,
++ app->current_output->height);
+ }
+
+
+ if (!combo_select (app->resolution_combo, current))
+ {
+ combo_select (app->resolution_combo,
+- idle_free (
+- g_strdup_printf (_("%d x %d"), best_w, best_h)));
++ generate_mode_text (best_w, best_h));
+ }
+ }
+
--- gnome-control-center-2.24.0.1.orig/debian/patches/51_ubuntu_system_keyboard.patch
+++ gnome-control-center-2.24.0.1/debian/patches/51_ubuntu_system_keyboard.patch
@@ -0,0 +1,495 @@
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/keyboard/gnome-keyboard-properties.glade gnome-control-center-2.24.0.1.new/capplets/keyboard/gnome-keyboard-properties.glade
+--- gnome-control-center-2.24.0.1/capplets/keyboard/gnome-keyboard-properties.glade 2008-09-29 11:10:14.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/capplets/keyboard/gnome-keyboard-properties.glade 2008-09-29 11:10:19.000000000 +0200
+@@ -364,7 +364,7 @@
+
+
+
+-
++
+ True
+ General
+ GTK_JUSTIFY_CENTER
+@@ -461,96 +461,218 @@
+
+
+
+-
++
+ True
+- True
+- Separate _layout for each window
+- True
+- 0
+- True
+-
+-
+- False
+- False
+- 1
+-
+-
+-
+-
+- True
+- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+- 6
++ 12
++ True
+
+-
++
+ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 6
+- GTK_BUTTONBOX_START
+
+-
++
+ True
+ True
+- gtk-remove
+- True
+ 0
++
++
++ True
++ gtk-add
++
++
+
+
+ False
+ False
+- 1
+
+
+
+-
++
+ True
+ True
+- gtk-print
+- True
+ 0
++
++
++ True
++ gtk-remove
++
++
+
+
+ False
+ False
++ 1
++
++
++
++
++ True
++ GTK_BUTTONBOX_END
++
++
++ True
++ True
++ 0
++
++
++ True
++ 12
++ 12
++
++
++ True
++ 6
++
++
++ True
++ gtk-print
++
++
++
++
++ True
++ _Print Layout Diagram...
++ True
++
++
++ 1
++
++
++
++
++
++
++
++
++ False
++ False
++ GTK_PACK_END
++
++
++
++
+ 2
+
+
++
++
++ False
++ False
++
++
++
++
++ True
++ 6
+
+-
++
+ True
+ True
+- _Add...
++ Separate _layout for each window
+ True
+ 0
++ True
++
++
++ False
++ False
++
++
++
++
++ True
++ True
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 0
++
++
++ True
++
++
++ True
++ 8
++ 8
++
++
++ 24
++ True
++ Other Options...
++
++
++
++
++
++
+
+
+ False
+ False
+- 3
++ GTK_PACK_END
++ 1
+
+
+
+
+ False
++ 1
+
+
+
+-
++
+ True
+- True
+- Reset to De_faults
+- True
+- 0
++ 12
++
++
++ True
++ 6
++ GTK_BUTTONBOX_START
++
++
++ True
++ True
++ True
++ 0
++
++
++ True
++ 4
++ 4
++
++
++ True
++ Apply System-Wide...
++
++
++
++
++
++
++
++
++ True
++ True
++ _Reset
++ True
++ 0
++
++
++ 1
++
++
++
++
+
+
+ False
+- False
+- GTK_PACK_END
+- 4
++ 2
+
+
+
+
+ False
+- 2
++ 1
+
+
+
+@@ -558,28 +680,6 @@
+ 1
+
+
+-
+-
+- True
+- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+- GTK_BUTTONBOX_END
+-
+-
+- True
+- True
+- True
+- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+- Layout _Options...
+- True
+- 0
+-
+-
+-
+-
+- False
+- 2
+-
+-
+
+
+ 1
+@@ -1897,7 +1997,7 @@
+ True
+ 6
+
+-
++
+ True
+ 0
+ Preview:
+@@ -1967,7 +2067,7 @@
+
+
+
+-
++
+ True
+ True
+ True
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/keyboard/gnome-keyboard-properties-xkb.c gnome-control-center-2.24.0.1.new/capplets/keyboard/gnome-keyboard-properties-xkb.c
+--- gnome-control-center-2.24.0.1/capplets/keyboard/gnome-keyboard-properties-xkb.c 2008-09-29 11:10:14.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/capplets/keyboard/gnome-keyboard-properties-xkb.c 2008-09-29 11:19:57.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "capplet-util.h"
+ #include "gconf-property-editor.h"
+@@ -122,6 +123,154 @@
+ xkb_gconf_client = NULL;
+ }
+
++// mvo: make default entry the system wide default
++static void
++make_default (GtkWidget * button, GladeXML * dialog)
++{
++ GkbdKeyboardConfig kbd;
++ GError *error = NULL;
++ gboolean dbus_ret, res;
++ DBusGConnection *systembus, *sessionbus;
++ DBusGProxy *dbus_proxy;
++ int default_group;
++ gchar model[128] = {0,};
++ gchar layout[128] = {0,};
++ gchar variant[128] = {0,};
++ gchar options[256] = {0,};
++
++ // get current settings
++ gkbd_keyboard_config_init (&kbd, xkb_gconf_client, engine);
++ gkbd_keyboard_config_load_from_gconf (&kbd, &initial_config);
++ default_group = gconf_client_get_int(xkb_gconf_client,
++ "/desktop/gnome/peripherals/keyboard/general/defaultGroup",
++ NULL);
++
++ // convert so that its apprioriate for the dbus backend
++ strncpy(model, kbd.model, sizeof(model));
++
++ // get default_group
++ gchar *ndata = (gchar*)g_list_nth_data((GSList*)kbd.layouts_variants, default_group);
++ // something is wrong with the gconf settings, ignore
++ if(ndata == NULL) {
++ g_printerr("gconf default keyboard group out of range\n");
++ return;
++ }
++ gchar** layout_variant = g_strsplit(ndata, "\t", -1);
++ strncpy(layout, layout_variant[0], sizeof(layout));
++ if(g_strv_length(layout_variant) > 1)
++ strncpy(variant, layout_variant[1], sizeof(variant));
++ g_strfreev(layout_variant);
++
++ // build options string
++ GString *options_str = g_string_new("");
++ GSList *l = kbd.options;
++ if (l && l->data) {
++ gchar** options_v = g_strsplit(l->data,"\t",-1);
++ options_str = g_string_append(options_str, options_v[1]);
++ g_strfreev(options_v);
++ }
++ while(l = g_list_next(l)) {
++ options_str = g_string_append(options_str, ",");
++ gchar** options_v = g_strsplit(l->data,"\t",-1);
++ options_str = g_string_append(options_str, options_v[1]);
++ g_strfreev(options_v);
++ }
++ strncpy(options, options_str->str, sizeof(options));
++ g_string_free(options_str, TRUE);
++ gkbd_keyboard_config_term (&kbd);
++
++ // the console does not deal very well with evdev, we let
++ // the auto detection handle this for now
++ if (strcmp(model,"evdev") == 0)
++ strcpy(model,"");
++
++#if 0
++ printf("model: %s\n", model);
++ printf("layout: '%s'\n", layout);
++ printf("variant: '%s'\n", variant);
++ printf("options: '%s'\n", options);
++#endif
++
++ // now do the dbus stuff
++ sessionbus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
++ if (sessionbus == NULL) {
++ g_printerr ("Failed to open connection to bus: %s\n",
++ error->message);
++ g_error_free (error);
++ return;
++ }
++
++ dbus_proxy = dbus_g_proxy_new_for_name (sessionbus,
++ "org.freedesktop.PolicyKit.AuthenticationAgent",
++ "/",
++ "org.freedesktop.PolicyKit.AuthenticationAgent");
++ if (dbus_proxy == NULL) {
++ g_printerr ("Failed to get proxy: %s\n",
++ error->message);
++ g_error_free (error);
++ return;
++ }
++
++ if (!dbus_g_proxy_call (dbus_proxy, "ObtainAuthorization", &error,
++ G_TYPE_STRING, "com.ubuntu.systemservice.setkeyboard",
++ G_TYPE_UINT, 0,
++ G_TYPE_UINT, getpid(),
++ G_TYPE_INVALID,
++ G_TYPE_BOOLEAN, &res, G_TYPE_INVALID))
++ {
++ if (error->domain == DBUS_GERROR &&
++ error->code == DBUS_GERROR_REMOTE_EXCEPTION)
++ g_printerr ("Caught remote method exception %s: %s",
++ dbus_g_error_get_name (error),
++ error->message);
++ else
++ g_printerr ("Error: %s\n", error->message);
++ g_error_free (error);
++ return;
++ }
++ g_object_unref (dbus_proxy);
++ g_print("ObtainAuth returned: %i\n", res);
++ // so we get a "0" here too if the auth is not required ?!?
++ // if(!res)
++ // return;
++
++ systembus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
++ dbus_proxy = dbus_g_proxy_new_for_name (systembus,
++ "com.ubuntu.SystemService",
++ "/",
++ "com.ubuntu.SystemService");
++ if (dbus_proxy == NULL) {
++ g_printerr ("Failed to get dbus proxy: %s\n",
++ error->message);
++ g_error_free (error);
++ return;
++ }
++
++ dbus_ret = dbus_g_proxy_call (dbus_proxy, "set_keyboard", &error,
++ G_TYPE_STRING, model,
++ G_TYPE_STRING, layout,
++ G_TYPE_STRING, variant,
++ G_TYPE_STRING, options,
++ G_TYPE_INVALID,
++ G_TYPE_BOOLEAN, &res,
++ G_TYPE_INVALID);
++ if (!dbus_ret) {
++ if (error->domain == DBUS_GERROR &&
++ error->code == DBUS_GERROR_REMOTE_EXCEPTION)
++ g_printerr ("Caught remote method exception %s: %s",
++ dbus_g_error_get_name (error),
++ error->message);
++ else
++ g_printerr ("Error: %s\n", error->message);
++ g_error_free (error);
++ return;
++ }
++
++
++ //printf("res: %i\n", res);
++ g_object_unref (dbus_proxy);
++}
++
+ static void
+ reset_to_defaults (GtkWidget * button, GladeXML * dialog)
+ {
+@@ -182,6 +331,11 @@
+ "clicked", G_CALLBACK (reset_to_defaults),
+ dialog);
+
++ // mvo: global keyboard setting
++ g_signal_connect (G_OBJECT (WID ("button_make_default")),
++ "clicked", G_CALLBACK (make_default),
++ dialog);
++
+ g_signal_connect_swapped (G_OBJECT (WID ("xkb_layout_options")),
+ "clicked",
+ G_CALLBACK (xkb_options_popup_dialog),
--- gnome-control-center-2.24.0.1.orig/debian/patches/28_fixup_touchpad_config.patch
+++ gnome-control-center-2.24.0.1/debian/patches/28_fixup_touchpad_config.patch
@@ -0,0 +1,47 @@
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/mouse/gnome-mouse-properties.c gnome-control-center-2.24.0.1.new/capplets/mouse/gnome-mouse-properties.c
+--- gnome-control-center-2.24.0.1/capplets/mouse/gnome-mouse-properties.c 2008-10-10 09:50:11.000000000 +1100
++++ gnome-control-center-2.24.0.1.new/capplets/mouse/gnome-mouse-properties.c 2008-10-10 09:50:58.000000000 +1100
+@@ -41,7 +41,9 @@
+ #include
+ #include
+ #include
++#include
+ #include
++#include
+
+ #ifdef HAVE_XCURSOR
+ #include
+@@ -319,9 +321,31 @@
+ int numdevices, i;
+ gboolean ret = FALSE;
+ XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices);
++ Atom realtype, prop;
++ int realformat;
++ unsigned long nitems, bytes_after;
++ unsigned char *data;
++
++ prop = XInternAtom(GDK_DISPLAY(), "Synaptics Off", False);
++
+ for (i = 0; i < numdevices; i++) {
+- if (strcmp (devicelist[i].name, "Synaptics Touchpad") == 0)
+- ret = TRUE;
++ gdk_error_trap_push();
++ XDevice *device = XOpenDevice (GDK_DISPLAY(),
++ devicelist[i].id);
++ if (gdk_error_trap_pop())
++ continue;
++
++ gdk_error_trap_push();
++ if ((XGetDeviceProperty(GDK_DISPLAY(), device, prop, 0, 1, False,
++ XA_INTEGER, &realtype, &realformat, &nitems,
++ &bytes_after, &data) == Success) && (realtype != None))
++ {
++ XFree(data);
++ ret = TRUE;
++ }
++ gdk_error_trap_pop();
++
++ XCloseDevice (GDK_DISPLAY(), device);
+ }
+
+ XFreeDeviceList(devicelist);
--- gnome-control-center-2.24.0.1.orig/debian/patches/99_autoreconf.patch
+++ gnome-control-center-2.24.0.1/debian/patches/99_autoreconf.patch
@@ -0,0 +1,27244 @@
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/aclocal.m4 gnome-control-center-2.24.0.1.new/aclocal.m4
+--- gnome-control-center-2.24.0.1/aclocal.m4 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/aclocal.m4 2008-09-24 21:58:43.000000000 +0200
+@@ -13,4447 +13,3529 @@
+
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(AC_AUTOCONF_VERSION, [2.62],,
+-[m4_warning([this file was generated for autoconf 2.62.
++m4_if(AC_AUTOCONF_VERSION, [2.61],,
++[m4_warning([this file was generated for autoconf 2.61.
+ You have another version of autoconf. It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+-# 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.
++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
+
+-# 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
+-])
++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
+
+-# _AM_AUTOCONF_VERSION(VERSION)
+-# -----------------------------
+-# aclocal traces this macro to find the Autoconf version.
+-# This is a private macro too. Using m4_define simplifies
+-# the logic in aclocal, which can simply ignore this definition.
+-m4_define([_AM_AUTOCONF_VERSION], [])
++ AC_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
+-# -------------------------------
+-# 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)])
++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
+
+-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++ 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.
++ 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
+-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
++ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++
++ AC_ARG_ENABLE(schemas-install,
++ [ --disable-schemas-install Disable the schemas installation],
++ [case ${enableval} in
++ yes|no) ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
++ esac])
++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
++])
++
++# Copyright (C) 1995-2002 Free Software Foundation, Inc.
++# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+ #
+-# 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.
++# 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.
+ #
+-# $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
++# 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.
+ #
+-# 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.
++# Macro to add for using GNU gettext.
++# Ulrich Drepper , 1995, 1996
+ #
+-# 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.
++# Modified to never use included libintl.
++# Owen Taylor , 12/15/1998
+ #
+-# 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`
+-])
+-
+-# AM_CONDITIONAL -*- Autoconf -*-
+-
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+-# Free Software Foundation, Inc.
++# Major rework to remove unused code
++# Owen Taylor , 12/11/2002
+ #
+-# 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.
++# Added better handling of ALL_LINGUAS from GNU gettext version
++# written by Bruno Haible, Owen Taylor 5/30/3002
++#
++# Modified to require ngettext
++# Matthias Clasen 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)
+
+-# serial 8
++dnl
++dnl We go to great lengths to make sure that aclocal won't
++dnl try to pull in the installed version of these macros
++dnl when running aclocal in the glib directory.
++dnl
++m4_copy([AC_DEFUN],[glib_DEFUN])
++m4_copy([AC_REQUIRE],[glib_REQUIRE])
++dnl
++dnl At the end, if we're not within glib, we'll define the public
++dnl definitions in terms of our private definitions.
++dnl
+
+-# AM_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='#'
++# 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 ], [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 file defines LC_MESSAGES.])
++ fi
++ fi])
++
++# GLIB_PATH_PROG_WITH_TEST
++#----------------------------
++dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
++dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
++glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
++[# Extract the first word of "$2", so it can be a program name with args.
++set dummy $2; ac_word=[$]2
++AC_MSG_CHECKING([for $ac_word])
++AC_CACHE_VAL(ac_cv_path_$1,
++[case "[$]$1" in
++ /*)
++ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
++ ;;
++ *)
++ 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,
++dnl so AC_PATH_PROGS will keep looking.
++ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
++])dnl
++ ;;
++esac])dnl
++$1="$ac_cv_path_$1"
++if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
++ AC_MSG_RESULT([$]$1)
+ else
+- $1_TRUE='#'
+- $1_FALSE=
++ AC_MSG_RESULT(no)
+ 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])])
+-
+-# 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],
++ dnl NLS is obligatory
++ [USE_NLS=yes
++ AC_SUBST(USE_NLS)
+
+-# 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=
+
+-# _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
+-
+-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
++ #
++ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
++ [AC_TRY_LINK([
++#include
++],
++ [return !ngettext ("","", 1)],
++ gt_cv_func_ngettext_libc=yes,
++ gt_cv_func_ngettext_libc=no)
++ ])
++
++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
++ [AC_TRY_LINK([
++#include
++],
++ [return !dgettext ("","")],
++ gt_cv_func_dgettext_libc=yes,
++ gt_cv_func_dgettext_libc=no)
++ ])
+ 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
++
++ 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
++ fi
++
++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
++ INTLLIBS="-lintl $libintl_extra_libs"
++ fi
++
++ if test "$gt_cv_have_gettext" = "yes"; then
++ AC_DEFINE(HAVE_GETTEXT,1,
++ [Define if the GNU gettext() function is already present or preinstalled.])
++ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
++ if test "$MSGFMT" != "no"; then
++ glib_save_LIBS="$LIBS"
++ LIBS="$LIBS $INTLLIBS"
++ AC_CHECK_FUNCS(dcgettext)
++ MSGFMT_OPTS=
++ AC_MSG_CHECKING([if msgfmt accepts -c])
++ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
++msgid ""
++msgstr ""
++"Content-Type: text/plain; charset=UTF-8\n"
++"Project-Id-Version: test 1.0\n"
++"PO-Revision-Date: 2007-02-15 12:01+0100\n"
++"Last-Translator: test \n"
++"Language-Team: C \n"
++"MIME-Version: 1.0\n"
++"Content-Transfer-Encoding: 8bit\n"
++], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
++ AC_SUBST(MSGFMT_OPTS)
++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
++ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
++ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
++ return _nl_msg_cat_cntr],
++ [CATOBJEXT=.gmo
++ DATADIRNAME=share],
++ [case $host in
++ *-*-solaris*)
++ dnl On Solaris, if bind_textdomain_codeset is in libc,
++ dnl GNU format message catalog is always supported,
++ dnl since both are added to the libc all together.
++ dnl Hence, we'd like to go with DATADIRNAME=share and
++ dnl and CATOBJEXT=.gmo in this case.
++ AC_CHECK_FUNC(bind_textdomain_codeset,
++ [CATOBJEXT=.gmo
++ DATADIRNAME=share],
++ [CATOBJEXT=.mo
++ DATADIRNAME=lib])
++ ;;
++ *)
++ CATOBJEXT=.mo
++ DATADIRNAME=lib
++ ;;
++ esac])
++ LIBS="$glib_save_LIBS"
++ INSTOBJEXT=.mo
++ else
++ gt_cv_have_gettext=no
++ fi
++ fi
++ ])
+
++ if test "$gt_cv_have_gettext" = "yes" ; then
++ AC_DEFINE(ENABLE_NLS, 1,
++ [always defined to indicate that i18n is enabled])
++ fi
+
+-# AM_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
++ dnl If it is not GNU xgettext we define it as : so that the
++ dnl Makefiles still can work.
++ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
++ : ;
++ else
++ AC_MSG_RESULT(
++ [found xgettext program is not GNU xgettext; ignore it])
++ XGETTEXT=":"
++ fi
++ fi
+
+-# Do all the work for Automake. -*- Autoconf -*-
++ # We need to process the po/ directory.
++ POSUB=po
+
+-# 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.
++ for lang in $ALL_LINGUAS; do
++ GMOFILES="$GMOFILES $lang.gmo"
++ POFILES="$POFILES $lang.po"
++ done
+
+-# 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)
++ AC_SUBST(DATADIRNAME)
++ AC_SUBST(GMOFILES)
++ AC_SUBST(INSTOBJEXT)
++ AC_SUBST(INTLLIBS)
++ AC_SUBST(PO_IN_DATADIR_TRUE)
++ AC_SUBST(PO_IN_DATADIR_FALSE)
++ AC_SUBST(POFILES)
++ AC_SUBST(POSUB)
++ ])
+
+-# 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
++# of gettext is found in either in libintl or in the C library,
++# it will set INTLLIBS to the libraries needed for use of gettext
++# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
++# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
++# on various variables needed by the Makefile.in.in installed by
++# glib-gettextize.
++dnl
++glib_DEFUN([GLIB_GNU_GETTEXT],
++ [AC_REQUIRE([AC_PROG_CC])dnl
++ AC_REQUIRE([AC_HEADER_STDC])dnl
++
++ GLIB_LC_MESSAGES
++ GLIB_WITH_NLS
+
+-# 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=
++ else
++ AC_MSG_CHECKING(for catalogs to be installed)
++ NEW_LINGUAS=
++ for presentlang in $ALL_LINGUAS; do
++ useit=no
++ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
++ desiredlanguages="$LINGUAS"
++ else
++ desiredlanguages="$ALL_LINGUAS"
++ fi
++ for desiredlang in $desiredlanguages; do
++ # Use the presentlang catalog if desiredlang is
++ # a. equal to presentlang, or
++ # b. a variant of presentlang (because in this case,
++ # presentlang can be used as a fallback for messages
++ # which are not translated in the desiredlang catalog).
++ case "$desiredlang" in
++ "$presentlang"*) useit=yes;;
++ esac
++ done
++ if test $useit = yes; then
++ NEW_LINGUAS="$NEW_LINGUAS $presentlang"
++ fi
++ done
++ LINGUAS=$NEW_LINGUAS
++ AC_MSG_RESULT($LINGUAS)
++ fi
+
+-# 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_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.
++ MKINSTALLDIRS=
++ if test -n "$ac_aux_dir"; then
++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
++ fi
++ if test -z "$MKINSTALLDIRS"; then
++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
++ fi
++ AC_SUBST(MKINSTALLDIRS)
+
+-# 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
++ if test "x$srcdir" != "x."; then
++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
++ posrcprefix="$srcdir/"
++ else
++ posrcprefix="../$srcdir/"
++ fi
++ else
++ posrcprefix="../"
++ fi
++ rm -f po/POTFILES
++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
++ < $srcdir/po/POTFILES.in > po/POTFILES
++ ])
++
++# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
++# -------------------------------
++# Define VARIABLE to the location where catalog files will
++# be installed by po/Makefile.
++glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
++[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
++glib_save_prefix="$prefix"
++glib_save_exec_prefix="$exec_prefix"
++glib_save_datarootdir="$datarootdir"
++test "x$prefix" = xNONE && prefix=$ac_default_prefix
++test "x$exec_prefix" = xNONE && exec_prefix=$prefix
++datarootdir=`eval echo "${datarootdir}"`
++if test "x$CATOBJEXT" = "x.mo" ; then
++ localedir=`eval echo "${libdir}/locale"`
++else
++ localedir=`eval echo "${datadir}/locale"`
++fi
++prefix="$glib_save_prefix"
++exec_prefix="$glib_save_exec_prefix"
++datarootdir="$glib_save_datarootdir"
++AC_DEFINE_UNQUOTED($1, "$localedir",
++ [Define the location where the catalogs will be installed])
+ ])
+
++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
+
+-# 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
++# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
++# 0 and perform ACTION-IF-FAIL for any other exit status.
++AC_DEFUN([GLIB_RUN_PROG],
++[cat >conftest.foo <<_ACEOF
++$2
++_ACEOF
++if AC_RUN_LOG([$1 conftest.foo]); then
++ m4_ifval([$3], [$3], [:])
++m4_ifvaln([$4], [else $4])dnl
++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
++fi])
+
+-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+-# loop where config.status creates the headers, so we can generate
+-# our stamp files there.
+-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
++#
+
+-# 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
+
+-# 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])
+
+-# serial 2
++ 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
+
+-# 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])
++])
+
+-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+-# From Jim Meyering
++AC_DEFUN([GNOME_DEBUG_CHECK],
++[
++ AC_ARG_ENABLE([debug],
++ AC_HELP_STRING([--enable-debug],
++ [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
++AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
++[
++ AC_REQUIRE([AM_MAINTAINER_MODE])
+
+-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
++ DISABLE_DEPRECATED=""
++ 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
++AC_DEFUN([GNOME_COMPILE_WARNINGS],[
++ 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
+
+-# 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=
++ ;;
++ 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)
+
+-# 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
++ 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)
+
+-# 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-1ubuntu1 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 /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 , 1995, 1996
+-#
+-# Modified to never use included libintl.
+-# Owen Taylor , 12/15/1998
+-#
+-# Major rework to remove unused code
+-# Owen Taylor , 12/11/2002
+-#
+-# Added better handling of ALL_LINGUAS from GNU gettext version
+-# written by Bruno Haible, Owen Taylor 5/30/3002
+-#
+-# Modified to require ngettext
+-# Matthias Clasen 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 ], [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 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,
+-dnl so AC_PATH_PROGS will keep looking.
+-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+-])dnl
+- ;;
+-esac])dnl
+-$1="$ac_cv_path_$1"
+-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+- AC_MSG_RESULT([$]$1)
+-else
+- AC_MSG_RESULT(no)
+-fi
+-AC_SUBST($1)dnl
+-])
++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
+-#-----------------
+-glib_DEFUN([GLIB_WITH_NLS],
+- dnl NLS is obligatory
+- [USE_NLS=yes
+- AC_SUBST(USE_NLS)
++# 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
+
+- CATOBJEXT=NONE
+- XGETTEXT=:
+- INTLLIBS=
++# _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=""
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
+
+- #
+- # First check in libc
+- #
+- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
+- [AC_TRY_LINK([
+-#include
+-],
+- [return !ngettext ("","", 1)],
+- gt_cv_func_ngettext_libc=yes,
+- gt_cv_func_ngettext_libc=no)
+- ])
+-
+- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+- [AC_TRY_LINK([
+-#include
+-],
+- [return !dgettext ("","")],
+- gt_cv_func_dgettext_libc=yes,
+- gt_cv_func_dgettext_libc=no)
+- ])
+- fi
+-
+- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+- AC_CHECK_FUNCS(bind_textdomain_codeset)
+- fi
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+- #
+- # 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)])])
+-
+- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+- AC_MSG_CHECKING([if -liconv is needed to use gettext])
+- AC_MSG_RESULT([])
+- AC_CHECK_LIB(intl, ngettext,
+- [AC_CHECK_LIB(intl, dcgettext,
+- [gt_cv_func_dgettext_libintl=yes
+- libintl_extra_libs=-liconv],
+- :,-liconv)],
+- :,-liconv)
+- fi
+-
+- #
+- # If we found libintl, then check in it for bind_textdomain_codeset();
+- # we'll prefer libc if neither have bind_textdomain_codeset(),
+- # 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"
++# 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
+- 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
+
+- if test "$gt_cv_func_dgettext_libc" = "yes" \
+- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
+- gt_cv_have_gettext=yes
+- fi
+-
+- if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+- INTLLIBS="-lintl $libintl_extra_libs"
+- fi
+-
+- if test "$gt_cv_have_gettext" = "yes"; then
+- AC_DEFINE(HAVE_GETTEXT,1,
+- [Define if the GNU gettext() function is already present or preinstalled.])
+- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+- if test "$MSGFMT" != "no"; then
+- glib_save_LIBS="$LIBS"
+- LIBS="$LIBS $INTLLIBS"
+- AC_CHECK_FUNCS(dcgettext)
+- MSGFMT_OPTS=
+- AC_MSG_CHECKING([if msgfmt accepts -c])
+- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
+-msgid ""
+-msgstr ""
+-"Content-Type: text/plain; charset=UTF-8\n"
+-"Project-Id-Version: test 1.0\n"
+-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+-"Last-Translator: test \n"
+-"Language-Team: C \n"
+-"MIME-Version: 1.0\n"
+-"Content-Transfer-Encoding: 8bit\n"
+-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+- AC_SUBST(MSGFMT_OPTS)
+- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+- return _nl_msg_cat_cntr],
+- [CATOBJEXT=.gmo
+- DATADIRNAME=share],
+- [case $host in
+- *-*-solaris*)
+- dnl On Solaris, if bind_textdomain_codeset is in libc,
+- dnl GNU format message catalog is always supported,
+- dnl since both are added to the libc all together.
+- dnl Hence, we'd like to go with DATADIRNAME=share and
+- dnl and CATOBJEXT=.gmo in this case.
+- AC_CHECK_FUNC(bind_textdomain_codeset,
+- [CATOBJEXT=.gmo
+- DATADIRNAME=share],
+- [CATOBJEXT=.mo
+- DATADIRNAME=lib])
+- ;;
+- *)
+- CATOBJEXT=.mo
+- DATADIRNAME=lib
+- ;;
+- esac])
+- LIBS="$glib_save_LIBS"
+- INSTOBJEXT=.mo
+- else
+- gt_cv_have_gettext=no
+- fi
+- fi
+- ])
++# _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,
+- [always defined to indicate that i18n is enabled])
+- fi
+
+- dnl Test whether we really found GNU xgettext.
+- if test "$XGETTEXT" != ":"; then
+- dnl If it is not GNU xgettext we define it as : so that the
+- dnl Makefiles still can work.
+- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+- : ;
+- else
+- AC_MSG_RESULT(
+- [found xgettext program is not GNU xgettext; ignore it])
+- XGETTEXT=":"
+- fi
+- fi
++# _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
+
+- AC_OUTPUT_COMMANDS(
+- [case "$CONFIG_FILES" in *po/Makefile.in*)
+- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+- esac])
++# _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
+- dnl in configure.in.
+- for lang in $ALL_LINGUAS; do
+- GMOFILES="$GMOFILES $lang.gmo"
+- POFILES="$POFILES $lang.po"
+- done
++# _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)
+- AC_SUBST(CATOBJEXT)
+- AC_SUBST(DATADIRNAME)
+- AC_SUBST(GMOFILES)
+- AC_SUBST(INSTOBJEXT)
+- AC_SUBST(INTLLIBS)
+- AC_SUBST(PO_IN_DATADIR_TRUE)
+- AC_SUBST(PO_IN_DATADIR_FALSE)
+- 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
+-# -------------------
+-# Do checks necessary for use of gettext. If a suitable implementation
+-# of gettext is found in either in libintl or in the C library,
+-# it will set INTLLIBS to the libraries needed for use of gettext
+-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
+-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
+-# on various variables needed by the Makefile.in.in installed by
+-# glib-gettextize.
+-dnl
+-glib_DEFUN([GLIB_GNU_GETTEXT],
+- [AC_REQUIRE([AC_PROG_CC])dnl
+- AC_REQUIRE([AC_HEADER_STDC])dnl
+-
+- GLIB_LC_MESSAGES
+- GLIB_WITH_NLS
++# _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
+- LINGUAS=
+- else
+- AC_MSG_CHECKING(for catalogs to be installed)
+- NEW_LINGUAS=
+- for presentlang in $ALL_LINGUAS; do
+- useit=no
+- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+- desiredlanguages="$LINGUAS"
+- else
+- desiredlanguages="$ALL_LINGUAS"
+- fi
+- for desiredlang in $desiredlanguages; do
+- # Use the presentlang catalog if desiredlang is
+- # a. equal to presentlang, or
+- # b. a variant of presentlang (because in this case,
+- # presentlang can be used as a fallback for messages
+- # which are not translated in the desiredlang catalog).
+- case "$desiredlang" in
+- "$presentlang"*) useit=yes;;
+- esac
+- done
+- if test $useit = yes; then
+- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+- fi
+- done
+- LINGUAS=$NEW_LINGUAS
+- AC_MSG_RESULT($LINGUAS)
+- fi
+
+- 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
++# _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).
+- dnl Try to locate is.
+- MKINSTALLDIRS=
+- if test -n "$ac_aux_dir"; then
+- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+- fi
+- if test -z "$MKINSTALLDIRS"; then
+- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+- fi
+- AC_SUBST(MKINSTALLDIRS)
+
+- dnl Generate list of files to be processed by xgettext which will
+- dnl be included in po/Makefile.
+- test -d po || mkdir po
+- if test "x$srcdir" != "x."; then
+- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+- posrcprefix="$srcdir/"
+- else
+- posrcprefix="../$srcdir/"
+- fi
+- else
+- posrcprefix="../"
+- fi
+- rm -f po/POTFILES
+- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+- < $srcdir/po/POTFILES.in > po/POTFILES
+- ])
++# _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)
+-# -------------------------------
+-# Define VARIABLE to the location where catalog files will
+-# be installed by po/Makefile.
+-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
+-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
+-glib_save_prefix="$prefix"
+-glib_save_exec_prefix="$exec_prefix"
+-glib_save_datarootdir="$datarootdir"
+-test "x$prefix" = xNONE && prefix=$ac_default_prefix
+-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+-datarootdir=`eval echo "${datarootdir}"`
+-if test "x$CATOBJEXT" = "x.mo" ; then
+- localedir=`eval echo "${libdir}/locale"`
++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"`
++ # 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])
+-])
+-
+-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
+-
+-# 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
+-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
+-# 0 and perform ACTION-IF-FAIL for any other exit status.
+-AC_DEFUN([GLIB_RUN_PROG],
+-[cat >conftest.foo <<_ACEOF
+-$2
+-_ACEOF
+-if AC_RUN_LOG([$1 conftest.foo]); then
+- m4_ifval([$3], [$3], [:])
+-m4_ifvaln([$4], [else $4])dnl
+-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+-fi])
+-
+-
+-# 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 </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])
+-
+- 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"
++ 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])
+-
+- 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)
+-
+- 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)
+-])
+-
+-# 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.
+-m4_ifdef([AC_PROVIDE_IFELSE],
+- [],
+- [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],
+-[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_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.
+- 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
+-
+-
+-# _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
+-
+-# This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+-
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-AC_SUBST(LIBTOOL)dnl
+-
+-# Prevent multiple expansion
+-define([AC_PROG_LIBTOOL], [])
+-])# _AC_PROG_LIBTOOL
+-
+-
+-# 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
+-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
+- # 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
++*-*-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
+-
+-# 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_CHECK_TOOL(AR, ar, false)
+-AC_CHECK_TOOL(RANLIB, ranlib, :)
+-AC_CHECK_TOOL(STRIP, 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_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 <
++#endif
+
+-# If no C compiler flags were specified, use CFLAGS.
+-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++#include
+
+-# 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 </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.so
++ # instead of lib.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 <
+-#endif
+-
+-#include
+-
+-#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
++ 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=no
++ 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"
++
++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.so
+- # instead of lib.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 <&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@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
+- 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 \"${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 <&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@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 &1 /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*)
+- 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 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ 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=
+@@ -6800,7 +5882,7 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+@@ -6865,1548 +5947,2481 @@
+ *)
+ ;;
+ 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
++ # AIX 5 now supports IA64 processor
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ 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'
++ ;;
++
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ # PIC is the default for these OSes.
++ ;;
++
++ 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'])
++ ;;
++
++ 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'
++ ;;
++
++ interix[[3-9]]*)
++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++ # Instead, we relocate shared libraries at runtime.
++ ;;
++
++ 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
++ ;;
++
++ sysv4*MP*)
++ if test -d /usr/nec; then
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++ 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
++ ;;
++ *)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++ ;;
++ esac
++ ;;
++
++ *)
++ _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'
++ else
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++ 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'])
++ ;;
++
++ 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'
++ ;;
++
++ 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'
++ ;;
++
++ newsos6)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++
++ 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
++ ;;
++
++ 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'
++ ;;
++
++ rdos*)
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++ ;;
++
++ 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
++ ;;
++
++ 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'
++ ;;
++
++ 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'
++ ;;
++
++ 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
++ ;;
++
++ 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
++ ;;
++ esac
++ fi
++])
++AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
++
++#
++# Check to make sure the PIC flag actually works.
++#
++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),
++ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
++ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
++ "" | " "*) ;;
++ *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
++ esac],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
++fi
++case $host_os in
++ # For platforms which do not support PIC, -DPIC is meaningless:
++ *djgpp*)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++ ;;
++ *)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
++ ;;
++esac
++
++#
++# Check to make sure the static flag actually works.
++#
++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)=])
++])
++
++
++# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
++# ------------------------------------
++# See if the linker supports building shared libraries.
++AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++ifelse([$1],[CXX],[
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++ case $host_os in
++ aix[[4-9]]*)
++ # 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
++ ;;
++ pw32*)
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
++ ;;
++ cygwin* | mingw*)
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$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'
++ ;;
++ linux* | k*bsd*-gnu)
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++ ;;
++ *)
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++ ;;
++ esac
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
++],[
++ runpath_var=
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++ _LT_AC_TAGVAR(archive_cmds, $1)=
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
++ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++ _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
++ _LT_AC_TAGVAR(module_cmds, $1)=
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
++ _LT_AC_TAGVAR(always_export_symbols, $1)=no
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++ # include_expsyms should be a list of space-separated symbols to be *always*
++ # included in the symbol list
++ _LT_AC_TAGVAR(include_expsyms, $1)=
++ # exclude_expsyms can be an extended regexp of symbols to exclude
++ # it will be wrapped by ` (' and `)$', so one must not match beginning or
++ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++ # as well as any symbol that contains `d'.
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
++ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++ # platforms (ab)use it in PIC code, but their linkers get confused if
++ # the symbol is explicitly referenced. Since portable code cannot
++ # rely on this symbol name, it's probably fine to never include it in
++ # preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
++dnl Note also adjust exclude_expsyms for C++ above.
++ extract_expsyms_cmds=
++ # Just being paranoid about ensuring that cc_basename is set.
++ _LT_CC_BASENAME([$compiler])
++ case $host_os in
++ cygwin* | mingw* | pw32*)
++ # FIXME: the MSVC++ port hasn't been tested in a loooong time
++ # When not using gcc, we currently assume that we are using
++ # Microsoft Visual C++.
++ if test "$GCC" != yes; then
++ with_gnu_ld=no
++ fi
++ ;;
++ interix*)
++ # we just hope/assume this is gcc and not c89 (= MSVC++)
++ with_gnu_ld=yes
++ ;;
++ openbsd*)
++ with_gnu_ld=no
++ ;;
++ esac
++
++ _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}'
++
++ # Set some defaults for GNU ld with shared library support. These
++ # are reset later if shared libraries are not supported. Putting them
++ # here allows them to be overridden if necessary.
++ runpath_var=LD_RUN_PATH
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ # 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'
++ 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
++
++ # 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 <&2
++
++*** 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.
++
++EOF
++ 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
++
++ # Samuel A. Falvo II 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 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
++ ;;
++
++ 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'
++
++ 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'
++ ;;
++
++ 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'
++
++ 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
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++
++ 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'
++ 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
++ ;;
++
++ solaris*)
++ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ cat <&2
++
++*** 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.
++
++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
++ ;;
++
++ 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_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
++ ;;
++
++ *)
++ 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
++
++ 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
++ ;;
++
++ 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
++
++ # 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
++
++ exp_sym_flag='-bexport'
++ no_entry_flag='-bnoentry'
++ 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.
++
++ _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
++
++ 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
++ # below for broken collect2 doesn't work under 4.3+
++ collect2name=`${CC} -print-prog-name=collect2`
++ if test -f "$collect2name" && \
++ strings "$collect2name" | grep resolve_lib_name >/dev/null
++ then
++ # We have reworked collect2
++ :
++ else
++ # We have old collect2
++ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
++ # It fails to find uninstalled libraries when the uninstalled
++ # path is not listed in the libpath. Setting hardcode_minus_L
++ # to unsupported forces relinking
++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++ fi
++ ;;
++ esac
++ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
++ else
++ # not using gcc
++ if test "$host_cpu" = ia64; then
++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++ # chokes on -Wl,-G. The following line is correct:
++ shared_flag='-G'
++ else
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag='${wl}-G'
++ else
++ shared_flag='${wl}-bM:SRE'
++ fi
++ fi
++ fi
++
++ # It seems that -bexpall does not export symbols beginning with
++ # underscore (_), so it is better to generate a list of symbols to export.
++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++ if test "$aix_use_runtimelinking" = yes; then
++ # Warning - without using the other runtime loading flags (-brtl),
++ # -berok will link without error, but may produce a broken library.
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
++ # Determine the default libpath from the value encoded in an empty executable.
++ _LT_AC_SYS_LIBPATH_AIX
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ else
++ if test "$host_cpu" = ia64; then
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++ else
++ # Determine the default libpath from the value encoded in an empty executable.
++ _LT_AC_SYS_LIBPATH_AIX
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++ # Warning - without using the other run time loading flags,
++ # -berok will link without error, but may produce a broken library.
++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++ # Exported symbols can be pulled into shared objects from archives
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++ # This is similar to how AIX traditionally builds its shared libraries.
++ _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
++ ;;
++
++ 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
++ ;;
++
++ bsdi[[45]]*)
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
++ ;;
++
++ cygwin* | mingw* | pw32*)
++ # When not using gcc, we currently assume that we are using
++ # Microsoft Visual C++.
++ # hardcode_libdir_flag_spec is actually meaningless, as there is
++ # no search path for DLLs.
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++ # Tell ltmain to make .lib files, not .a files.
++ libext=lib
++ # Tell ltmain to make .dll files, not .so files.
++ shrext_cmds=".dll"
++ # FIXME: Setting linknames here is a bad hack.
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++ # The linker will automatically build a .lib file if we build a DLL.
++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
++ # FIXME: Should let the user specify the lib program.
++ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
++ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++ ;;
++
++ darwin* | rhapsody*)
++ case $host_os in
++ rhapsody* | darwin1.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
++ esac
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++ if test "$GCC" = yes ; then
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _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
++ 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'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ esac
++ fi
++ ;;
++
++ 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
++ ;;
++
++ freebsd1*)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++
++ # 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
++ # extra space).
++ freebsd2.2*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++ _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
++ ;;
++
++ # 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
++ ;;
++
++ # 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
++ ;;
++
++ 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
++ _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
++ _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
++
++ # 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
++# #undef WIN32_LEAN_AND_MEAN
++# #include
+ #
+-# 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),
+- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+- "" | " "*) ;;
+- *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+- esac],
+- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+-fi
+-case $host_os in
+- # For platforms which do not support PIC, -DPIC is meaningless:
+- *djgpp*)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+- ;;
+- *)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+- ;;
+-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
++# 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)=])
++# 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])
+-# ------------------------------------
+-# See if the linker supports building shared libraries.
+-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+-[AC_REQUIRE([LT_AC_PROG_SED])dnl
+-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+-ifelse([$1],[CXX],[
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+- case $host_os in
+- aix[[4-9]]*)
+- # 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
+- ;;
+- pw32*)
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+- ;;
+- cygwin* | mingw*)
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$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'
+- ;;
+- *)
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+- ;;
+- esac
+- _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+-],[
+- runpath_var=
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+- _LT_AC_TAGVAR(archive_cmds, $1)=
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
+- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+- _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+- _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+- _LT_AC_TAGVAR(module_cmds, $1)=
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+- _LT_AC_TAGVAR(always_export_symbols, $1)=no
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+- # include_expsyms should be a list of space-separated symbols to be *always*
+- # included in the symbol list
+- _LT_AC_TAGVAR(include_expsyms, $1)=
+- # exclude_expsyms can be an extended regexp of symbols to exclude
+- # it will be wrapped by ` (' and `)$', so one must not match beginning or
+- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+- # as well as any symbol that contains `d'.
+- _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+- # platforms (ab)use it in PIC code, but their linkers get confused if
+- # the symbol is explicitly referenced. Since portable code cannot
+- # rely on this symbol name, it's probably fine to never include it in
+- # preloaded symbol tables.
+- # Exclude shared library initialization/finalization symbols.
+-dnl Note also adjust exclude_expsyms for C++ above.
+- extract_expsyms_cmds=
+- # Just being paranoid about ensuring that cc_basename is set.
+- _LT_CC_BASENAME([$compiler])
+- case $host_os in
+- cygwin* | mingw* | pw32*)
+- # FIXME: the MSVC++ port hasn't been tested in a loooong time
+- # When not using gcc, we currently assume that we are using
+- # Microsoft Visual C++.
+- if test "$GCC" != yes; then
+- with_gnu_ld=no
+- fi
+- ;;
+- interix*)
+- # we just hope/assume this is gcc and not c89 (= MSVC++)
+- with_gnu_ld=yes
+- ;;
+- openbsd*)
+- with_gnu_ld=no
+- ;;
+- esac
+
+- _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}'
++# 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
+- # here allows them to be overridden if necessary.
+- runpath_var=LD_RUN_PATH
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+- # 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'
+- else
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++# _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'
++fi
++])])# _AS_TEST_PREPARE
++
++# AS_EXECUTABLE_P
++# ---------------
++# Check whether a file is executable.
++m4_ifndef([AS_EXECUTABLE_P],
++[m4_defun([AS_EXECUTABLE_P],
++[AS_REQUIRE([_AS_TEST_PREPARE])dnl
++$as_executable_p $1[]dnl
++])])# AS_EXECUTABLE_P
++
++# 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 #
++# macro and use it instead. #
++# LT_AC_PROG_SED
++# --------------
++# Check for a fully-functional sed program, that truncates
++# as few characters as possible. Prefer GNU sed if found.
++AC_DEFUN([LT_AC_PROG_SED],
++[AC_MSG_CHECKING([for a sed that does not truncate output])
++AC_CACHE_VAL(lt_cv_path_SED,
++[# 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.
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for lt_ac_prog in sed gsed; do
++ 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
++ done
++ done
++done
++IFS=$as_save_IFS
++lt_ac_max=0
++lt_ac_count=0
++# Add /usr/xpg4/bin/sed as it is typically found on Solaris
++# along with /bin/sed that truncates output.
++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
++ test ! -f $lt_ac_sed && continue
++ cat /dev/null > conftest.in
++ lt_ac_count=0
++ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
++ # Check for GNU sed and select it if it is found.
++ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
++ lt_cv_path_SED=$lt_ac_sed
++ break
++ fi
++ while true; do
++ cat conftest.in conftest.in >conftest.tmp
++ mv conftest.tmp conftest.in
++ cp conftest.in conftest.nl
++ echo >>conftest.nl
++ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
++ cmp -s conftest.out conftest.nl || break
++ # 10000 chars as input seems more than enough
++ test $lt_ac_count -gt 10 && break
++ lt_ac_count=`expr $lt_ac_count + 1`
++ if test $lt_ac_count -gt $lt_ac_max; then
++ lt_ac_max=$lt_ac_count
++ lt_cv_path_SED=$lt_ac_sed
+ 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
+-
+- # 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 <&2
++ done
++done
++])
++SED=$lt_cv_path_SED
++AC_SUBST([SED])
++AC_MSG_RESULT([$SED])
++])
+
+-*** 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 .
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# 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.
++#
++# 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.
+
+-EOF
+- fi
+- ;;
++# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# ----------------------------------
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=m4_default([$1], [0.9.0])
++ 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
++ AC_MSG_RESULT([no])
++ PKG_CONFIG=""
++ fi
++
++fi[]dnl
++])# PKG_PROG_PKG_CONFIG
+
+- 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
++# to PKG_CHECK_MODULES(), but does not set variables or print errors.
++#
++#
++# 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
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_EXISTS],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++if test -n "$PKG_CONFIG" && \
++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
++ m4_ifval([$2], [$2], [:])
++m4_ifvaln([$3], [else
++ $3])dnl
++fi])
+
+- # Samuel A. Falvo II 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 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
+- ;;
++# _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
++fi[]dnl
++])# _PKG_CONFIG
+
+- 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],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _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 <&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 .])],
++ [$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]].*)
+- # We only want to do this on AIX 4.2 and lower, the check
+- # below for broken collect2 doesn't work under 4.3+
+- collect2name=`${CC} -print-prog-name=collect2`
+- if test -f "$collect2name" && \
+- strings "$collect2name" | grep resolve_lib_name >/dev/null
+- then
+- # We have reworked collect2
+- :
+- else
+- # We have old collect2
+- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+- # It fails to find uninstalled libraries when the uninstalled
+- # path is not listed in the libpath. Setting hardcode_minus_L
+- # to unsupported forces relinking
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+- fi
+- ;;
+- esac
+- shared_flag='-shared'
+- if test "$aix_use_runtimelinking" = yes; then
+- shared_flag="$shared_flag "'${wl}-G'
+- fi
+- else
+- # not using gcc
+- if test "$host_cpu" = ia64; then
+- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+- # chokes on -Wl,-G. The following line is correct:
+- shared_flag='-G'
+- else
+- if test "$aix_use_runtimelinking" = yes; then
+- shared_flag='${wl}-G'
+- else
+- shared_flag='${wl}-bM:SRE'
+- 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.
+- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+- if test "$aix_use_runtimelinking" = yes; then
+- # Warning - without using the other runtime loading flags (-brtl),
+- # -berok will link without error, but may produce a broken library.
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+- # Determine the default libpath from the value encoded in an empty executable.
+- _LT_AC_SYS_LIBPATH_AIX
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+- else
+- if test "$host_cpu" = ia64; then
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+- else
+- # Determine the default libpath from the value encoded in an empty executable.
+- _LT_AC_SYS_LIBPATH_AIX
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+- # Warning - without using the other run time loading flags,
+- # -berok will link without error, but may produce a broken library.
+- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+- # Exported symbols can be pulled into shared objects from archives
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+- # This is similar to how AIX traditionally builds its shared libraries.
+- _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
+- ;;
++# 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.
+
+- 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
+- ;;
++# serial 8
+
+- bsdi[[45]]*)
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+- ;;
++# 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
+- # Microsoft Visual C++.
+- # hardcode_libdir_flag_spec is actually meaningless, as there is
+- # no search path for DLLs.
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+- # Tell ltmain to make .lib files, not .a files.
+- libext=lib
+- # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=".dll"
+- # FIXME: Setting linknames here is a bad hack.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+- # The linker will automatically build a .lib file if we build a DLL.
+- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+- # FIXME: Should let the user specify the lib program.
+- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+- ;;
++# 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
+- rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
+- esac
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- if test "$GCC" = yes ; then
+- output_verbose_link_cmd='echo'
+- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+- _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+- _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
+- 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'
+- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- ;;
+- *)
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
+- esac
+- fi
+- ;;
++# 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
+- ;;
++# 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
+- ;;
+
+- # 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
+- # extra space).
+- freebsd2.2*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+- _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
+- ;;
++# _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*)
+- _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
+- ;;
++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*)
+- _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
+- ;;
++ 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'
++ 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'
++ 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
+-
+- # 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'
++ 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)=:
++ fi
++ done
+
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ 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
+- ;;
+
+- 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
+- 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_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*)
+- _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
+- ;;
++# 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
++])
+
+- 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
+- ;;
++# Generate code to set up dependency tracking. -*- Autoconf -*-
+
+- 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
+- ;;
++# 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.
++
++#serial 3
++
++# _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_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"])
++])
+
+- 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.
++#
++# 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.
+
+- 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'
+- ;;
++# serial 13
+
+- 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)=:
+- ;;
++# 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])
++# -----------------------------------------------
++# 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
+
+- # 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
++ CYGPATH_W='cygpath -w'
++ else
++ CYGPATH_W=echo
++ fi
++fi
++AC_SUBST([CYGPATH_W])
+
+- 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],
++[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
+
+- 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
+
+- 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
++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
++])
++])
+
+- 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.
++
++# 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])
+
+- 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.
+
+- 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.
++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)])
+
+- 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.
+
+- 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
+
+- 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],
++[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])])
+
+- *)
+- _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
+-# #undef WIN32_LEAN_AND_MEAN
+-# #include
+-#
+-# #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
+-# 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'
+-fi
+-])])# _AS_TEST_PREPARE
++# serial 3
+
+-# AS_EXECUTABLE_P
+-# ---------------
+-# Check whether a file is executable.
+-m4_ifndef([AS_EXECUTABLE_P],
+-[m4_defun([AS_EXECUTABLE_P],
+-[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 #
+-# macro and use it instead. #
+-# LT_AC_PROG_SED
+-# --------------
+-# Check for a fully-functional sed program, that truncates
+-# as few characters as possible. Prefer GNU sed if found.
+-AC_DEFUN([LT_AC_PROG_SED],
+-[AC_MSG_CHECKING([for a sed that does not truncate output])
+-AC_CACHE_VAL(lt_cv_path_SED,
+-[# 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.
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for lt_ac_prog in sed gsed; do
+- 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
+- done
+- done
+-done
+-IFS=$as_save_IFS
+-lt_ac_max=0
+-lt_ac_count=0
+-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+-# along with /bin/sed that truncates output.
+-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+- test ! -f $lt_ac_sed && continue
+- cat /dev/null > conftest.in
+- lt_ac_count=0
+- echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+- # Check for GNU sed and select it if it is found.
+- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+- lt_cv_path_SED=$lt_ac_sed
+- break
+- fi
+- while true; do
+- cat conftest.in conftest.in >conftest.tmp
+- mv conftest.tmp conftest.in
+- cp conftest.in conftest.nl
+- echo >>conftest.nl
+- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+- cmp -s conftest.out conftest.nl || break
+- # 10000 chars as input seems more than enough
+- test $lt_ac_count -gt 10 && break
+- lt_ac_count=`expr $lt_ac_count + 1`
+- if test $lt_ac_count -gt $lt_ac_max; then
+- lt_ac_max=$lt_ac_count
+- lt_cv_path_SED=$lt_ac_sed
+- fi
+- done
+-done
+-])
+-SED=$lt_cv_path_SED
+-AC_SUBST([SED])
+-AC_MSG_RESULT([$SED])
+-])
++# _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 .
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-# General Public License for more details.
+-#
+-# 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],
+-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+-fi
+-if test -n "$PKG_CONFIG"; then
+- _pkg_min_version=m4_default([$1], [0.9.0])
+- 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
+- AC_MSG_RESULT([no])
+- PKG_CONFIG=""
+- fi
+-
+-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
+-# --------------------------------------------------------------
+-AC_DEFUN([PKG_CHECK_EXISTS],
+-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+-if test -n "$PKG_CONFIG" && \
+- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+- m4_ifval([$2], [$2], [:])
+-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 "$$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],
+-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _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])
+-#
+-#
+-# 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
+-#
++# 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])
++# 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 2
+
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
++# _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
+-])],
+- [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.
++ # 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
++ # 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 /dev/null 2>&1 && break
++ fi
++done
++rm -rf conftest.dir
+
+-To get pkg-config, see .])],
+- [$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
++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 -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/about-me/Makefile.in gnome-control-center-2.24.0.1.new/capplets/about-me/Makefile.in
+--- gnome-control-center-2.24.0.1/capplets/about-me/Makefile.in 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/capplets/about-me/Makefile.in 2008-09-24 21:58:46.000000000 +0200
+@@ -306,7 +306,6 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/accessibility/at-properties/Makefile.in gnome-control-center-2.24.0.1.new/capplets/accessibility/at-properties/Makefile.in
+--- gnome-control-center-2.24.0.1/capplets/accessibility/at-properties/Makefile.in 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/capplets/accessibility/at-properties/Makefile.in 2008-09-24 21:58:46.000000000 +0200
+@@ -304,7 +304,6 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ 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 -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/accessibility/Makefile.in gnome-control-center-2.24.0.1.new/capplets/accessibility/Makefile.in
+--- gnome-control-center-2.24.0.1/capplets/accessibility/Makefile.in 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/capplets/accessibility/Makefile.in 2008-09-24 21:58:46.000000000 +0200
+@@ -275,7 +275,6 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = at-properties
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/appearance/data/Makefile.in gnome-control-center-2.24.0.1.new/capplets/appearance/data/Makefile.in
+--- gnome-control-center-2.24.0.1/capplets/appearance/data/Makefile.in 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/capplets/appearance/data/Makefile.in 2008-09-24 21:58:47.000000000 +0200
+@@ -285,7 +285,6 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ gladedir = $(pkgdatadir)/glade
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/appearance/Makefile.in gnome-control-center-2.24.0.1.new/capplets/appearance/Makefile.in
+--- gnome-control-center-2.24.0.1/capplets/appearance/Makefile.in 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/capplets/appearance/Makefile.in 2008-09-24 21:58:47.000000000 +0200
+@@ -47,13 +47,14 @@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+ am_gnome_appearance_properties_OBJECTS = appearance-desktop.$(OBJEXT) \
+- appearance-font.$(OBJEXT) appearance-main.$(OBJEXT) \
+- appearance-themes.$(OBJEXT) appearance-style.$(OBJEXT) \
+- appearance-ui.$(OBJEXT) gedit-message-area.$(OBJEXT) \
+- gnome-wp-info.$(OBJEXT) gnome-wp-item.$(OBJEXT) \
+- gnome-wp-xml.$(OBJEXT) theme-installer.$(OBJEXT) \
+- theme-save.$(OBJEXT) theme-util.$(OBJEXT) \
+- wp-cellrenderer.$(OBJEXT) caption-cellrenderer.$(OBJEXT)
++ appearance-effects.$(OBJEXT) appearance-font.$(OBJEXT) \
++ appearance-main.$(OBJEXT) appearance-themes.$(OBJEXT) \
++ appearance-style.$(OBJEXT) appearance-ui.$(OBJEXT) \
++ gedit-message-area.$(OBJEXT) gnome-wp-info.$(OBJEXT) \
++ gnome-wp-item.$(OBJEXT) gnome-wp-xml.$(OBJEXT) \
++ theme-installer.$(OBJEXT) theme-save.$(OBJEXT) \
++ theme-util.$(OBJEXT) wp-cellrenderer.$(OBJEXT) \
++ caption-cellrenderer.$(OBJEXT)
+ gnome_appearance_properties_OBJECTS = \
+ $(am_gnome_appearance_properties_OBJECTS)
+ am__DEPENDENCIES_1 =
+@@ -311,7 +312,6 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = data
+@@ -322,6 +322,8 @@
+ appearance.h \
+ appearance-desktop.c \
+ appearance-desktop.h \
++ appearance-effects.c\
++ appearance-effects.h\
+ appearance-font.c \
+ appearance-font.h \
+ appearance-main.c \
+@@ -444,6 +446,7 @@
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appearance-desktop.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appearance-effects.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appearance-font.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appearance-main.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appearance-style.Po@am__quote@
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/common/Makefile.in gnome-control-center-2.24.0.1.new/capplets/common/Makefile.in
+--- gnome-control-center-2.24.0.1/capplets/common/Makefile.in 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/capplets/common/Makefile.in 2008-09-24 21:58:47.000000000 +0200
+@@ -295,7 +295,6 @@
+ 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 -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/default-applications/Makefile.in gnome-control-center-2.24.0.1.new/capplets/default-applications/Makefile.in
+--- gnome-control-center-2.24.0.1/capplets/default-applications/Makefile.in 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/capplets/default-applications/Makefile.in 2008-09-24 21:58:47.000000000 +0200
+@@ -328,7 +328,6 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/display/Makefile.in gnome-control-center-2.24.0.1.new/capplets/display/Makefile.in
+--- gnome-control-center-2.24.0.1/capplets/display/Makefile.in 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/capplets/display/Makefile.in 2008-09-24 21:58:47.000000000 +0200
+@@ -316,7 +316,6 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/keybindings/Makefile.in gnome-control-center-2.24.0.1.new/capplets/keybindings/Makefile.in
+--- gnome-control-center-2.24.0.1/capplets/keybindings/Makefile.in 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/capplets/keybindings/Makefile.in 2008-09-24 21:58:47.000000000 +0200
+@@ -305,7 +305,6 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/keyboard/Makefile.in gnome-control-center-2.24.0.1.new/capplets/keyboard/Makefile.in
+--- gnome-control-center-2.24.0.1/capplets/keyboard/Makefile.in 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/capplets/keyboard/Makefile.in 2008-09-24 21:58:47.000000000 +0200
+@@ -308,7 +308,6 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/Makefile.in gnome-control-center-2.24.0.1.new/capplets/Makefile.in
+--- gnome-control-center-2.24.0.1/capplets/Makefile.in 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/capplets/Makefile.in 2008-09-24 21:58:46.000000000 +0200
+@@ -277,7 +277,6 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ always_built_SUBDIRS = \
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/mouse/Makefile.in gnome-control-center-2.24.0.1.new/capplets/mouse/Makefile.in
+--- gnome-control-center-2.24.0.1/capplets/mouse/Makefile.in 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/capplets/mouse/Makefile.in 2008-09-24 21:58:47.000000000 +0200
+@@ -300,7 +300,6 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/network/Makefile.in gnome-control-center-2.24.0.1.new/capplets/network/Makefile.in
+--- gnome-control-center-2.24.0.1/capplets/network/Makefile.in 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/capplets/network/Makefile.in 2008-09-24 21:58:47.000000000 +0200
+@@ -314,7 +314,6 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/sound/Makefile.in gnome-control-center-2.24.0.1.new/capplets/sound/Makefile.in
+--- gnome-control-center-2.24.0.1/capplets/sound/Makefile.in 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/capplets/sound/Makefile.in 2008-09-24 21:58:47.000000000 +0200
+@@ -317,7 +317,6 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/windows/Makefile.in gnome-control-center-2.24.0.1.new/capplets/windows/Makefile.in
+--- gnome-control-center-2.24.0.1/capplets/windows/Makefile.in 2008-09-24 21:58:36.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/capplets/windows/Makefile.in 2008-09-24 21:58:47.000000000 +0200
+@@ -301,7 +301,6 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/configure gnome-control-center-2.24.0.1.new/configure
+--- gnome-control-center-2.24.0.1/configure 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/configure 2008-09-24 21:58:46.000000000 +0200
+@@ -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.24.0.1.
++# Generated by GNU Autoconf 2.61 for gnome-control-center 2.24.0.1.
+ #
+ # Report bugs to .
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## --------------------- ##
+@@ -17,7 +17,7 @@
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+@@ -39,45 +39,17 @@
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+-as_nl='
+-'
+-export as_nl
+-# Printing a long string crashes Solaris 7 /usr/bin/printf.
+-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+- as_echo='printf %s\n'
+- as_echo_n='printf %s'
+-else
+- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+- as_echo_n='/usr/ucb/echo -n'
+- else
+- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+- as_echo_n_body='eval
+- arg=$1;
+- case $arg in
+- *"$as_nl"*)
+- expr "X$arg" : "X\\(.*\\)$as_nl";
+- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+- esac;
+- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+- '
+- export as_echo_n_body
+- as_echo_n='sh -c $as_echo_n_body as_echo'
+- fi
+- export as_echo_body
+- as_echo='sh -c $as_echo_body as_echo'
+-fi
+-
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+- PATH_SEPARATOR=:
+- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+- PATH_SEPARATOR=';'
+- }
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
++ fi
++ rm -f conf$$.sh
+ fi
+
+ # Support unset when possible.
+@@ -93,6 +65,8 @@
+ # 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.)
++as_nl='
++'
+ IFS=" "" $as_nl"
+
+ # Find who we are. Look in the path if we contain no directory separator.
+@@ -115,7 +89,7 @@
+ as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ { (exit 1); exit 1; }
+ fi
+
+@@ -128,10 +102,17 @@
+ PS4='+ '
+
+ # NLS nuisances.
+-LC_ALL=C
+-export LC_ALL
+-LANGUAGE=C
+-export LANGUAGE
++for as_var in \
++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++ LC_TELEPHONE LC_TIME
++do
++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++ eval $as_var=C; export $as_var
++ else
++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++ fi
++done
+
+ # Required to use basename.
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+@@ -153,7 +134,7 @@
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X/"$0" |
++echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+@@ -179,7 +160,7 @@
+ as_have_required=no
+ fi
+
+- if test $as_have_required = yes && (eval ":
++ if test $as_have_required = yes && (eval ":
+ (as_func_return () {
+ (exit \$1)
+ }
+@@ -261,7 +242,7 @@
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+@@ -282,7 +263,7 @@
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+@@ -362,10 +343,10 @@
+
+ if test "x$CONFIG_SHELL" != x; then
+ for as_var in BASH_ENV ENV
+- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+- done
+- export CONFIG_SHELL
+- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++ done
++ export CONFIG_SHELL
++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ fi
+
+
+@@ -434,10 +415,9 @@
+
+ test \$exitcode = 0") || {
+ echo No shell found that supports shell functions.
+- echo Please tell bug-autoconf@gnu.org about your system,
+- echo including any error possibly output before this message.
+- echo This can help us improve future autoconf versions.
+- echo Configuration will now proceed without shell functions.
++ echo Please tell autoconf@gnu.org about your system,
++ echo including any error possibly output before this
++ echo message
+ }
+
+
+@@ -473,7 +453,7 @@
+ s/-\n.*//
+ ' >$as_me.lineno &&
+ chmod +x "$as_me.lineno" ||
+- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { (exit 1); exit 1; }; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+@@ -501,6 +481,7 @@
+ *)
+ ECHO_N='-n';;
+ esac
++
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+@@ -513,22 +494,19 @@
+ rm -f conf$$.dir/conf$$.file
+ else
+ rm -f conf$$.dir
+- mkdir conf$$.dir 2>/dev/null
++ mkdir conf$$.dir
+ fi
+-if (echo >conf$$.file) 2>/dev/null; then
+- if ln -s conf$$.file conf$$ 2>/dev/null; then
+- as_ln_s='ln -s'
+- # ... but there are two gotchas:
+- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+- # In both cases, we have to default to `cp -p'.
+- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+- as_ln_s='cp -p'
+- elif ln conf$$.file conf$$ 2>/dev/null; then
+- as_ln_s=ln
+- else
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++ as_ln_s='ln -s'
++ # ... but there are two gotchas:
++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++ # In both cases, we have to default to `cp -p'.
++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+- fi
++elif ln conf$$.file conf$$ 2>/dev/null; then
++ as_ln_s=ln
+ else
+ as_ln_s='cp -p'
+ fi
+@@ -553,10 +531,10 @@
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+- test -d "$1/.";
++ test -d "$1/.";
+ else
+ case $1 in
+- -*)set "./$1";;
++ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ ???[sx]*):;;*)false;;esac;fi
+@@ -843,7 +821,6 @@
+ install_sh
+ STRIP
+ INSTALL_STRIP_PROGRAM
+-MKDIR_P
+ mkdir_p
+ AWK
+ SET_MAKE
+@@ -1036,34 +1013,6 @@
+ LIBOBJS
+ LTLIBOBJS'
+ ac_subst_files=''
+-ac_user_opts='
+-enable_option_checking
+-enable_maintainer_mode
+-enable_dependency_tracking
+-enable_shared
+-enable_static
+-enable_fast_install
+-with_gnu_ld
+-enable_libtool_lock
+-with_pic
+-with_tags
+-with_help_dir
+-with_omf_dir
+-with_help_formats
+-enable_scrollkeeper
+-enable_debug
+-enable_compile_warnings
+-enable_iso_c
+-with_x
+-enable_aboutme
+-enable_hal
+-with_gconf_source
+-with_gconf_schema_file_dir
+-enable_schemas_install
+-enable_gstreamer
+-with_libcanberra
+-enable_update_mimedb
+-'
+ ac_precious_vars='build_alias
+ host_alias
+ target_alias
+@@ -1128,8 +1077,6 @@
+ # Initialize some variables set by options.
+ ac_init_help=
+ ac_init_version=false
+-ac_unrecognized_opts=
+-ac_unrecognized_sep=
+ # The variables have the same names as the options, with
+ # dashes changed to underlines.
+ cache_file=/dev/null
+@@ -1228,21 +1175,13 @@
+ datarootdir=$ac_optarg ;;
+
+ -disable-* | --disable-*)
+- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
++ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+- ac_useropt_orig=$ac_useropt
+- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+- case $ac_user_opts in
+- *"
+-"enable_$ac_useropt"
+-"*) ;;
+- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+- ac_unrecognized_sep=', ';;
+- esac
+- eval enable_$ac_useropt=no ;;
++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
++ eval enable_$ac_feature=no ;;
+
+ -docdir | --docdir | --docdi | --doc | --do)
+ ac_prev=docdir ;;
+@@ -1255,21 +1194,13 @@
+ dvidir=$ac_optarg ;;
+
+ -enable-* | --enable-*)
+- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
++ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+- ac_useropt_orig=$ac_useropt
+- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+- case $ac_user_opts in
+- *"
+-"enable_$ac_useropt"
+-"*) ;;
+- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+- ac_unrecognized_sep=', ';;
+- esac
+- eval enable_$ac_useropt=\$ac_optarg ;;
++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
++ eval enable_$ac_feature=\$ac_optarg ;;
+
+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+@@ -1460,38 +1391,22 @@
+ ac_init_version=: ;;
+
+ -with-* | --with-*)
+- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
++ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
+- ac_useropt_orig=$ac_useropt
+- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+- case $ac_user_opts in
+- *"
+-"with_$ac_useropt"
+-"*) ;;
+- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+- ac_unrecognized_sep=', ';;
+- esac
+- eval with_$ac_useropt=\$ac_optarg ;;
++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
++ eval with_$ac_package=\$ac_optarg ;;
+
+ -without-* | --without-*)
+- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
++ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
+- ac_useropt_orig=$ac_useropt
+- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+- case $ac_user_opts in
+- *"
+-"with_$ac_useropt"
+-"*) ;;
+- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+- ac_unrecognized_sep=', ';;
+- esac
+- eval with_$ac_useropt=no ;;
++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
++ eval with_$ac_package=no ;;
+
+ --x)
+ # Obsolete; use --with-x.
+@@ -1511,7 +1426,7 @@
+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+ x_libraries=$ac_optarg ;;
+
+- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
++ -*) { echo "$as_me: error: unrecognized option: $ac_option
+ Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -1520,16 +1435,16 @@
+ 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 &&
+- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
++ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { (exit 1); exit 1; }; }
+ eval $ac_envvar=\$ac_optarg
+ export $ac_envvar ;;
+
+ *)
+ # FIXME: should be removed in autoconf 3.0.
+- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
++ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
++ echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+ ;;
+
+@@ -1538,38 +1453,22 @@
+
+ if test -n "$ac_prev"; then
+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
++ { echo "$as_me: error: missing argument to $ac_option" >&2
+ { (exit 1); exit 1; }; }
+ fi
+
+-if test -n "$ac_unrecognized_opts"; then
+- case $enable_option_checking in
+- no) ;;
+- fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
+- { (exit 1); exit 1; }; } ;;
+- *) $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
+- esac
+-fi
+-
+-# Check all directory arguments for consistency.
++# Be sure to have absolute directory names.
+ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ datadir sysconfdir sharedstatedir localstatedir includedir \
+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+ libdir localedir mandir
+ do
+ eval ac_val=\$$ac_var
+- # Remove trailing slashes.
+- case $ac_val in
+- */ )
+- ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+- eval $ac_var=\$ac_val;;
+- esac
+- # Be sure to have absolute directory names.
+ case $ac_val in
+ [\\/$]* | ?:[\\/]* ) continue;;
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ esac
+- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; }
+ done
+
+@@ -1584,7 +1483,7 @@
+ if test "x$host_alias" != x; then
+ if test "x$build_alias" = x; then
+ cross_compiling=maybe
+- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
++ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ 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
+@@ -1600,10 +1499,10 @@
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+- { $as_echo "$as_me: error: Working directory cannot be determined" >&2
++ { echo "$as_me: error: Working directory cannot be determined" >&2
+ { (exit 1); exit 1; }; }
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
++ { echo "$as_me: error: pwd does not report name of working directory" >&2
+ { (exit 1); exit 1; }; }
+
+
+@@ -1611,12 +1510,12 @@
+ if test -z "$srcdir"; then
+ ac_srcdir_defaulted=yes
+ # Try the directory containing this script, then the parent directory.
+- ac_confdir=`$as_dirname -- "$as_myself" ||
+-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$as_myself" : 'X\(//\)[^/]' \| \
+- X"$as_myself" : 'X\(//\)$' \| \
+- X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$as_myself" |
++ ac_confdir=`$as_dirname -- "$0" ||
++$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$0" : 'X\(//\)[^/]' \| \
++ X"$0" : 'X\(//\)$' \| \
++ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
++echo X"$0" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -1643,12 +1542,12 @@
+ fi
+ if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+ { (exit 1); exit 1; }; }
+ fi
+ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ ac_abs_confdir=`(
+- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
++ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+ { (exit 1); exit 1; }; }
+ pwd)`
+ # When building in place, set srcdir=.
+@@ -1697,9 +1596,9 @@
+
+ Installation directories:
+ --prefix=PREFIX install architecture-independent files in PREFIX
+- [$ac_default_prefix]
++ [$ac_default_prefix]
+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
+- [PREFIX]
++ [PREFIX]
+
+ By default, \`make install' will install all the files in
+ \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
+@@ -1709,26 +1608,25 @@
+ For better control, use the options below.
+
+ Fine tuning of the installation directories:
+- --bindir=DIR user executables [EPREFIX/bin]
+- --sbindir=DIR system admin executables [EPREFIX/sbin]
+- --libexecdir=DIR program executables [EPREFIX/libexec]
+- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+- --libdir=DIR object code libraries [EPREFIX/lib]
+- --includedir=DIR C header files [PREFIX/include]
+- --oldincludedir=DIR C header files for non-gcc [/usr/include]
+- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+- --infodir=DIR info documentation [DATAROOTDIR/info]
+- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+- --mandir=DIR man documentation [DATAROOTDIR/man]
+- --docdir=DIR documentation root
+- [DATAROOTDIR/doc/gnome-control-center]
+- --htmldir=DIR html documentation [DOCDIR]
+- --dvidir=DIR dvi documentation [DOCDIR]
+- --pdfdir=DIR pdf documentation [DOCDIR]
+- --psdir=DIR ps documentation [DOCDIR]
++ --bindir=DIR user executables [EPREFIX/bin]
++ --sbindir=DIR system admin executables [EPREFIX/sbin]
++ --libexecdir=DIR program executables [EPREFIX/libexec]
++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
++ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
++ --libdir=DIR object code libraries [EPREFIX/lib]
++ --includedir=DIR C header files [PREFIX/include]
++ --oldincludedir=DIR C header files for non-gcc [/usr/include]
++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
++ --infodir=DIR info documentation [DATAROOTDIR/info]
++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
++ --mandir=DIR man documentation [DATAROOTDIR/man]
++ --docdir=DIR documentation root [DATAROOTDIR/doc/gnome-control-center]
++ --htmldir=DIR html documentation [DOCDIR]
++ --dvidir=DIR dvi documentation [DOCDIR]
++ --pdfdir=DIR pdf documentation [DOCDIR]
++ --psdir=DIR ps documentation [DOCDIR]
+ _ACEOF
+
+ cat <<\_ACEOF
+@@ -1755,7 +1653,6 @@
+ cat <<\_ACEOF
+
+ Optional Features:
+- --disable-option-checking ignore unrecognized --enable/--with options
+ --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
+@@ -1900,17 +1797,15 @@
+ 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
+- test -d "$ac_dir" ||
+- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+- continue
++ test -d "$ac_dir" || continue
+ ac_builddir=.
+
+ case "$ac_dir" in
+ .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *)
+- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ # A ".." for each directory in $ac_dir_suffix.
+- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+@@ -1946,7 +1841,7 @@
+ echo &&
+ $SHELL "$ac_srcdir/configure" --help=recursive
+ else
+- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi || ac_status=$?
+ cd "$ac_pwd" || { ac_status=$?; break; }
+ done
+@@ -1956,10 +1851,10 @@
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ gnome-control-center configure 2.24.0.1
+-generated by GNU Autoconf 2.62
++generated by GNU Autoconf 2.61
+
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -1970,7 +1865,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+
+ 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 $@
+
+@@ -2006,7 +1901,7 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- $as_echo "PATH: $as_dir"
++ echo "PATH: $as_dir"
+ done
+ IFS=$as_save_IFS
+
+@@ -2041,7 +1936,7 @@
+ | -silent | --silent | --silen | --sile | --sil)
+ continue ;;
+ *\'*)
+- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
++ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ case $ac_pass in
+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+@@ -2093,12 +1988,11 @@
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) $as_unset $ac_var ;;
+ esac ;;
+ esac
+@@ -2128,9 +2022,9 @@
+ do
+ eval ac_val=\$$ac_var
+ case $ac_val in
+- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+- $as_echo "$ac_var='\''$ac_val'\''"
++ echo "$ac_var='\''$ac_val'\''"
+ done | sort
+ echo
+
+@@ -2145,9 +2039,9 @@
+ do
+ eval ac_val=\$$ac_var
+ case $ac_val in
+- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+- $as_echo "$ac_var='\''$ac_val'\''"
++ echo "$ac_var='\''$ac_val'\''"
+ done | sort
+ echo
+ fi
+@@ -2163,8 +2057,8 @@
+ echo
+ fi
+ test "$ac_signal" != 0 &&
+- $as_echo "$as_me: caught signal $ac_signal"
+- $as_echo "$as_me: exit $exit_status"
++ echo "$as_me: caught signal $ac_signal"
++ echo "$as_me: exit $exit_status"
+ } >&5
+ rm -f core *.core core.conftest.* &&
+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+@@ -2206,24 +2100,21 @@
+
+
+ # Let the site file select an alternate cache file if it wants to.
+-# Prefer an explicitly selected file to automatically selected ones.
+-ac_site_file1=NONE
+-ac_site_file2=NONE
++# Prefer explicitly selected file to automatically selected ones.
+ if test -n "$CONFIG_SITE"; then
+- ac_site_file1=$CONFIG_SITE
++ set x "$CONFIG_SITE"
+ elif test "x$prefix" != xNONE; then
+- ac_site_file1=$prefix/share/config.site
+- ac_site_file2=$prefix/etc/config.site
++ set x "$prefix/share/config.site" "$prefix/etc/config.site"
+ else
+- ac_site_file1=$ac_default_prefix/share/config.site
+- ac_site_file2=$ac_default_prefix/etc/config.site
++ set x "$ac_default_prefix/share/config.site" \
++ "$ac_default_prefix/etc/config.site"
+ fi
+-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
++shift
++for ac_site_file
+ do
+- test "x$ac_site_file" = xNONE && continue
+ if test -r "$ac_site_file"; then
+- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
++ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
++echo "$as_me: loading site script $ac_site_file" >&6;}
+ sed 's/^/| /' "$ac_site_file" >&5
+ . "$ac_site_file"
+ fi
+@@ -2233,16 +2124,16 @@
+ # Some versions of bash will fail to source /dev/null (special
+ # files actually), so we avoid doing that.
+ if test -f "$cache_file"; then
+- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+-$as_echo "$as_me: loading cache $cache_file" >&6;}
++ { echo "$as_me:$LINENO: loading cache $cache_file" >&5
++echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
+ *) . "./$cache_file";;
+ esac
+ fi
+ else
+- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+-$as_echo "$as_me: creating cache $cache_file" >&6;}
++ { echo "$as_me:$LINENO: creating cache $cache_file" >&5
++echo "$as_me: creating cache $cache_file" >&6;}
+ >$cache_file
+ fi
+
+@@ -2256,38 +2147,29 @@
+ eval ac_new_val=\$ac_env_${ac_var}_value
+ case $ac_old_set,$ac_new_set in
+ set,)
+- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
++ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,set)
+- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
++ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
++echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,);;
+ *)
+ if test "x$ac_old_val" != "x$ac_new_val"; then
+- # differences in whitespace do not lead to failure.
+- ac_old_val_w=`echo x $ac_old_val`
+- ac_new_val_w=`echo x $ac_new_val`
+- if test "$ac_old_val_w" != "$ac_new_val_w"; then
+- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+- ac_cache_corrupted=:
+- else
+- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+- eval $ac_var=\$ac_old_val
+- fi
+- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
+-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
+- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
+-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
++ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
++echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
++ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
++echo "$as_me: former value: $ac_old_val" >&2;}
++ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
++echo "$as_me: current value: $ac_new_val" >&2;}
++ ac_cache_corrupted=:
+ fi;;
+ esac
+ # Pass precious variables to config.status.
+ if test "$ac_new_set" = set; then
+ case $ac_new_val in
+- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *) ac_arg=$ac_var=$ac_new_val ;;
+ esac
+ case " $ac_configure_args " in
+@@ -2297,10 +2179,10 @@
+ fi
+ done
+ if $ac_cache_corrupted; then
+- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
++ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
++echo "$as_me: error: changes in the environment can compromise the build" >&2;}
++ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+@@ -2360,8 +2242,8 @@
+ fi
+ done
+ if test -z "$ac_aux_dir"; then
+- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
++ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
++echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+@@ -2387,12 +2269,11 @@
+ # 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.
+-# Reject install programs that cannot install multiple files.
+-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-$as_echo_n "checking for a BSD-compatible install... " >&6; }
++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -2421,29 +2302,17 @@
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+- rm -rf conftest.one conftest.two conftest.dir
+- echo one > conftest.one
+- echo two > conftest.two
+- mkdir conftest.dir
+- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+- test -s conftest.one && test -s conftest.two &&
+- test -s conftest.dir/conftest.one &&
+- test -s conftest.dir/conftest.two
+- then
+- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+- break 3
+- fi
++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
++ break 3
+ fi
+ fi
+ done
+ done
+ ;;
+ esac
+-
+ done
+ IFS=$as_save_IFS
+
+-rm -rf conftest.one conftest.two conftest.dir
+
+ fi
+ if test "${ac_cv_path_install+set}" = set; then
+@@ -2456,8 +2325,8 @@
+ INSTALL=$ac_install_sh
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+-$as_echo "$INSTALL" >&6; }
++{ echo "$as_me:$LINENO: result: $INSTALL" >&5
++echo "${ECHO_T}$INSTALL" >&6; }
+
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+ # It thinks the first close brace ends the variable substitution.
+@@ -2467,8 +2336,8 @@
+
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+-$as_echo_n "checking whether build environment is sane... " >&6; }
++{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
++echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
+@@ -2491,9 +2360,9 @@
+ # 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".
+- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
++ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" >&5
+-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
++echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -2504,23 +2373,26 @@
+ # Ok.
+ :
+ else
+- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
++ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+ Check your system clock" >&5
+-$as_echo "$as_me: error: newly created file is older than distributed files!
++echo "$as_me: error: newly created file is older than distributed files!
+ Check your system clock" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ test "$program_prefix" != NONE &&
+ program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+ test "$program_suffix" != NONE &&
+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+-# Double any \ or $.
++# Double any \ or $. echo might interpret backslashes.
+ # By default was `s,x,x', remove it if useless.
+-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
++cat <<\_ACEOF >conftest.sed
++s/[\\$]/&&/g;s/;s,x,x,$//
++_ACEOF
++program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
++rm -f conftest.sed
+
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+@@ -2531,15 +2403,15 @@
+ am_missing_run="$MISSING --run "
+ else
+ am_missing_run=
+- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
++ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
++echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
++{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
++echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+ if test -z "$MKDIR_P"; then
+ if test "${ac_cv_path_mkdir+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+@@ -2574,8 +2446,8 @@
+ MKDIR_P="$ac_install_sh -d"
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+-$as_echo "$MKDIR_P" >&6; }
++{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
++echo "${ECHO_T}$MKDIR_P" >&6; }
+
+ mkdir_p="$MKDIR_P"
+ case $mkdir_p in
+@@ -2587,10 +2459,10 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $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_prog_AWK+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$AWK"; then
+ ac_cv_prog_AWK="$AWK" # Let the user override the test.
+@@ -2603,7 +2475,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AWK="$ac_prog"
+- $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
+@@ -2614,23 +2486,22 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+-$as_echo "$AWK" >&6; }
++ { echo "$as_me:$LINENO: result: $AWK" >&5
++echo "${ECHO_T}$AWK" >&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
+
+
+ test -n "$AWK" && break
+ done
+
+-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+-set x ${MAKE-make}
+-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.make <<\_ACEOF
+ SHELL = /bin/sh
+@@ -2647,12 +2518,12 @@
+ rm -f conftest.make
+ fi
+ if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ SET_MAKE=
+ 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; }
+ SET_MAKE="MAKE=${MAKE-make}"
+ fi
+
+@@ -2671,8 +2542,8 @@
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
++ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
++echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+@@ -2727,10 +2598,10 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+-{ $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_prog_STRIP+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+@@ -2743,7 +2614,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+- $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
+@@ -2754,11 +2625,11 @@
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+-$as_echo "$STRIP" >&6; }
++ { echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&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
+
+
+@@ -2767,10 +2638,10 @@
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-{ $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_prog_ac_ct_STRIP+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+@@ -2783,7 +2654,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+- $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
+@@ -2794,11 +2665,11 @@
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-$as_echo "$ac_ct_STRIP" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&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$ac_ct_STRIP" = x; then
+@@ -2806,10 +2677,10 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&5
+-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+@@ -2830,8 +2701,8 @@
+ AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+
+-{ $as_echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5
+-$as_echo_n "checking how to create a ustar tar archive... " >&6; }
++{ echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5
++echo $ECHO_N "checking how to create a ustar tar archive... $ECHO_C" >&6; }
+ # 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}
+@@ -2904,20 +2775,20 @@
+ rm -rf conftest.dir
+
+ if test "${am_cv_prog_tar_ustar+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ am_cv_prog_tar_ustar=$_am_tool
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5
+-$as_echo "$am_cv_prog_tar_ustar" >&6; }
++{ echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5
++echo "${ECHO_T}$am_cv_prog_tar_ustar" >&6; }
+
+
+
+
+
+-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+ # Check whether --enable-maintainer-mode was given.
+ if test "${enable_maintainer_mode+set}" = set; then
+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+@@ -2925,8 +2796,8 @@
+ USE_MAINTAINER_MODE=no
+ fi
+
+- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+-$as_echo "$USE_MAINTAINER_MODE" >&6; }
++ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+ if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+ MAINTAINER_MODE_FALSE='#'
+@@ -2951,8 +2822,8 @@
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+-$as_echo_n "checking for style of include used by $am_make... " >&6; }
++{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
++echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+ am__include="#"
+ am__quote=
+ _am_result=none
+@@ -2979,8 +2850,8 @@
+ fi
+
+
+-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+-$as_echo "$_am_result" >&6; }
++{ echo "$as_me:$LINENO: result: $_am_result" >&5
++echo "${ECHO_T}$_am_result" >&6; }
+ rm -f confinc confmf
+
+ # Check whether --enable-dependency-tracking was given.
+@@ -3009,10 +2880,10 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-{ $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_prog_CC+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -3025,7 +2896,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+- $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
+@@ -3036,11 +2907,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&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
+
+
+@@ -3049,10 +2920,10 @@
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-{ $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_prog_ac_ct_CC+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+@@ -3065,7 +2936,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
+- $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
+@@ -3076,11 +2947,11 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-$as_echo "$ac_ct_CC" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&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$ac_ct_CC" = x; then
+@@ -3088,10 +2959,10 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&5
+-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+@@ -3106,10 +2977,10 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-{ $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_prog_CC+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -3122,7 +2993,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+- $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
+@@ -3133,11 +3004,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&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
+
+
+@@ -3146,10 +3017,10 @@
+ if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-{ $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_prog_CC+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -3167,7 +3038,7 @@
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+- $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
+@@ -3190,11 +3061,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&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
+
+
+@@ -3205,10 +3076,10 @@
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $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_prog_CC+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -3221,7 +3092,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+- $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
+@@ -3232,11 +3103,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&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
+
+
+@@ -3249,10 +3120,10 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $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_prog_ac_ct_CC+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+@@ -3265,7 +3136,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+- $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
+@@ -3276,11 +3147,11 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-$as_echo "$ac_ct_CC" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&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
+
+
+@@ -3292,10 +3163,10 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&5
+-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+@@ -3307,48 +3178,44 @@
+ fi
+
+
+-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
++echo "$as_me: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+
+ # Provide some information about the compiler.
+-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+-set X $ac_compile
+-ac_compiler=$2
++echo "$as_me:$LINENO: checking for C compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
+ { (ac_try="$ac_compiler --version >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ { (ac_try="$ac_compiler -v >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ { (ac_try="$ac_compiler -V >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -3367,22 +3234,27 @@
+ }
+ _ACEOF
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
++ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
+-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-
+-# The possible output files:
+-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+-
++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
++ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
++#
++# List of possible output files, starting from the most likely.
++# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
++# only as a last resort. b.out is created by i960 compilers.
++ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
++#
++# The IRIX 6 linker writes into existing files which may not be
++# executable, retaining their permissions. Remove them first so a
++# subsequent execution test works.
+ ac_rmfiles=
+ for ac_file in $ac_files
+ do
+ case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+ esac
+ done
+@@ -3393,11 +3265,10 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link_default") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (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'
+@@ -3408,7 +3279,7 @@
+ do
+ test -f "$ac_file" || continue
+ case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+ ;;
+ [ab].out )
+ # We found the default executable, but exeext='' is most
+@@ -3435,15 +3306,15 @@
+ ac_file=''
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+-$as_echo "$ac_file" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
+ if test -z "$ac_file"; then
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C compiler cannot create executables
++echo "$as_me: error: C compiler cannot create executables
+ See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+ fi
+@@ -3452,8 +3323,8 @@
+
+ # Check that the compiler produces executables we can run. If not, either
+ # the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-$as_echo_n "checking whether the C compiler works... " >&6; }
++{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+ # 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
+@@ -3462,51 +3333,49 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+- { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
++ { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run C compiled programs.
++echo "$as_me: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+
+-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
++rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+ # Check that the compiler produces executables we can run. If not, either
+ # the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-$as_echo "$cross_compiling" >&6; }
++{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
++echo "${ECHO_T}$cross_compiling" >&6; }
+
+-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+-$as_echo_n "checking for suffix of executables... " >&6; }
++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
+ # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
+@@ -3515,31 +3384,31 @@
+ for ac_file in conftest.exe conftest conftest.*; do
+ test -f "$ac_file" || continue
+ case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ break;;
+ * ) break;;
+ esac
+ done
+ else
+- { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ rm -f conftest$ac_cv_exeext
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+-$as_echo "$ac_cv_exeext" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++echo "${ECHO_T}$ac_cv_exeext" >&6; }
+
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+-$as_echo_n "checking for suffix of object files... " >&6; }
++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+ if test "${ac_cv_objext+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -3562,41 +3431,40 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ for ac_file in conftest.o conftest.obj conftest.*; do
+ test -f "$ac_file" || continue;
+ case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+ break;;
+ esac
+ done
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
++echo "$as_me: error: cannot compute suffix of object files: cannot compile
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+-$as_echo "$ac_cv_objext" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6; }
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -3622,21 +3490,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_compiler_gnu=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_compiler_gnu=no
+@@ -3646,19 +3513,15 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+-if test $ac_compiler_gnu = yes; then
+- GCC=yes
+-else
+- GCC=
+-fi
++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
++GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-$as_echo_n "checking whether $CC accepts -g... " >&6; }
++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+@@ -3685,21 +3548,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_g=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ CFLAGS=""
+@@ -3724,21 +3586,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_c_werror_flag=$ac_save_c_werror_flag
+@@ -3764,21 +3625,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_g=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+@@ -3793,8 +3653,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-$as_echo "$ac_cv_prog_cc_g" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+@@ -3810,10 +3670,10 @@
+ CFLAGS=
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cc_c89+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+@@ -3884,21 +3744,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_c89=$ac_arg
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+@@ -3914,15 +3773,15 @@
+ # AC_CACHE_VAL
+ case "x$ac_cv_prog_cc_c89" in
+ x)
+- { $as_echo "$as_me:$LINENO: result: none needed" >&5
+-$as_echo "none needed" >&6; } ;;
++ { echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6; } ;;
+ xno)
+- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+-$as_echo "unsupported" >&6; } ;;
++ { echo "$as_me:$LINENO: result: unsupported" >&5
++echo "${ECHO_T}unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
+
+
+@@ -3934,10 +3793,10 @@
+
+ depcc="$CC" am_compiler_list=
+
+-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-$as_echo_n "checking dependency style of $depcc... " >&6; }
++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ 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
+@@ -4025,8 +3884,8 @@
+ fi
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+@@ -4041,10 +3900,10 @@
+
+
+
+-{ $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
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -4082,30 +3941,26 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ 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
+
+
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ if test "${ac_cv_search_strerror+set}" = set; then
+@@ -4120,8 +3975,8 @@
+ 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"
+@@ -4136,10 +3991,10 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-{ $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_prog_CC+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -4152,7 +4007,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+- $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
+@@ -4163,11 +4018,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&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
+
+
+@@ -4176,10 +4031,10 @@
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-{ $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_prog_ac_ct_CC+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+@@ -4192,7 +4047,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
+- $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
+@@ -4203,11 +4058,11 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-$as_echo "$ac_ct_CC" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&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$ac_ct_CC" = x; then
+@@ -4215,10 +4070,10 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&5
+-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+@@ -4233,10 +4088,10 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-{ $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_prog_CC+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -4249,7 +4104,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+- $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
+@@ -4260,11 +4115,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&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
+
+
+@@ -4273,10 +4128,10 @@
+ if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-{ $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_prog_CC+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -4294,7 +4149,7 @@
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+- $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
+@@ -4317,11 +4172,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&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
+
+
+@@ -4332,10 +4187,10 @@
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $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_prog_CC+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -4348,7 +4203,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+- $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
+@@ -4359,11 +4214,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&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
+
+
+@@ -4376,10 +4231,10 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $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_prog_ac_ct_CC+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+@@ -4392,7 +4247,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+- $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
+@@ -4403,11 +4258,11 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-$as_echo "$ac_ct_CC" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&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
+
+
+@@ -4419,10 +4274,10 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&5
+-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+@@ -4434,54 +4289,50 @@
+ fi
+
+
+-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
++echo "$as_me: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+
+ # Provide some information about the compiler.
+-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+-set X $ac_compile
+-ac_compiler=$2
++echo "$as_me:$LINENO: checking for C compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
+ { (ac_try="$ac_compiler --version >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ { (ac_try="$ac_compiler -v >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ { (ac_try="$ac_compiler -V >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -4507,21 +4358,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_compiler_gnu=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_compiler_gnu=no
+@@ -4531,19 +4381,15 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+-if test $ac_compiler_gnu = yes; then
+- GCC=yes
+-else
+- GCC=
+-fi
++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
++GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-$as_echo_n "checking whether $CC accepts -g... " >&6; }
++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+@@ -4570,21 +4416,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_g=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ CFLAGS=""
+@@ -4609,21 +4454,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_c_werror_flag=$ac_save_c_werror_flag
+@@ -4649,21 +4493,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_g=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+@@ -4678,8 +4521,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-$as_echo "$ac_cv_prog_cc_g" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+@@ -4695,10 +4538,10 @@
+ CFLAGS=
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cc_c89+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+@@ -4769,21 +4612,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_c89=$ac_arg
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+@@ -4799,15 +4641,15 @@
+ # AC_CACHE_VAL
+ case "x$ac_cv_prog_cc_c89" in
+ x)
+- { $as_echo "$as_me:$LINENO: result: none needed" >&5
+-$as_echo "none needed" >&6; } ;;
++ { echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6; } ;;
+ xno)
+- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+-$as_echo "unsupported" >&6; } ;;
++ { echo "$as_me:$LINENO: result: unsupported" >&5
++echo "${ECHO_T}unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
+
+
+@@ -4819,10 +4661,10 @@
+
+ depcc="$CC" am_compiler_list=
+
+-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-$as_echo_n "checking dependency style of $depcc... " >&6; }
++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ 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
+@@ -4910,8 +4752,8 @@
+ fi
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+@@ -4926,16 +4768,16 @@
+
+
+ if test "x$CC" != xcc; then
+- { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
+-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
++ { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
++echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
+-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
++ { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
++echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
+ fi
+-set dummy $CC; ac_cc=`$as_echo "$2" |
++set dummy $CC; ac_cc=`echo $2 |
+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+ if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -4961,21 +4803,19 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ test -f conftest2.$ac_objext && { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); };
+ then
+ eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+@@ -4986,11 +4826,10 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+ rm -f conftest2.*
+@@ -4998,21 +4837,19 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ test -f conftest2.$ac_objext && { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); };
+ then
+ # cc works too.
+@@ -5030,11 +4867,11 @@
+
+ fi
+ if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&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; }
+
+ cat >>confdefs.h <<\_ACEOF
+ #define NO_MINUS_C_MINUS_O 1
+@@ -5061,15 +4898,15 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+-$as_echo_n "checking how to run the C preprocessor... " >&6; }
++{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+ fi
+ if test -z "$CPP"; then
+ if test "${ac_cv_prog_CPP+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+@@ -5101,21 +4938,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Broken: fails on valid input.
+@@ -5139,14 +4975,13 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+@@ -5154,7 +4989,7 @@
+ # Broken: success on invalid input.
+ continue
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+@@ -5179,8 +5014,8 @@
+ else
+ ac_cv_prog_CPP=$CPP
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+-$as_echo "$CPP" >&6; }
++{ echo "$as_me:$LINENO: result: $CPP" >&5
++echo "${ECHO_T}$CPP" >&6; }
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+ do
+@@ -5208,21 +5043,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Broken: fails on valid input.
+@@ -5246,14 +5080,13 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+@@ -5261,7 +5094,7 @@
+ # Broken: success on invalid input.
+ continue
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+@@ -5277,9 +5110,9 @@
+ if $ac_preproc_ok; then
+ :
+ else
+- { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -5291,37 +5124,42 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
++{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
++echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
++if test "${ac_cv_path_GREP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ # Extract the first word of "grep ggrep" to use in msg output
++if test -z "$GREP"; then
++set dummy grep ggrep; ac_prog_name=$2
+ if test "${ac_cv_path_GREP+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if test -z "$GREP"; then
+ ac_path_GREP_found=false
+- # Loop through the user's path and test for each of PROGNAME-LIST
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++# Loop through the user's path and test for each of PROGNAME-LIST
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in grep ggrep; do
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+-# Check for GNU ac_path_GREP and select it if it is found.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
++ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
++ # Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+ case `"$ac_path_GREP" --version 2>&1` in
+ *GNU*)
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+ *)
+ ac_count=0
+- $as_echo_n 0123456789 >"conftest.in"
++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+- $as_echo 'GREP' >> "conftest.nl"
++ echo 'GREP' >> "conftest.nl"
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+@@ -5336,60 +5174,74 @@
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+ esac
+
+- $ac_path_GREP_found && break 3
+- done
++
++ $ac_path_GREP_found && break 3
+ done
+ done
++
++done
+ IFS=$as_save_IFS
+- if test -z "$ac_cv_path_GREP"; then
+- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++
++
++fi
++
++GREP="$ac_cv_path_GREP"
++if test -z "$GREP"; then
++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+- fi
++fi
++
+ else
+ ac_cv_path_GREP=$GREP
+ fi
+
++
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+-$as_echo "$ac_cv_path_GREP" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
++echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+-$as_echo_n "checking for egrep... " >&6; }
++{ echo "$as_me:$LINENO: checking for egrep" >&5
++echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+ if test "${ac_cv_path_EGREP+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
+- if test -z "$EGREP"; then
++ # Extract the first word of "egrep" to use in msg output
++if test -z "$EGREP"; then
++set dummy egrep; ac_prog_name=$2
++if test "${ac_cv_path_EGREP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ ac_path_EGREP_found=false
+- # Loop through the user's path and test for each of PROGNAME-LIST
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++# Loop through the user's path and test for each of PROGNAME-LIST
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in egrep; do
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+-# Check for GNU ac_path_EGREP and select it if it is found.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
++ # Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+ case `"$ac_path_EGREP" --version 2>&1` in
+ *GNU*)
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+ *)
+ ac_count=0
+- $as_echo_n 0123456789 >"conftest.in"
++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+- $as_echo 'EGREP' >> "conftest.nl"
++ echo 'EGREP' >> "conftest.nl"
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+@@ -5404,31 +5256,40 @@
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+ esac
+
+- $ac_path_EGREP_found && break 3
+- done
++
++ $ac_path_EGREP_found && break 3
+ done
+ done
++
++done
+ IFS=$as_save_IFS
+- if test -z "$ac_cv_path_EGREP"; then
+- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++
++
++fi
++
++EGREP="$ac_cv_path_EGREP"
++if test -z "$EGREP"; then
++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+- fi
++fi
++
+ else
+ ac_cv_path_EGREP=$EGREP
+ fi
+
++
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+-$as_echo "$ac_cv_path_EGREP" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-$as_echo_n "checking for ANSI C header files... " >&6; }
++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -5455,21 +5316,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_stdc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_stdc=no
+@@ -5561,40 +5421,37 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+- $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -rf conftest.dSYM
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+
+
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-$as_echo "$ac_cv_header_stdc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -5677,34 +5534,34 @@
+
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
++ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
++echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+-$as_echo_n "checking build system type... " >&6; }
++{ echo "$as_me:$LINENO: checking build system type" >&5
++echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+ if test "${ac_cv_build+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_build_alias=$build_alias
+ test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+ test "x$ac_build_alias" = x &&
+- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
++ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
++echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { (exit 1); exit 1; }; }
+ ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+-$as_echo "$ac_cv_build" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
++echo "${ECHO_T}$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
++echo "$as_me: error: invalid value of canonical build" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+ build=$ac_cv_build
+@@ -5721,27 +5578,27 @@
+ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+-$as_echo_n "checking host system type... " >&6; }
++{ echo "$as_me:$LINENO: checking host system type" >&5
++echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+ if test "${ac_cv_host+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
+ else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+-$as_echo "$ac_cv_host" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
++echo "${ECHO_T}$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
++echo "$as_me: error: invalid value of canonical host" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+ host=$ac_cv_host
+@@ -5758,10 +5615,10 @@
+ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
++{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
++echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+ if test "${lt_cv_path_SED+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ 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.
+@@ -5814,8 +5671,8 @@
+
+ SED=$lt_cv_path_SED
+
+-{ $as_echo "$as_me:$LINENO: result: $SED" >&5
+-$as_echo "$SED" >&6; }
++{ echo "$as_me:$LINENO: result: $SED" >&5
++echo "${ECHO_T}$SED" >&6; }
+
+
+ # Check whether --with-gnu-ld was given.
+@@ -5828,8 +5685,8 @@
+ ac_prog=ld
+ if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-$as_echo_n "checking for ld used by $CC... " >&6; }
++ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+@@ -5858,14 +5715,14 @@
+ ;;
+ esac
+ elif test "$with_gnu_ld" = yes; then
+- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+-$as_echo_n "checking for GNU ld... " >&6; }
++ { echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-$as_echo_n "checking for non-GNU ld... " >&6; }
++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ fi
+ if test "${lt_cv_path_LD+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -z "$LD"; then
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+@@ -5895,19 +5752,19 @@
+
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+- { $as_echo "$as_me:$LINENO: result: $LD" >&5
+-$as_echo "$LD" >&6; }
++ { echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&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
+-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 &5
+-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+-$as_echo_n "checking for $LD option to reload object files... " >&6; }
++{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
++echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
+ if test "${lt_cv_ld_reload_flag+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_ld_reload_flag='-r'
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+-$as_echo "$lt_cv_ld_reload_flag" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
++echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+ reload_flag=$lt_cv_ld_reload_flag
+ case $reload_flag in
+ "" | " "*) ;;
+@@ -5949,10 +5806,10 @@
+ ;;
+ esac
+
+-{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+-$as_echo_n "checking for BSD-compatible nm... " >&6; }
++{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
++echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+ if test "${lt_cv_path_NM+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$NM"; then
+ # Let the user override the test.
+@@ -5998,25 +5855,25 @@
+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+-$as_echo "$lt_cv_path_NM" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
++echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+ NM="$lt_cv_path_NM"
+
+-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+-$as_echo_n "checking whether ln -s works... " >&6; }
++{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+ LN_S=$as_ln_s
+ if test "$LN_S" = "ln -s"; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+-$as_echo "no, using $LN_S" >&6; }
++ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
++echo "${ECHO_T}no, using $LN_S" >&6; }
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
++echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
+ if test "${lt_cv_deplibs_check_method+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_file_magic_cmd='$MAGIC_CMD'
+ lt_cv_file_magic_test_file=
+@@ -6128,7 +5985,7 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-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
+@@ -6199,8 +6056,8 @@
+ esac
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+-$as_echo "$lt_cv_deplibs_check_method" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
++echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+ 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
+@@ -6233,7 +6090,7 @@
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *ELF-32*)
+@@ -6248,11 +6105,11 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 6251 "configure"' > conftest.$ac_ext
++ echo '#line 6108 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+ case `/usr/bin/file conftest.$ac_objext` in
+@@ -6290,7 +6147,7 @@
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.o` in
+ *32-bit*)
+@@ -6313,7 +6170,6 @@
+ esac
+ ;;
+ *64-bit*)
+- libsuff=64
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+@@ -6341,10 +6197,10 @@
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -belf"
+- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
++ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
++echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+ if test "${lt_cv_cc_needs_belf+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -6373,30 +6229,26 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ lt_cv_cc_needs_belf=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ lt_cv_cc_needs_belf=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_ext=c
+@@ -6406,8 +6258,8 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+-$as_echo "$lt_cv_cc_needs_belf" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
++echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+ CFLAGS="$SAVE_CFLAGS"
+@@ -6419,7 +6271,7 @@
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.o` in
+ *64-bit*)
+@@ -6456,11 +6308,11 @@
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -6478,21 +6330,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Header=no"
+@@ -6500,14 +6351,12 @@
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if test `eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'` = yes; then
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -6518,21 +6367,20 @@
+
+ for ac_header in dlfcn.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -6548,33 +6396,32 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -6588,52 +6435,51 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## ----------------------------------------------------------------------------------- ##
+ ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center ##
+@@ -6642,23 +6488,21 @@
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+-if test `eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'` = yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -6679,10 +6523,10 @@
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $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_prog_CXX+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$CXX"; then
+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
+@@ -6695,7 +6539,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+- $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
+@@ -6706,11 +6550,11 @@
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+- { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+-$as_echo "$CXX" >&6; }
++ { echo "$as_me:$LINENO: result: $CXX" >&5
++echo "${ECHO_T}$CXX" >&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
+
+
+@@ -6723,10 +6567,10 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $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_prog_ac_ct_CXX+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_CXX"; then
+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+@@ -6739,7 +6583,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
+- $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
+@@ -6750,11 +6594,11 @@
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+-$as_echo "$ac_ct_CXX" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
++echo "${ECHO_T}$ac_ct_CXX" >&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
+
+
+@@ -6766,10 +6610,10 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&5
+-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+@@ -6781,47 +6625,43 @@
+ fi
+ fi
+ # Provide some information about the compiler.
+-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+-set X $ac_compile
+-ac_compiler=$2
++echo "$as_me:$LINENO: checking for C++ compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
+ { (ac_try="$ac_compiler --version >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ { (ac_try="$ac_compiler -v >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ { (ac_try="$ac_compiler -V >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -6847,21 +6687,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_compiler_gnu=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_compiler_gnu=no
+@@ -6871,19 +6710,15 @@
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+-if test $ac_compiler_gnu = yes; then
+- GXX=yes
+-else
+- GXX=
+-fi
++{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
++GXX=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CXXFLAGS=${CXXFLAGS+set}
+ ac_save_CXXFLAGS=$CXXFLAGS
+-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
++{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
++echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cxx_g+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ ac_cxx_werror_flag=yes
+@@ -6910,21 +6745,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cxx_g=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ CXXFLAGS=""
+@@ -6949,21 +6783,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+@@ -6989,21 +6822,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cxx_g=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+@@ -7018,8 +6850,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+-$as_echo "$ac_cv_prog_cxx_g" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+ if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS=$ac_save_CXXFLAGS
+ elif test $ac_cv_prog_cxx_g = yes; then
+@@ -7043,10 +6875,10 @@
+
+ depcc="$CXX" am_compiler_list=
+
+-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-$as_echo_n "checking dependency style of $depcc... " >&6; }
++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ 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
+@@ -7134,8 +6966,8 @@
+ fi
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
++{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+ CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+ if
+@@ -7159,11 +6991,11 @@
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
++{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+ if test -z "$CXXCPP"; then
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ # Double quotes because CXXCPP needs to be expanded
+ for CXXCPP in "$CXX -E" "/lib/cpp"
+@@ -7195,21 +7027,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Broken: fails on valid input.
+@@ -7233,14 +7064,13 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+@@ -7248,7 +7078,7 @@
+ # Broken: success on invalid input.
+ continue
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+@@ -7273,8 +7103,8 @@
+ else
+ ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+-$as_echo "$CXXCPP" >&6; }
++{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
++echo "${ECHO_T}$CXXCPP" >&6; }
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+ do
+@@ -7302,21 +7132,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Broken: fails on valid input.
+@@ -7340,14 +7169,13 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+@@ -7355,7 +7183,7 @@
+ # Broken: success on invalid input.
+ continue
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+@@ -7371,9 +7199,9 @@
+ if $ac_preproc_ok; then
+ :
+ else
+- { { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -7396,10 +7224,10 @@
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $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_prog_F77+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$F77"; then
+ ac_cv_prog_F77="$F77" # Let the user override the test.
+@@ -7412,7 +7240,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+- $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
+@@ -7423,11 +7251,11 @@
+ fi
+ F77=$ac_cv_prog_F77
+ if test -n "$F77"; then
+- { $as_echo "$as_me:$LINENO: result: $F77" >&5
+-$as_echo "$F77" >&6; }
++ { echo "$as_me:$LINENO: result: $F77" >&5
++echo "${ECHO_T}$F77" >&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
+
+
+@@ -7440,10 +7268,10 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $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_prog_ac_ct_F77+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_F77"; then
+ ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
+@@ -7456,7 +7284,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_F77="$ac_prog"
+- $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
+@@ -7467,11 +7295,11 @@
+ fi
+ ac_ct_F77=$ac_cv_prog_ac_ct_F77
+ if test -n "$ac_ct_F77"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+-$as_echo "$ac_ct_F77" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
++echo "${ECHO_T}$ac_ct_F77" >&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
+
+
+@@ -7483,10 +7311,10 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&5
+-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+@@ -7497,41 +7325,37 @@
+
+
+ # Provide some information about the compiler.
+-$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
+-set X $ac_compile
+-ac_compiler=$2
++echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
+ { (ac_try="$ac_compiler --version >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ { (ac_try="$ac_compiler -v >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ { (ac_try="$ac_compiler -V >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ rm -f a.out
+
+@@ -7539,10 +7363,10 @@
+ # input file. (Note that this only needs to work for GNU compilers.)
+ ac_save_ext=$ac_ext
+ ac_ext=F
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+-$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
++{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_f77_compiler_gnu+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ program main
+@@ -7558,21 +7382,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_compiler_gnu=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_compiler_gnu=no
+@@ -7582,16 +7405,16 @@
+ ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+-$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
+ ac_ext=$ac_save_ext
+ ac_test_FFLAGS=${FFLAGS+set}
+ ac_save_FFLAGS=$FFLAGS
+ FFLAGS=
+-{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+-$as_echo_n "checking whether $F77 accepts -g... " >&6; }
++{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
++echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_f77_g+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ FFLAGS=-g
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -7605,21 +7428,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_f77_g=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_prog_f77_g=no
+@@ -7628,8 +7450,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+-$as_echo "$ac_cv_prog_f77_g" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
++echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
+ if test "$ac_test_FFLAGS" = set; then
+ FFLAGS=$ac_save_FFLAGS
+ elif test $ac_cv_prog_f77_g = yes; then
+@@ -7646,11 +7468,7 @@
+ fi
+ fi
+
+-if test $ac_compiler_gnu = yes; then
+- G77=yes
+-else
+- G77=
+-fi
++G77=`test $ac_compiler_gnu = yes && echo yes`
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -7661,10 +7479,10 @@
+
+ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+ # find the maximum length of command line arguments
+-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
++{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
++echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+ if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ i=0
+ teststring="ABCD"
+@@ -7773,11 +7591,11 @@
+ fi
+
+ if test -n $lt_cv_sys_max_cmd_len ; then
+- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
++ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
++echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: none" >&5
+-$as_echo "none" >&6; }
++ { echo "$as_me:$LINENO: result: none" >&5
++echo "${ECHO_T}none" >&6; }
+ fi
+
+
+@@ -7785,10 +7603,10 @@
+
+
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
++{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
++echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+ if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ # These are sane defaults that work on at least a few old systems.
+@@ -7893,14 +7711,14 @@
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ # Now try to grab the symbols.
+ nlist=conftest.nm
+ if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s "$nlist"; then
+ # Try sorting and uniquifying the output.
+ if sort "$nlist" | uniq > "$nlist"T; then
+@@ -7955,7 +7773,7 @@
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext}; then
+ pipe_works=yes
+ fi
+@@ -7990,17 +7808,17 @@
+ lt_cv_sys_global_symbol_to_cdecl=
+ fi
+ if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+- { $as_echo "$as_me:$LINENO: result: failed" >&5
+-$as_echo "failed" >&6; }
++ { echo "$as_me:$LINENO: result: failed" >&5
++echo "${ECHO_T}failed" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: ok" >&5
+-$as_echo "ok" >&6; }
++ { echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6; }
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
+-$as_echo_n "checking for objdir... " >&6; }
++{ echo "$as_me:$LINENO: checking for objdir" >&5
++echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+ if test "${lt_cv_objdir+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ rm -f .libs 2>/dev/null
+ mkdir .libs 2>/dev/null
+@@ -8012,8 +7830,8 @@
+ fi
+ rmdir .libs 2>/dev/null
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+-$as_echo "$lt_cv_objdir" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
++echo "${ECHO_T}$lt_cv_objdir" >&6; }
+ objdir=$lt_cv_objdir
+
+
+@@ -8064,10 +7882,10 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+-{ $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_prog_AR+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
+@@ -8080,7 +7898,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+- $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
+@@ -8091,11 +7909,11 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- { $as_echo "$as_me:$LINENO: result: $AR" >&5
+-$as_echo "$AR" >&6; }
++ { echo "$as_me:$LINENO: result: $AR" >&5
++echo "${ECHO_T}$AR" >&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
+
+
+@@ -8104,10 +7922,10 @@
+ ac_ct_AR=$AR
+ # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-{ $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_prog_ac_ct_AR+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+@@ -8120,7 +7938,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_AR="ar"
+- $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
+@@ -8131,11 +7949,11 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+-$as_echo "$ac_ct_AR" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
++echo "${ECHO_T}$ac_ct_AR" >&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$ac_ct_AR" = x; then
+@@ -8143,10 +7961,10 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&5
+-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+@@ -8160,10 +7978,10 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-{ $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_prog_RANLIB+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$RANLIB"; then
+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+@@ -8176,7 +7994,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+- $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
+@@ -8187,11 +8005,11 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+-$as_echo "$RANLIB" >&6; }
++ { echo "$as_me:$LINENO: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&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
+
+
+@@ -8200,10 +8018,10 @@
+ ac_ct_RANLIB=$RANLIB
+ # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-{ $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_prog_ac_ct_RANLIB+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_RANLIB"; then
+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+@@ -8216,7 +8034,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+- $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
+@@ -8227,11 +8045,11 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+-$as_echo "$ac_ct_RANLIB" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&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$ac_ct_RANLIB" = x; then
+@@ -8239,10 +8057,10 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&5
+-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+@@ -8256,10 +8074,10 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+-{ $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_prog_STRIP+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+@@ -8272,7 +8090,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+- $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
+@@ -8283,11 +8101,11 @@
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+-$as_echo "$STRIP" >&6; }
++ { echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&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
+
+
+@@ -8296,10 +8114,10 @@
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-{ $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_prog_ac_ct_STRIP+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+@@ -8312,7 +8130,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+- $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
+@@ -8323,11 +8141,11 @@
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-$as_echo "$ac_ct_STRIP" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&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$ac_ct_STRIP" = x; then
+@@ -8335,10 +8153,10 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&5
+-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+@@ -8403,10 +8221,10 @@
+ case $deplibs_check_method in
+ file_magic*)
+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
++ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
++echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $MAGIC_CMD in
+ [\\/*] | ?:[\\/]*)
+@@ -8456,19 +8274,19 @@
+
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-$as_echo "$MAGIC_CMD" >&6; }
++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&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 "$lt_cv_path_MAGIC_CMD"; then
+ if test -n "$ac_tool_prefix"; then
+- { $as_echo "$as_me:$LINENO: checking for file" >&5
+-$as_echo_n "checking for file... " >&6; }
++ { echo "$as_me:$LINENO: checking for file" >&5
++echo $ECHO_N "checking for file... $ECHO_C" >&6; }
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $MAGIC_CMD in
+ [\\/*] | ?:[\\/]*)
+@@ -8518,11 +8336,11 @@
+
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-$as_echo "$MAGIC_CMD" >&6; }
++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&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
+
+ else
+@@ -8540,10 +8358,10 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+-{ $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_prog_DSYMUTIL+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$DSYMUTIL"; then
+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+@@ -8556,7 +8374,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+- $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
+@@ -8567,11 +8385,11 @@
+ fi
+ DSYMUTIL=$ac_cv_prog_DSYMUTIL
+ if test -n "$DSYMUTIL"; then
+- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+-$as_echo "$DSYMUTIL" >&6; }
++ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
++echo "${ECHO_T}$DSYMUTIL" >&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
+
+
+@@ -8580,10 +8398,10 @@
+ ac_ct_DSYMUTIL=$DSYMUTIL
+ # Extract the first word of "dsymutil", so it can be a program name with args.
+ set dummy dsymutil; ac_word=$2
+-{ $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_prog_ac_ct_DSYMUTIL+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_DSYMUTIL"; then
+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+@@ -8596,7 +8414,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+- $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
+@@ -8607,11 +8425,11 @@
+ fi
+ ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+ if test -n "$ac_ct_DSYMUTIL"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+-$as_echo "$ac_ct_DSYMUTIL" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
++echo "${ECHO_T}$ac_ct_DSYMUTIL" >&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$ac_ct_DSYMUTIL" = x; then
+@@ -8619,10 +8437,10 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&5
+-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+@@ -8636,10 +8454,10 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+-{ $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_prog_NMEDIT+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$NMEDIT"; then
+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+@@ -8652,7 +8470,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+- $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
+@@ -8663,11 +8481,11 @@
+ fi
+ NMEDIT=$ac_cv_prog_NMEDIT
+ if test -n "$NMEDIT"; then
+- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+-$as_echo "$NMEDIT" >&6; }
++ { echo "$as_me:$LINENO: result: $NMEDIT" >&5
++echo "${ECHO_T}$NMEDIT" >&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
+
+
+@@ -8676,10 +8494,10 @@
+ ac_ct_NMEDIT=$NMEDIT
+ # Extract the first word of "nmedit", so it can be a program name with args.
+ set dummy nmedit; ac_word=$2
+-{ $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_prog_ac_ct_NMEDIT+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_NMEDIT"; then
+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+@@ -8692,7 +8510,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_NMEDIT="nmedit"
+- $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
+@@ -8703,11 +8521,11 @@
+ fi
+ ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+ if test -n "$ac_ct_NMEDIT"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+-$as_echo "$ac_ct_NMEDIT" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
++echo "${ECHO_T}$ac_ct_NMEDIT" >&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$ac_ct_NMEDIT" = x; then
+@@ -8715,10 +8533,10 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&5
+-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+@@ -8730,10 +8548,10 @@
+ fi
+
+
+- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+-$as_echo_n "checking for -single_module linker flag... " >&6; }
++ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
++echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
+ if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+@@ -8751,12 +8569,12 @@
+ rm conftest.c
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
++echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
++ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
++echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
+ if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_ld_exported_symbols_list=no
+ save_LDFLAGS=$LDFLAGS
+@@ -8783,37 +8601,33 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ lt_cv_ld_exported_symbols_list=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ lt_cv_ld_exported_symbols_list=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
++echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
+ case $host_os in
+ rhapsody* | darwin1.[0123])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+@@ -8925,10 +8739,10 @@
+ lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_rtti_exceptions=no
+ ac_outfile=conftest.$ac_objext
+@@ -8943,11 +8757,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8946: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8760: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8950: \$? = $ac_status" >&5
++ echo "$as_me:8764: \$? = $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.
+@@ -8960,8 +8774,8 @@
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+ 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"
+@@ -8975,8 +8789,8 @@
+ lt_prog_compiler_pic=
+ lt_prog_compiler_static=
+
+-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl='-Wl,'
+@@ -9207,18 +9021,18 @@
+ esac
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+-$as_echo "$lt_prog_compiler_pic" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic"; then
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_pic_works=no
+ ac_outfile=conftest.$ac_objext
+@@ -9233,11 +9047,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9236: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9050: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9240: \$? = $ac_status" >&5
++ echo "$as_me:9054: \$? = $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.
+@@ -9250,8 +9064,8 @@
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
+
+ if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+ case $lt_prog_compiler_pic in
+@@ -9278,10 +9092,10 @@
+ # Check to make sure the static flag actually works.
+ #
+ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_static_works=no
+ save_LDFLAGS="$LDFLAGS"
+@@ -9306,8 +9120,8 @@
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+
+ if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+ :
+@@ -9316,10 +9130,10 @@
+ fi
+
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_c_o=no
+ $rm -r conftest 2>/dev/null
+@@ -9337,11 +9151,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9340: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9154: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9344: \$? = $ac_status" >&5
++ echo "$as_me:9158: \$? = $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
+@@ -9363,34 +9177,34 @@
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-$as_echo_n "checking if we can lock with hard links... " >&6; }
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ 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
+- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+-$as_echo "$hard_links" >&6; }
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ if test "$hard_links" = no; then
+- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ need_locks=warn
+ fi
+ else
+ need_locks=no
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ runpath_var=
+ allow_undefined_flag=
+@@ -9602,12 +9416,13 @@
+ $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
++ link_all_deplibs=no
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -9820,21 +9635,18 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+@@ -9849,13 +9661,12 @@
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+-rm -rf conftest.dSYM
+ 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
+@@ -9890,21 +9701,18 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+@@ -9919,13 +9727,12 @@
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+-rm -rf conftest.dSYM
+ 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
+@@ -10158,7 +9965,7 @@
+ link_all_deplibs=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -10377,8 +10184,8 @@
+ esac
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+-$as_echo "$ld_shlibs" >&6; }
++{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
++echo "${ECHO_T}$ld_shlibs" >&6; }
+ test "$ld_shlibs" = no && can_build_shared=no
+
+ #
+@@ -10398,15 +10205,15 @@
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+@@ -10424,7 +10231,7 @@
+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ then
+ archive_cmds_need_lc=no
+@@ -10436,16 +10243,16 @@
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+-$as_echo "$archive_cmds_need_lc" >&6; }
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
++echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-$as_echo_n "checking dynamic linker characteristics... " >&6; }
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+@@ -10853,13 +10660,11 @@
+ # 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 +10676,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-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
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -11048,19 +10865,19 @@
+ dynamic_linker=no
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-$as_echo "$dynamic_linker" >&6; }
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
+ if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+ fi
+
+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+ fi
+@@ -11072,8 +10889,8 @@
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+ hardcode_action=
+ if test -n "$hardcode_libdir_flag_spec" || \
+ test -n "$runpath_var" || \
+@@ -11097,8 +10914,8 @@
+ # directories.
+ hardcode_action=unsupported
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+-$as_echo "$hardcode_action" >&6; }
++{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
++echo "${ECHO_T}$hardcode_action" >&6; }
+
+ if test "$hardcode_action" = relink; then
+ # Fast installation is not supported
+@@ -11111,13 +10928,13 @@
+
+ striplib=
+ old_striplib=
+-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
++{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+ 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"
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ # FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+@@ -11125,16 +10942,16 @@
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+ old_striplib="$STRIP -S"
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&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
+ ;;
+ *)
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ ;;
+ esac
+ fi
+@@ -11166,10 +10983,10 @@
+
+ darwin*)
+ # if libdl is installed we need to link against it
+- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-$as_echo_n "checking for dlopen in -ldl... " >&6; }
++ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl $LIBS"
+@@ -11201,36 +11018,32 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dl_dlopen=yes
+ 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_dl_dlopen=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+ if test $ac_cv_lib_dl_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+@@ -11244,10 +11057,10 @@
+ ;;
+
+ *)
+- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+-$as_echo_n "checking for shl_load... " >&6; }
++ { echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+ if test "${ac_cv_func_shl_load+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -11300,42 +11113,38 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_shl_load=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_shl_load=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-$as_echo "$ac_cv_func_shl_load" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
+ if test $ac_cv_func_shl_load = yes; then
+ lt_cv_dlopen="shl_load"
+ else
+- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-$as_echo_n "checking for shl_load in -ldld... " >&6; }
++ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldld $LIBS"
+@@ -11367,43 +11176,39 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dld_shl_load=yes
+ 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_dld_shl_load=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+ if test $ac_cv_lib_dld_shl_load = yes; then
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+-$as_echo_n "checking for dlopen... " >&6; }
++ { echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+ if test "${ac_cv_func_dlopen+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -11456,42 +11261,38 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_dlopen=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_dlopen=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-$as_echo "$ac_cv_func_dlopen" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
+ if test $ac_cv_func_dlopen = yes; then
+ lt_cv_dlopen="dlopen"
+ else
+- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-$as_echo_n "checking for dlopen in -ldl... " >&6; }
++ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl $LIBS"
+@@ -11523,43 +11324,39 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dl_dlopen=yes
+ 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_dl_dlopen=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+ if test $ac_cv_lib_dl_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
++ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsvld $LIBS"
+@@ -11591,43 +11388,39 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_svld_dlopen=yes
+ 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_svld_dlopen=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
+ if test $ac_cv_lib_svld_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
+- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+-$as_echo_n "checking for dld_link in -ldld... " >&6; }
++ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldld $LIBS"
+@@ -11659,36 +11452,32 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dld_dld_link=yes
+ 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_dld_dld_link=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
+ if test $ac_cv_lib_dld_dld_link = yes; then
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ fi
+@@ -11728,10 +11517,10 @@
+ save_LIBS="$LIBS"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+
+- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
++ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
+ if test "${lt_cv_dlopen_self+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "$cross_compiling" = yes; then :
+ lt_cv_dlopen_self=cross
+@@ -11739,7 +11528,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+@@ -11823,15 +11612,15 @@
+
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-$as_echo "$lt_cv_dlopen_self" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+
+ if test "x$lt_cv_dlopen_self" = xyes; then
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
++ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
+ if test "${lt_cv_dlopen_self_static+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "$cross_compiling" = yes; then :
+ lt_cv_dlopen_self_static=cross
+@@ -11839,7 +11628,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+@@ -11923,8 +11712,8 @@
+
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-$as_echo "$lt_cv_dlopen_self_static" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+ fi
+
+ CPPFLAGS="$save_CPPFLAGS"
+@@ -11946,13 +11735,13 @@
+
+
+ # Report which library types will actually be built
+-{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+-$as_echo "$can_build_shared" >&6; }
++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6; }
+
+-{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-$as_echo_n "checking whether to build shared libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+@@ -11972,15 +11761,15 @@
+ fi
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+-$as_echo "$enable_shared" >&6; }
++{ echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6; }
+
+-{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-$as_echo_n "checking whether to build static libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+-{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+-$as_echo "$enable_static" >&6; }
++{ echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6; }
+
+ # The else clause should only fire when bootstrapping the
+ # libtool distribution, otherwise you forgot to ship ltmain.sh
+@@ -12073,8 +11862,8 @@
+ cfgfile="${ofile}T"
+ trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+ $rm -f "$cfgfile"
+- { $as_echo "$as_me:$LINENO: creating $ofile" >&5
+-$as_echo "$as_me: creating $ofile" >&6;}
++ { echo "$as_me:$LINENO: creating $ofile" >&5
++echo "$as_me: creating $ofile" >&6;}
+
+ cat <<__EOF__ >> "$cfgfile"
+ #! $SHELL
+@@ -12486,18 +12275,18 @@
+
+ if test -f "$ltmain" && test -n "$tagnames"; then
+ if test ! -f "${ofile}"; then
+- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
+-$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
++ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
++echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
+ fi
+
+ if test -z "$LTCC"; then
+ eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+ if test -z "$LTCC"; then
+- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
+-$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
++ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
++echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
+ else
+- { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
+-$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
++ { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
++echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+ fi
+ fi
+ if test -z "$LTCFLAGS"; then
+@@ -12514,16 +12303,16 @@
+ # Check whether tagname contains only valid characters
+ case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
+ "") ;;
+- *) { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
+-$as_echo "$as_me: error: invalid tag name: $tagname" >&2;}
++ *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
++echo "$as_me: error: invalid tag name: $tagname" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+
+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+ then
+- { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
+-$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
++ { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
++echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+@@ -12666,8 +12455,8 @@
+ ac_prog=ld
+ if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-$as_echo_n "checking for ld used by $CC... " >&6; }
++ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+@@ -12696,14 +12485,14 @@
+ ;;
+ esac
+ elif test "$with_gnu_ld" = yes; then
+- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+-$as_echo_n "checking for GNU ld... " >&6; }
++ { echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-$as_echo_n "checking for non-GNU ld... " >&6; }
++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ fi
+ if test "${lt_cv_path_LD+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -z "$LD"; then
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+@@ -12733,19 +12522,19 @@
+
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+- { $as_echo "$as_me:$LINENO: result: $LD" >&5
+-$as_echo "$LD" >&6; }
++ { echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&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
+-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 &5
+-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+@@ -12808,8 +12597,8 @@
+ fi
+
+ # PORTME: fill in a description of your system's C++ link characteristics
+-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ ld_shlibs_CXX=yes
+ case $host_os in
+ aix3*)
+@@ -12926,21 +12715,18 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+@@ -12955,13 +12741,12 @@
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+-rm -rf conftest.dSYM
+ 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
+@@ -12997,21 +12782,18 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+@@ -13026,13 +12808,12 @@
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+-rm -rf conftest.dSYM
+ 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
+@@ -13435,7 +13216,7 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ 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=
+@@ -13762,8 +13543,8 @@
+ ld_shlibs_CXX=no
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+-$as_echo "$ld_shlibs_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+ test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+ GCC_CXX="$GXX"
+@@ -13782,7 +13563,7 @@
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ # Parse the compiler output and extract the necessary
+ # objects, libraries and library flags.
+@@ -13938,8 +13719,8 @@
+ lt_prog_compiler_pic_CXX=
+ lt_prog_compiler_static_CXX=
+
+-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ # C++ specific cases for pic, static, wl, etc.
+ if test "$GXX" = yes; then
+@@ -14139,7 +13920,7 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+@@ -14222,18 +14003,18 @@
+ esac
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_CXX"; then
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_pic_works_CXX=no
+ ac_outfile=conftest.$ac_objext
+@@ -14248,11 +14029,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14251: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14032: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:14255: \$? = $ac_status" >&5
++ echo "$as_me:14036: \$? = $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.
+@@ -14265,8 +14046,8 @@
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+-$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+
+ if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+ case $lt_prog_compiler_pic_CXX in
+@@ -14293,10 +14074,10 @@
+ # Check to make sure the static flag actually works.
+ #
+ wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_static_works_CXX=no
+ save_LDFLAGS="$LDFLAGS"
+@@ -14321,8 +14102,8 @@
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+-$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
+
+ if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+ :
+@@ -14331,10 +14112,10 @@
+ fi
+
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_c_o_CXX=no
+ $rm -r conftest 2>/dev/null
+@@ -14352,11 +14133,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14355: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14136: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:14359: \$? = $ac_status" >&5
++ echo "$as_me:14140: \$? = $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
+@@ -14378,34 +14159,34 @@
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-$as_echo_n "checking if we can lock with hard links... " >&6; }
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ 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
+- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+-$as_echo "$hard_links" >&6; }
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ if test "$hard_links" = no; then
+- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ need_locks=warn
+ fi
+ else
+ need_locks=no
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+@@ -14424,14 +14205,17 @@
+ 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'
+ ;;
++ linux* | k*bsd*-gnu)
++ link_all_deplibs_CXX=no
++ ;;
+ *)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+ esac
+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+
+-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+-$as_echo "$ld_shlibs_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+ test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+ #
+@@ -14451,15 +14235,15 @@
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+@@ -14477,7 +14261,7 @@
+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ then
+ archive_cmds_need_lc_CXX=no
+@@ -14489,16 +14273,16 @@
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+-$as_echo "$archive_cmds_need_lc_CXX" >&6; }
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-$as_echo_n "checking dynamic linker characteristics... " >&6; }
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+@@ -14854,13 +14638,11 @@
+ # 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 +14654,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-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
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -15049,19 +14843,19 @@
+ dynamic_linker=no
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-$as_echo "$dynamic_linker" >&6; }
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
+ if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+ fi
+
+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+ fi
+@@ -15073,8 +14867,8 @@
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+ hardcode_action_CXX=
+ if test -n "$hardcode_libdir_flag_spec_CXX" || \
+ test -n "$runpath_var_CXX" || \
+@@ -15098,8 +14892,8 @@
+ # directories.
+ hardcode_action_CXX=unsupported
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+-$as_echo "$hardcode_action_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
++echo "${ECHO_T}$hardcode_action_CXX" >&6; }
+
+ if test "$hardcode_action_CXX" = relink; then
+ # Fast installation is not supported
+@@ -15637,13 +15431,13 @@
+ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+
+-{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+-$as_echo "$can_build_shared" >&6; }
++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6; }
+
+-{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-$as_echo_n "checking whether to build shared libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+@@ -15662,15 +15456,15 @@
+ fi
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+-$as_echo "$enable_shared" >&6; }
++{ echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6; }
+
+-{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-$as_echo_n "checking whether to build static libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+-{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+-$as_echo "$enable_static" >&6; }
++{ echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6; }
+
+ GCC_F77="$G77"
+ LD_F77="$LD"
+@@ -15679,8 +15473,8 @@
+ lt_prog_compiler_pic_F77=
+ lt_prog_compiler_static_F77=
+
+-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl_F77='-Wl,'
+@@ -15911,18 +15705,18 @@
+ esac
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+-$as_echo "$lt_prog_compiler_pic_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_F77"; then
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_pic_works_F77=no
+ ac_outfile=conftest.$ac_objext
+@@ -15937,11 +15731,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15940: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15734: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:15944: \$? = $ac_status" >&5
++ echo "$as_me:15738: \$? = $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.
+@@ -15954,8 +15748,8 @@
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
+-$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
+
+ if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
+ case $lt_prog_compiler_pic_F77 in
+@@ -15982,10 +15776,10 @@
+ # Check to make sure the static flag actually works.
+ #
+ wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
+-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+@@ -16010,8 +15804,8 @@
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
+-$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
+
+ if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
+ :
+@@ -16020,10 +15814,10 @@
+ fi
+
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_c_o_F77=no
+ $rm -r conftest 2>/dev/null
+@@ -16041,11 +15835,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16044: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15838: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:16048: \$? = $ac_status" >&5
++ echo "$as_me:15842: \$? = $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
+@@ -16067,34 +15861,34 @@
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+-$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-$as_echo_n "checking if we can lock with hard links... " >&6; }
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ 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
+- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+-$as_echo "$hard_links" >&6; }
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ if test "$hard_links" = no; then
+- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ need_locks=warn
+ fi
+ else
+ need_locks=no
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ runpath_var=
+ allow_undefined_flag_F77=
+@@ -16306,12 +16100,13 @@
+ $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
++ link_all_deplibs_F77=no
+ else
+ ld_shlibs_F77=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -16514,21 +16309,18 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+@@ -16543,13 +16335,12 @@
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+-rm -rf conftest.dSYM
+ 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
+@@ -16574,21 +16365,18 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+@@ -16603,13 +16391,12 @@
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+-rm -rf conftest.dSYM
+ 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
+@@ -16842,7 +16629,7 @@
+ link_all_deplibs_F77=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -17061,8 +16848,8 @@
+ esac
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+-$as_echo "$ld_shlibs_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
++echo "${ECHO_T}$ld_shlibs_F77" >&6; }
+ test "$ld_shlibs_F77" = no && can_build_shared=no
+
+ #
+@@ -17082,15 +16869,15 @@
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+@@ -17108,7 +16895,7 @@
+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ then
+ archive_cmds_need_lc_F77=no
+@@ -17120,16 +16907,16 @@
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+-$as_echo "$archive_cmds_need_lc_F77" >&6; }
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-$as_echo_n "checking dynamic linker characteristics... " >&6; }
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+@@ -17485,13 +17272,11 @@
+ # 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 +17288,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-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
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -17680,19 +17477,19 @@
+ dynamic_linker=no
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-$as_echo "$dynamic_linker" >&6; }
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
+ if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+ fi
+
+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+ fi
+@@ -17704,8 +17501,8 @@
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+ hardcode_action_F77=
+ if test -n "$hardcode_libdir_flag_spec_F77" || \
+ test -n "$runpath_var_F77" || \
+@@ -17729,8 +17526,8 @@
+ # directories.
+ hardcode_action_F77=unsupported
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+-$as_echo "$hardcode_action_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
++echo "${ECHO_T}$hardcode_action_F77" >&6; }
+
+ if test "$hardcode_action_F77" = relink; then
+ # Fast installation is not supported
+@@ -18240,10 +18037,10 @@
+ lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
+
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_rtti_exceptions=no
+ ac_outfile=conftest.$ac_objext
+@@ -18258,11 +18055,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18261: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18058: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18265: \$? = $ac_status" >&5
++ echo "$as_me:18062: \$? = $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.
+@@ -18275,8 +18072,8 @@
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+ 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"
+@@ -18290,8 +18087,8 @@
+ lt_prog_compiler_pic_GCJ=
+ lt_prog_compiler_static_GCJ=
+
+-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl_GCJ='-Wl,'
+@@ -18522,18 +18319,18 @@
+ esac
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+-$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_GCJ"; then
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_pic_works_GCJ=no
+ ac_outfile=conftest.$ac_objext
+@@ -18548,11 +18345,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18551: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18348: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18555: \$? = $ac_status" >&5
++ echo "$as_me:18352: \$? = $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.
+@@ -18565,8 +18362,8 @@
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
+-$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
+
+ if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
+ case $lt_prog_compiler_pic_GCJ in
+@@ -18593,10 +18390,10 @@
+ # Check to make sure the static flag actually works.
+ #
+ wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
+-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_static_works_GCJ=no
+ save_LDFLAGS="$LDFLAGS"
+@@ -18621,8 +18418,8 @@
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
+-$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
+
+ if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
+ :
+@@ -18631,10 +18428,10 @@
+ fi
+
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_c_o_GCJ=no
+ $rm -r conftest 2>/dev/null
+@@ -18652,11 +18449,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18655: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18452: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:18659: \$? = $ac_status" >&5
++ echo "$as_me:18456: \$? = $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
+@@ -18678,34 +18475,34 @@
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+-$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-$as_echo_n "checking if we can lock with hard links... " >&6; }
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ 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
+- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+-$as_echo "$hard_links" >&6; }
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ if test "$hard_links" = no; then
+- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ need_locks=warn
+ fi
+ else
+ need_locks=no
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ runpath_var=
+ allow_undefined_flag_GCJ=
+@@ -18917,12 +18714,13 @@
+ $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
++ link_all_deplibs_GCJ=no
+ else
+ ld_shlibs_GCJ=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -19135,21 +18933,18 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+@@ -19164,13 +18959,12 @@
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+-rm -rf conftest.dSYM
+ 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
+@@ -19205,21 +18999,18 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+@@ -19234,13 +19025,12 @@
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+-rm -rf conftest.dSYM
+ 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
+@@ -19473,7 +19263,7 @@
+ link_all_deplibs_GCJ=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -19692,8 +19482,8 @@
+ esac
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+-$as_echo "$ld_shlibs_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
++echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
+ test "$ld_shlibs_GCJ" = no && can_build_shared=no
+
+ #
+@@ -19713,15 +19503,15 @@
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+@@ -19739,7 +19529,7 @@
+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ then
+ archive_cmds_need_lc_GCJ=no
+@@ -19751,16 +19541,16 @@
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+-$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-$as_echo_n "checking dynamic linker characteristics... " >&6; }
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+@@ -20116,13 +19906,11 @@
+ # 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 +19922,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-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
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -20311,19 +20111,19 @@
+ dynamic_linker=no
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-$as_echo "$dynamic_linker" >&6; }
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
+ if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+ fi
+
+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+ fi
+@@ -20335,8 +20135,8 @@
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+ hardcode_action_GCJ=
+ if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+ test -n "$runpath_var_GCJ" || \
+@@ -20360,8 +20160,8 @@
+ # directories.
+ hardcode_action_GCJ=unsupported
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+-$as_echo "$hardcode_action_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
++echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
+
+ if test "$hardcode_action_GCJ" = relink; then
+ # Fast installation is not supported
+@@ -21284,8 +21084,8 @@
+ ;;
+
+ *)
+- { { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
+-$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
++ { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
++echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+@@ -21304,8 +21104,8 @@
+ chmod +x "$ofile"
+ else
+ rm -f "${ofile}T"
+- { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
+-$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
++ { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
++echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+@@ -21347,10 +21147,10 @@
+ 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
+-{ $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_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+@@ -21365,7 +21165,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $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
+@@ -21377,11 +21177,11 @@
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_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
+
+
+@@ -21390,10 +21190,10 @@
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-{ $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_ac_pt_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+@@ -21408,7 +21208,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $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
+@@ -21420,11 +21220,11 @@
+ fi
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ if test -n "$ac_pt_PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
++echo "${ECHO_T}$ac_pt_PKG_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$ac_pt_PKG_CONFIG" = x; then
+@@ -21432,10 +21232,10 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&5
+-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet. If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+@@ -21449,14 +21249,14 @@
+ fi
+ if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
++ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&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; }
+ PKG_CONFIG=""
+ fi
+
+@@ -21465,10 +21265,10 @@
+ gdu_cv_version_required=0.3.2
+
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ gdu_cv_have_gdu=yes
+ else
+@@ -21478,8 +21278,8 @@
+ if test "$gdu_cv_have_gdu" = "yes"; then
+ :
+ else
+- { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
+-$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
++ { { echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
++echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+@@ -21566,8 +21366,8 @@
+
+ case "$am__api_version" in
+ 1.01234)
+- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
+-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
++ { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
++echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ *)
+@@ -21575,27 +21375,27 @@
+ esac
+
+ 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.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
+
+ # 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 +21410,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_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 +21422,20 @@
+ 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 +21450,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_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 +21462,20 @@
+ 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 +21490,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_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 +21502,17 @@
+ 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 +21559,10 @@
+ # Check the gettext tools to make sure they are GNU
+ # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+-{ $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_XGETTEXT+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $XGETTEXT in
+ [\\/]* | ?:[\\/]*)
+@@ -21777,7 +21577,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+- $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
+@@ -21789,20 +21589,20 @@
+ fi
+ XGETTEXT=$ac_cv_path_XGETTEXT
+ if test -n "$XGETTEXT"; then
+- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+-$as_echo "$XGETTEXT" >&6; }
++ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++echo "${ECHO_T}$XGETTEXT" >&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 "msgmerge", so it can be a program name with args.
+ set dummy msgmerge; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_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_MSGMERGE+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $MSGMERGE in
+ [\\/]* | ?:[\\/]*)
+@@ -21817,7 +21617,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+- $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
+@@ -21829,20 +21629,20 @@
+ fi
+ MSGMERGE=$ac_cv_path_MSGMERGE
+ if test -n "$MSGMERGE"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+-$as_echo "$MSGMERGE" >&6; }
++ { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
++echo "${ECHO_T}$MSGMERGE" >&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 "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_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_MSGFMT+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $MSGFMT in
+ [\\/]* | ?:[\\/]*)
+@@ -21857,7 +21657,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+- $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
+@@ -21869,34 +21669,34 @@
+ fi
+ MSGFMT=$ac_cv_path_MSGFMT
+ if test -n "$MSGFMT"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+-$as_echo "$MSGFMT" >&6; }
++ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
++echo "${ECHO_T}$MSGFMT" >&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 "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+ mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+ mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+ if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ # Extract the first word of "perl", so it can be a program name with args.
+ set dummy perl; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_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_PERL+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $INTLTOOL_PERL in
+ [\\/]* | ?:[\\/]*)
+@@ -21911,7 +21711,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+- $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
+@@ -21923,33 +21723,33 @@
+ fi
+ INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+ if test -n "$INTLTOOL_PERL"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
+-$as_echo "$INTLTOOL_PERL" >&6; }
++ { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
++echo "${ECHO_T}$INTLTOOL_PERL" >&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_PERL"; then
+- { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
+-$as_echo "$as_me: error: perl not found; required for intltool" >&2;}
++ { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
++echo "$as_me: error: perl not found; required for intltool" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+- { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
+-$as_echo "$as_me: error: perl 5.x required for intltool" >&2;}
++ { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
++echo "$as_me: error: perl 5.x required for intltool" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test "x" != "xno-xml"; then
+- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
+-$as_echo_n "checking for XML::Parser... " >&6; }
++ { echo "$as_me:$LINENO: checking for XML::Parser" >&5
++echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+- { $as_echo "$as_me:$LINENO: result: ok" >&5
+-$as_echo "ok" >&6; }
++ { echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6; }
+ else
+- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
++ { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
++echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+@@ -21982,32 +21782,29 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ DATADIRNAME=share
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ case $host in
+ *-*-solaris*)
+- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
++ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
++echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
+ if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -22060,35 +21857,31 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_bind_textdomain_codeset=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_bind_textdomain_codeset=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
++echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
+ if test $ac_cv_func_bind_textdomain_codeset = yes; then
+ DATADIRNAME=share
+ else
+@@ -22102,7 +21895,6 @@
+ esac
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+@@ -22124,21 +21916,20 @@
+
+ for ac_header in locale.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -22154,33 +21945,32 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -22194,52 +21984,51 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## ----------------------------------------------------------------------------------- ##
+ ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center ##
+@@ -22248,23 +22037,21 @@
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+-if test `eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'` = yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -22272,10 +22059,10 @@
+ done
+
+ if test $ac_cv_header_locale_h = yes; then
+- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+-$as_echo_n "checking for LC_MESSAGES... " >&6; }
++ { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
++echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
+ if test "${am_cv_val_LC_MESSAGES+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -22298,35 +22085,31 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ am_cv_val_LC_MESSAGES=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ am_cv_val_LC_MESSAGES=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+-$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
++{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
++echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
+ if test $am_cv_val_LC_MESSAGES = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -22345,17 +22128,17 @@
+ INTLLIBS=
+
+ if test "${ac_cv_header_libintl_h+set}" = set; then
+- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
+-$as_echo_n "checking for libintl.h... " >&6; }
++ { echo "$as_me:$LINENO: checking for libintl.h" >&5
++echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_libintl_h+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+-$as_echo "$ac_cv_header_libintl_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
++echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
+ else
+ # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
+-$as_echo_n "checking libintl.h usability... " >&6; }
++{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
++echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -22371,33 +22154,32 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
+-$as_echo_n "checking libintl.h presence... " >&6; }
++{ echo "$as_me:$LINENO: checking libintl.h presence" >&5
++echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -22411,52 +22193,51 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## ----------------------------------------------------------------------------------- ##
+ ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center ##
+@@ -22465,15 +22246,15 @@
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
+-$as_echo_n "checking for libintl.h... " >&6; }
++{ echo "$as_me:$LINENO: checking for libintl.h" >&5
++echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_libintl_h+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_libintl_h=$ac_header_preproc
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+-$as_echo "$ac_cv_header_libintl_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
++echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
+
+ fi
+ if test $ac_cv_header_libintl_h = yes; then
+@@ -22483,10 +22264,10 @@
+ #
+ # First check in libc
+ #
+- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
+-$as_echo_n "checking for ngettext in libc... " >&6; }
++ { echo "$as_me:$LINENO: checking for ngettext in libc" >&5
++echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; }
+ if test "${gt_cv_func_ngettext_libc+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -22511,42 +22292,38 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ gt_cv_func_ngettext_libc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ gt_cv_func_ngettext_libc=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
+-$as_echo "$gt_cv_func_ngettext_libc" >&6; }
++{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
++echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }
+
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
+-$as_echo_n "checking for dgettext in libc... " >&6; }
++ { echo "$as_me:$LINENO: checking for dgettext in libc" >&5
++echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }
+ if test "${gt_cv_func_dgettext_libc+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -22571,47 +22348,43 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ gt_cv_func_dgettext_libc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ gt_cv_func_dgettext_libc=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
+-$as_echo "$gt_cv_func_dgettext_libc" >&6; }
++{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
++echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }
+ fi
+
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+
+ for ac_func in bind_textdomain_codeset
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -22664,41 +22437,35 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if test `eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'` = yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -22713,10 +22480,10 @@
+ || test "$gt_cv_func_ngettext_libc" != "yes" \
+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+
+- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
+-$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
++ { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
++echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+@@ -22748,41 +22515,37 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_intl_bindtextdomain=yes
+ 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_intl_bindtextdomain=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
+-$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
++echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }
+ if test $ac_cv_lib_intl_bindtextdomain = yes; then
+- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+-$as_echo_n "checking for ngettext in -lintl... " >&6; }
++ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
++echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_intl_ngettext+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+@@ -22814,41 +22577,37 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_intl_ngettext=yes
+ 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_intl_ngettext=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+-$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
++echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
+ if test $ac_cv_lib_intl_ngettext = yes; then
+- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
+-$as_echo_n "checking for dgettext in -lintl... " >&6; }
++ { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
++echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_intl_dgettext+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+@@ -22880,36 +22639,32 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_intl_dgettext=yes
+ 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_intl_dgettext=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
+-$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
++echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; }
+ if test $ac_cv_lib_intl_dgettext = yes; then
+ gt_cv_func_dgettext_libintl=yes
+ fi
+@@ -22920,14 +22675,14 @@
+
+
+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
+-$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
+- { $as_echo "$as_me:$LINENO: result: " >&5
+-$as_echo "" >&6; }
+- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+-$as_echo_n "checking for ngettext in -lintl... " >&6; }
++ { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
++echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: result: " >&5
++echo "${ECHO_T}" >&6; }
++ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
++echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_intl_ngettext+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl -liconv $LIBS"
+@@ -22959,41 +22714,37 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_intl_ngettext=yes
+ 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_intl_ngettext=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+-$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
++echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
+ if test $ac_cv_lib_intl_ngettext = yes; then
+- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
+-$as_echo_n "checking for dcgettext in -lintl... " >&6; }
++ { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
++echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl -liconv $LIBS"
+@@ -23025,36 +22776,32 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_intl_dcgettext=yes
+ 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_intl_dcgettext=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
+-$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
++echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; }
+ if test $ac_cv_lib_intl_dcgettext = yes; then
+ gt_cv_func_dgettext_libintl=yes
+ libintl_extra_libs=-liconv
+@@ -23080,11 +22827,11 @@
+
+ for ac_func in bind_textdomain_codeset
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -23137,41 +22884,35 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if test `eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'` = yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -23207,10 +22948,10 @@
+
+ # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_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_MSGFMT+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case "$MSGFMT" in
+ /*)
+@@ -23234,11 +22975,11 @@
+ fi
+ MSGFMT="$ac_cv_path_MSGFMT"
+ if test "$MSGFMT" != "no"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+-$as_echo "$MSGFMT" >&6; }
++ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
++echo "${ECHO_T}$MSGFMT" >&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 "$MSGFMT" != "no"; then
+ glib_save_LIBS="$LIBS"
+@@ -23246,11 +22987,11 @@
+
+ for ac_func in dcgettext
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -23303,49 +23044,43 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if test `eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'` = yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+ done
+
+ MSGFMT_OPTS=
+- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
+-$as_echo_n "checking if msgfmt accepts -c... " >&6; }
++ { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
++echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
+ cat >conftest.foo <<_ACEOF
+
+ msgid ""
+@@ -23359,25 +23094,25 @@
+ "Content-Transfer-Encoding: 8bit\n"
+
+ _ACEOF
+-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
++if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
+ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-else { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++else { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ echo "$as_me: failed input was:" >&5
+ sed 's/^/| /' conftest.foo >&5
+ fi
+
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_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_GMSGFMT+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $GMSGFMT in
+ [\\/]* | ?:[\\/]*)
+@@ -23392,7 +23127,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+- $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
+@@ -23405,20 +23140,20 @@
+ fi
+ GMSGFMT=$ac_cv_path_GMSGFMT
+ if test -n "$GMSGFMT"; then
+- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+-$as_echo "$GMSGFMT" >&6; }
++ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++echo "${ECHO_T}$GMSGFMT" >&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 "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_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_XGETTEXT+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case "$XGETTEXT" in
+ /*)
+@@ -23442,11 +23177,11 @@
+ fi
+ XGETTEXT="$ac_cv_path_XGETTEXT"
+ if test "$XGETTEXT" != ":"; then
+- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+-$as_echo "$XGETTEXT" >&6; }
++ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++echo "${ECHO_T}$XGETTEXT" >&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
+
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -23471,33 +23206,30 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ CATOBJEXT=.gmo
+ DATADIRNAME=share
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ case $host in
+ *-*-solaris*)
+- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
++ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
++echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
+ if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -23550,35 +23282,31 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_bind_textdomain_codeset=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_bind_textdomain_codeset=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
++echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
+ if test $ac_cv_func_bind_textdomain_codeset = yes; then
+ CATOBJEXT=.gmo
+ DATADIRNAME=share
+@@ -23595,7 +23323,6 @@
+ esac
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$glib_save_LIBS"
+@@ -23621,8 +23348,8 @@
+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+ : ;
+ else
+- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
+-$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
++ { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
++echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
+ XGETTEXT=":"
+ fi
+ fi
+@@ -23654,8 +23381,8 @@
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
+ else
+- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
+-$as_echo_n "checking for catalogs to be installed... " >&6; }
++ { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
++echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }
+ NEW_LINGUAS=
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+@@ -23679,8 +23406,8 @@
+ fi
+ done
+ LINGUAS=$NEW_LINGUAS
+- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
+-$as_echo "$LINGUAS" >&6; }
++ { echo "$as_me:$LINENO: result: $LINGUAS" >&5
++echo "${ECHO_T}$LINGUAS" >&6; }
+ fi
+
+ if test -n "$LINGUAS"; then
+@@ -23773,8 +23500,8 @@
+ for option in -Wno-sign-compare; do
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $option"
+- { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
+-$as_echo_n "checking whether gcc understands $option... " >&6; }
++ { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
++echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -23796,21 +23523,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ has_option=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ has_option=no
+@@ -23818,8 +23544,8 @@
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$SAVE_CFLAGS"
+- { $as_echo "$as_me:$LINENO: result: $has_option" >&5
+-$as_echo "$has_option" >&6; }
++ { echo "$as_me:$LINENO: result: $has_option" >&5
++echo "${ECHO_T}$has_option" >&6; }
+ if test $has_option = yes; then
+ warning_flags="$warning_flags $option"
+ fi
+@@ -23832,16 +23558,16 @@
+ fi
+ ;;
+ *)
+- { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
+-$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
++ { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
++echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+ CFLAGS="$realsave_CFLAGS"
+- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
+-$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
+- { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5
+-$as_echo "$warning_flags" >&6; }
++ { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
++echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: result: $warning_flags" >&5
++echo "${ECHO_T}$warning_flags" >&6; }
+
+ # Check whether --enable-iso-c was given.
+ if test "${enable_iso_c+set}" = set; then
+@@ -23851,8 +23577,8 @@
+ fi
+
+
+- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
+-$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
++ { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
++echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; }
+ complCFLAGS=
+ if test "x$enable_iso_c" != "xno"; then
+ if test "x$GCC" = "xyes"; then
+@@ -23866,8 +23592,8 @@
+ esac
+ fi
+ fi
+- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5
+-$as_echo "$complCFLAGS" >&6; }
++ { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
++echo "${ECHO_T}$complCFLAGS" >&6; }
+
+ WARN_CFLAGS="$warning_flags $complCFLAGS"
+
+@@ -23883,8 +23609,8 @@
+
+
+
+-{ $as_echo "$as_me:$LINENO: checking for X" >&5
+-$as_echo_n "checking for X... " >&6; }
++{ echo "$as_me:$LINENO: checking for X" >&5
++echo $ECHO_N "checking for X... $ECHO_C" >&6; }
+
+
+ # Check whether --with-x was given.
+@@ -23898,11 +23624,11 @@
+ have_x=disabled
+ else
+ case $x_includes,$x_libraries in #(
+- *\'*) { { $as_echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
+-$as_echo "$as_me: error: Cannot use X directory names containing '" >&2;}
++ *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
++echo "$as_me: error: Cannot use X directory names containing '" >&2;}
+ { (exit 1); exit 1; }; };; #(
+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ # One or both of the vars are not set, and there is no cached value.
+ ac_x_includes=no ac_x_libraries=no
+@@ -23923,7 +23649,7 @@
+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
+ done
+ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+- for ac_extension in a so sl dylib la dll; do
++ for ac_extension in a so sl; do
+ 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
+@@ -23998,14 +23724,13 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+@@ -24013,7 +23738,7 @@
+ # We can compile using X headers with no special include directory.
+ ac_x_includes=
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ for ac_dir in $ac_x_header_dirs; do
+@@ -24054,33 +23779,30 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+ ac_x_libraries=
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ LIBS=$ac_save_LIBS
+-for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
++for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+ do
+ # Don't even attempt the hair of trying to link an X program!
+- for ac_extension in a so sl dylib la dll; do
++ for ac_extension in a so sl; do
+ if test -r "$ac_dir/libX11.$ac_extension"; then
+ ac_x_libraries=$ac_dir
+ break 2
+@@ -24089,7 +23811,6 @@
+ done
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi # $ac_x_libraries = no
+@@ -24112,8 +23833,8 @@
+ fi # $with_x != no
+
+ if test "$have_x" != yes; then
+- { $as_echo "$as_me:$LINENO: result: $have_x" >&5
+-$as_echo "$have_x" >&6; }
++ { echo "$as_me:$LINENO: result: $have_x" >&5
++echo "${ECHO_T}$have_x" >&6; }
+ no_x=yes
+ else
+ # If each of the values was on the command line, it overrides each guess.
+@@ -24123,8 +23844,8 @@
+ ac_cv_have_x="have_x=yes\
+ ac_x_includes='$x_includes'\
+ ac_x_libraries='$x_libraries'"
+- { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+-$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
++ { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
++echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
+ fi
+
+ if test "$no_x" = yes; then
+@@ -24145,8 +23866,8 @@
+ X_LIBS="$X_LIBS -L$x_libraries"
+ # For Solaris; some versions of Sun CC require a space after -R and
+ # others require no space. Words are not sufficient . . . .
+- { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+-$as_echo_n "checking whether -R must be followed by a space... " >&6; }
++ { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
++echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+ ac_xsave_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+@@ -24171,26 +23892,23 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ X_LIBS="$X_LIBS -R$x_libraries"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ LIBS="$ac_xsave_LIBS -R $x_libraries"
+@@ -24215,38 +23933,33 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ X_LIBS="$X_LIBS -R $x_libraries"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- { $as_echo "$as_me:$LINENO: result: neither works" >&5
+-$as_echo "neither works" >&6; }
++ { echo "$as_me:$LINENO: result: neither works" >&5
++echo "${ECHO_T}neither works" >&6; }
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+
+-rm -rf conftest.dSYM
+ 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
+@@ -24292,30 +24005,27 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ :
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+-$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
++ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
++echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet $LIBS"
+@@ -24347,45 +24057,41 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dnet_dnet_ntoa=yes
+ 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_dnet_dnet_ntoa=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+-$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+ if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+-$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
++ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
++echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub $LIBS"
+@@ -24417,36 +24123,32 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ 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_dnet_stub_dnet_ntoa=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+-$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+ fi
+@@ -24454,7 +24156,6 @@
+ fi
+ 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_xsave_LIBS"
+@@ -24467,10 +24168,10 @@
+ # on Irix 5.2, according to T.E. Dickey.
+ # The functions gethostbyname, getservbyname, and inet_addr are
+ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
+-$as_echo_n "checking for gethostbyname... " >&6; }
++ { echo "$as_me:$LINENO: checking for gethostbyname" >&5
++echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -24523,41 +24224,37 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_gethostbyname=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_gethostbyname=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+-$as_echo "$ac_cv_func_gethostbyname" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
++echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
+
+ if test $ac_cv_func_gethostbyname = no; then
+- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
++ { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
++echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl $LIBS"
+@@ -24589,45 +24286,41 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_nsl_gethostbyname=yes
+ 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_nsl_gethostbyname=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
+ if test $ac_cv_lib_nsl_gethostbyname = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+
+ if test $ac_cv_lib_nsl_gethostbyname = no; then
+- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+-$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
++ { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
++echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+@@ -24659,36 +24352,32 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_bsd_gethostbyname=yes
+ 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_bsd_gethostbyname=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+-$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
+ if test $ac_cv_lib_bsd_gethostbyname = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+ fi
+@@ -24703,10 +24392,10 @@
+ # variants that don't use the name server (or something). -lsocket
+ # must be given before -lnsl if both are needed. We assume that
+ # if connect needs -lnsl, so does gethostbyname.
+- { $as_echo "$as_me:$LINENO: checking for connect" >&5
+-$as_echo_n "checking for connect... " >&6; }
++ { echo "$as_me:$LINENO: checking for connect" >&5
++echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
+ if test "${ac_cv_func_connect+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -24759,41 +24448,37 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_connect=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_connect=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+-$as_echo "$ac_cv_func_connect" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
++echo "${ECHO_T}$ac_cv_func_connect" >&6; }
+
+ if test $ac_cv_func_connect = no; then
+- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+-$as_echo_n "checking for connect in -lsocket... " >&6; }
++ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
++echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+@@ -24825,36 +24510,32 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_socket_connect=yes
+ 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_socket_connect=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+-$as_echo "$ac_cv_lib_socket_connect" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
+ if test $ac_cv_lib_socket_connect = yes; then
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+ fi
+@@ -24862,10 +24543,10 @@
+ fi
+
+ # Guillermo Gomez says -lposix is necessary on A/UX.
+- { $as_echo "$as_me:$LINENO: checking for remove" >&5
+-$as_echo_n "checking for remove... " >&6; }
++ { echo "$as_me:$LINENO: checking for remove" >&5
++echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
+ if test "${ac_cv_func_remove+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -24918,41 +24599,37 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_remove=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_remove=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+-$as_echo "$ac_cv_func_remove" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
++echo "${ECHO_T}$ac_cv_func_remove" >&6; }
+
+ if test $ac_cv_func_remove = no; then
+- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+-$as_echo_n "checking for remove in -lposix... " >&6; }
++ { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
++echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix $LIBS"
+@@ -24984,36 +24661,32 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_posix_remove=yes
+ 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_posix_remove=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+-$as_echo "$ac_cv_lib_posix_remove" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
++echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
+ if test $ac_cv_lib_posix_remove = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+ fi
+@@ -25021,10 +24694,10 @@
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+- { $as_echo "$as_me:$LINENO: checking for shmat" >&5
+-$as_echo_n "checking for shmat... " >&6; }
++ { echo "$as_me:$LINENO: checking for shmat" >&5
++echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
+ if test "${ac_cv_func_shmat+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -25077,41 +24750,37 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_shmat=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_shmat=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+-$as_echo "$ac_cv_func_shmat" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
++echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
+
+ if test $ac_cv_func_shmat = no; then
+- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+-$as_echo_n "checking for shmat in -lipc... " >&6; }
++ { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
++echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc $LIBS"
+@@ -25143,36 +24812,32 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_ipc_shmat=yes
+ 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_ipc_shmat=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+-$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
++echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
+ if test $ac_cv_lib_ipc_shmat = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+ fi
+@@ -25189,10 +24854,10 @@
+ # These have to be linked with before -lX11, unlike the other
+ # libraries we check for below, so use a different variable.
+ # John Interrante, Karl Berry
+- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+-$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
++ { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
++echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+@@ -25224,36 +24889,32 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_ICE_IceConnectionNumber=yes
+ 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_ICE_IceConnectionNumber=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+-$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+ fi
+@@ -25264,10 +24925,10 @@
+
+ x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+
+-{ $as_echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo" >&5
+-$as_echo_n "checking for XScreenSaverQueryInfo... " >&6; }
++{ echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo" >&5
++echo $ECHO_N "checking for XScreenSaverQueryInfo... $ECHO_C" >&6; }
+ if test "${ac_cv_func_XScreenSaverQueryInfo+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -25320,35 +24981,31 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_XScreenSaverQueryInfo=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_XScreenSaverQueryInfo=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XScreenSaverQueryInfo" >&5
+-$as_echo "$ac_cv_func_XScreenSaverQueryInfo" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_XScreenSaverQueryInfo" >&5
++echo "${ECHO_T}$ac_cv_func_XScreenSaverQueryInfo" >&6; }
+ if test $ac_cv_func_XScreenSaverQueryInfo = yes; then
+
+ TYPING_BREAK="typing-break"
+@@ -25356,10 +25013,10 @@
+
+ save_LIBS=$LIBS
+ LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lXss -lXext -lX11"
+- { $as_echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXss" >&5
+-$as_echo_n "checking for XScreenSaverQueryInfo in -lXss... " >&6; }
++ { echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXss" >&5
++echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXss... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xss_XScreenSaverQueryInfo+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXss $LIBS"
+@@ -25391,36 +25048,32 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_Xss_XScreenSaverQueryInfo=yes
+ 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_Xss_XScreenSaverQueryInfo=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5
+-$as_echo "$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5
++echo "${ECHO_T}$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6; }
+ if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then
+
+ TYPING_BREAK="typing-break"
+@@ -25429,10 +25082,10 @@
+
+ LIBS=$save_LIBS
+ LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lXext -lX11"
+- { $as_echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXext" >&5
+-$as_echo_n "checking for XScreenSaverQueryInfo in -lXext... " >&6; }
++ { echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXext" >&5
++echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXext... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xext_XScreenSaverQueryInfo+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXext $LIBS"
+@@ -25464,36 +25117,32 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_Xext_XScreenSaverQueryInfo=yes
+ 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_Xext_XScreenSaverQueryInfo=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XScreenSaverQueryInfo" >&5
+-$as_echo "$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XScreenSaverQueryInfo" >&5
++echo "${ECHO_T}$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6; }
+ if test $ac_cv_lib_Xext_XScreenSaverQueryInfo = yes; then
+
+ TYPING_BREAK="typing-break"
+@@ -25522,21 +25171,20 @@
+
+ for ac_header in X11/Xlib.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -25552,33 +25200,32 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -25592,52 +25239,51 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## ----------------------------------------------------------------------------------- ##
+ ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center ##
+@@ -25646,33 +25292,31 @@
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+-if test `eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'` = yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+
+ done
+
+-{ $as_echo "$as_me:$LINENO: checking for XF86MiscQueryExtension in -lXxf86misc" >&5
+-$as_echo_n "checking for XF86MiscQueryExtension in -lXxf86misc... " >&6; }
++{ echo "$as_me:$LINENO: checking for XF86MiscQueryExtension in -lXxf86misc" >&5
++echo $ECHO_N "checking for XF86MiscQueryExtension in -lXxf86misc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xxf86misc_XF86MiscQueryExtension+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXxf86misc $LIBS"
+@@ -25704,46 +25348,42 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_Xxf86misc_XF86MiscQueryExtension=yes
+ 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_Xxf86misc_XF86MiscQueryExtension=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscQueryExtension" >&5
+-$as_echo "$ac_cv_lib_Xxf86misc_XF86MiscQueryExtension" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscQueryExtension" >&5
++echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscQueryExtension" >&6; }
+ if test $ac_cv_lib_Xxf86misc_XF86MiscQueryExtension = yes; then
+
+
+ for ac_header in X11/extensions/xf86misc.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -25764,21 +25404,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Header=no"
+@@ -25786,14 +25425,12 @@
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if test `eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'` = yes; then
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ XF86MISC_LIBS="-lXxf86misc"
+ fi
+@@ -25806,21 +25443,20 @@
+
+ for ac_header in X11/extensions/XKB.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -25836,33 +25472,32 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -25876,52 +25511,51 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## ----------------------------------------------------------------------------------- ##
+ ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center ##
+@@ -25930,23 +25564,21 @@
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+-if test `eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'` = yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -25969,40 +25601,44 @@
+ 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; }
++{ echo "$as_me:$LINENO: checking for LIBSLAB" >&5
++echo $ECHO_N "checking for LIBSLAB... $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
++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: \$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
+ 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`
+ 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
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBSLAB_LIBS"; then
++ pkg_cv_LIBSLAB_LIBS="$LIBSLAB_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (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
+ 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`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -26015,14 +25651,14 @@
+ _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`
++ 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"`
+ 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`
++ 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"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBSLAB_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 gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0) were not met:
+
+ $LIBSLAB_PKG_ERRORS
+
+@@ -26033,7 +25669,7 @@
+ and LIBSLAB_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 gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0) were not met:
+
+ $LIBSLAB_PKG_ERRORS
+
+@@ -26046,7 +25682,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.
+
+@@ -26056,7 +25692,7 @@
+
+ To get pkg-config, see .
+ 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.
+
+@@ -26070,46 +25706,50 @@
+ 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; }
++ { 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 CAPPLET" >&5
++echo $ECHO_N "checking for CAPPLET... $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
++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_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 "$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
++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_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
+
+
+@@ -26122,14 +25762,14 @@
+ _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`
++ CAPPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$COMMON_MODULES"`
+ else
+- CAPPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "$COMMON_MODULES" 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 "$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
+
+@@ -26140,7 +25780,7 @@
+ 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) were not met:
++echo "$as_me: error: Package requirements ($COMMON_MODULES) were not met:
+
+ $CAPPLET_PKG_ERRORS
+
+@@ -26153,7 +25793,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.
+
+@@ -26163,7 +25803,7 @@
+
+ To get pkg-config, see .
+ 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.
+
+@@ -26177,46 +25817,50 @@
+ 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; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ 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 "$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
++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_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 "$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
++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_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
+
+
+@@ -26229,14 +25873,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GNOMECC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0" 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
+- GNOMECC_PKG_ERRORS=`$PKG_CONFIG --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0" 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 "$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
+
+@@ -26247,7 +25891,7 @@
+ 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 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
+
+@@ -26260,7 +25904,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.
+
+@@ -26270,7 +25914,7 @@
+
+ To get pkg-config, see .
+ 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.
+
+@@ -26284,46 +25928,50 @@
+ 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; }
++ { 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_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_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 +25984,14 @@
+ _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 "$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 +26002,7 @@
+ 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 (libgnomeui-2.0) were not met:
++echo "$as_me: error: Package requirements (libgnomeui-2.0) were not met:
+
+ $GNOME_PKG_ERRORS
+
+@@ -26367,7 +26015,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.
+
+@@ -26377,7 +26025,7 @@
+
+ To get pkg-config, see .
+ 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.
+
+@@ -26391,46 +26039,50 @@
+ 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
++echo "${ECHO_T}yes" >&6; }
+ :
+ 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 "$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_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_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 +26095,14 @@
+ _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 "$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 +26113,7 @@
+ 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 (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 +26126,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.
+
+@@ -26484,7 +26136,7 @@
+
+ To get pkg-config, see .
+ 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.
+
+@@ -26498,46 +26150,50 @@
+ 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
++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 "$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_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_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 +26206,14 @@
+ _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_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 +26224,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
+
+@@ -26581,7 +26237,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.
+
+@@ -26591,7 +26247,7 @@
+
+ To get pkg-config, see .
+ 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.
+
+@@ -26605,46 +26261,50 @@
+ 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 "$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_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_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 +26317,14 @@
+ _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 "$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 +26335,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
+
+@@ -26688,7 +26348,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.
+
+@@ -26698,7 +26358,7 @@
+
+ To get pkg-config, see .
+ 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.
+
+@@ -26712,46 +26372,50 @@
+ 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 "$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_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_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 +26428,14 @@
+ _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 "$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 +26446,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.23.1) were not met:
++echo "$as_me: error: Package requirements (libmetacity-private >= 2.23.1) were not met:
+
+ $METACITY_PKG_ERRORS
+
+@@ -26795,7 +26459,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.
+
+@@ -26805,7 +26469,7 @@
+
+ To get pkg-config, see .
+ 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.
+
+@@ -26819,46 +26483,50 @@
+ else
+ METACITY_CFLAGS=$pkg_cv_METACITY_CFLAGS
+ METACITY_LIBS=$pkg_cv_METACITY_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 TYPING" >&5
+-$as_echo_n "checking for TYPING... " >&6; }
++{ echo "$as_me:$LINENO: checking for TYPING" >&5
++echo $ECHO_N "checking for TYPING... $ECHO_C" >&6; }
+
+-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
++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=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (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
+ 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=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (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
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -26871,14 +26539,14 @@
+ _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
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 > 2.11 gconf-2.0 gtk+-2.0) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 > 2.11 gconf-2.0 gtk+-2.0) were not met:
+
+ $TYPING_PKG_ERRORS
+
+@@ -26889,7 +26557,7 @@
+ and TYPING_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.11 gconf-2.0 gtk+-2.0) were not met:
++echo "$as_me: error: Package requirements (glib-2.0 > 2.11 gconf-2.0 gtk+-2.0) were not met:
+
+ $TYPING_PKG_ERRORS
+
+@@ -26902,7 +26570,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.
+
+@@ -26912,7 +26580,7 @@
+
+ To get pkg-config, see .
+ 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.
+
+@@ -26926,46 +26594,50 @@
+ else
+ TYPING_CFLAGS=$pkg_cv_TYPING_CFLAGS
+ TYPING_LIBS=$pkg_cv_TYPING_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 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_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_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 +26650,14 @@
+ _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 "$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 +26668,7 @@
+ 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 (gnome-settings-daemon) were not met:
++echo "$as_me: error: Package requirements (gnome-settings-daemon) were not met:
+
+ $GSD_DBUS_PKG_ERRORS
+
+@@ -27009,7 +26681,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.
+
+@@ -27019,7 +26691,7 @@
+
+ To get pkg-config, see .
+ 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.
+
+@@ -27033,46 +26705,50 @@
+ 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
++echo "${ECHO_T}yes" >&6; }
+ :
+ fi
+
+ pkg_failed=no
+-{ $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_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_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 +26761,14 @@
+ _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 "$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 +26779,7 @@
+ 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) were not met:
++echo "$as_me: error: Package requirements (gio-2.0) were not met:
+
+ $GIO_PKG_ERRORS
+
+@@ -27116,7 +26792,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.
+
+@@ -27126,7 +26802,7 @@
+
+ To get pkg-config, see .
+ 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.
+
+@@ -27140,8 +26816,8 @@
+ 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
++echo "${ECHO_T}yes" >&6; }
+ :
+ fi
+
+@@ -27155,47 +26831,51 @@
+ 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 "$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_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_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 +26888,14 @@
+ _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 "$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 +26906,7 @@
+ 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 ($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 +26919,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.
+
+@@ -27249,7 +26929,7 @@
+
+ To get pkg-config, see .
+ 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.
+
+@@ -27263,47 +26943,51 @@
+ 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 "$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_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_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 +27000,14 @@
+ _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 "$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 +27018,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
+
+@@ -27347,7 +27031,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.
+
+@@ -27357,7 +27041,7 @@
+
+ To get pkg-config, see .
+ 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.
+
+@@ -27371,17 +27055,17 @@
+ else
+ AT_CAPPLET_CFLAGS=$pkg_cv_AT_CAPPLET_CFLAGS
+ AT_CAPPLET_LIBS=$pkg_cv_AT_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
+
+
+ have_randr=no
+-{ $as_echo "$as_me:$LINENO: checking for XRRUpdateConfiguration in -lXrandr" >&5
+-$as_echo_n "checking for XRRUpdateConfiguration in -lXrandr... " >&6; }
++{ echo "$as_me:$LINENO: checking for XRRUpdateConfiguration in -lXrandr" >&5
++echo $ECHO_N "checking for XRRUpdateConfiguration in -lXrandr... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xrandr_XRRUpdateConfiguration+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXrandr -lXrandr -lXrender $x_libs $LIBS"
+@@ -27413,41 +27097,37 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_Xrandr_XRRUpdateConfiguration=yes
+ 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_Xrandr_XRRUpdateConfiguration=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRUpdateConfiguration" >&5
+-$as_echo "$ac_cv_lib_Xrandr_XRRUpdateConfiguration" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRUpdateConfiguration" >&5
++echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRUpdateConfiguration" >&6; }
+ if test $ac_cv_lib_Xrandr_XRRUpdateConfiguration = yes; then
+- { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5
+-$as_echo_n "checking for X11/extensions/Xrandr.h... " >&6; }
++ { echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5
++echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -27465,21 +27145,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_X11_extensions_Xrandr_h=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_X11_extensions_Xrandr_h=no
+@@ -27487,8 +27166,8 @@
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5
+-$as_echo "$ac_cv_header_X11_extensions_Xrandr_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6; }
+ if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then
+ have_randr=yes
+ RANDR_LIBS="-lXrandr -lXrender"
+@@ -27517,40 +27196,44 @@
+
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for DISPLAY_CAPPLET" >&5
+-$as_echo_n "checking for DISPLAY_CAPPLET... " >&6; }
++{ echo "$as_me:$LINENO: checking for DISPLAY_CAPPLET" >&5
++echo $ECHO_N "checking for DISPLAY_CAPPLET... $ECHO_C" >&6; }
+
+-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=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_DISPLAY_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 "$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=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_DISPLAY_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
+
+
+@@ -27563,14 +27246,14 @@
+ _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
+
+- { { $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:
+
+ $DISPLAY_CAPPLET_PKG_ERRORS
+
+@@ -27581,7 +27264,7 @@
+ and DISPLAY_CAPPLET_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-$as_echo "$as_me: error: Package requirements ($COMMON_MODULES) were not met:
++echo "$as_me: error: Package requirements ($COMMON_MODULES) were not met:
+
+ $DISPLAY_CAPPLET_PKG_ERRORS
+
+@@ -27594,7 +27277,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.
+
+@@ -27604,7 +27287,7 @@
+
+ To get pkg-config, see .
+ 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.
+
+@@ -27618,8 +27301,8 @@
+ else
+ DISPLAY_CAPPLET_CFLAGS=$pkg_cv_DISPLAY_CAPPLET_CFLAGS
+ DISPLAY_CAPPLET_LIBS=$pkg_cv_DISPLAY_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
+
+@@ -27631,21 +27314,22 @@
+ have_xcursor=no
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for XCURSOR" >&5
+-$as_echo_n "checking for XCURSOR... " >&6; }
++{ echo "$as_me:$LINENO: checking for XCURSOR" >&5
++echo $ECHO_N "checking for XCURSOR... $ECHO_C" >&6; }
+
+-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
+ ($PKG_CONFIG --exists --print-errors "
+ xcursor
+ ") 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_XCURSOR_CFLAGS=`$PKG_CONFIG --cflags "
+ xcursor
+@@ -27653,21 +27337,23 @@
+ 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
+ ($PKG_CONFIG --exists --print-errors "
+ xcursor
+ ") 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_XCURSOR_LIBS=`$PKG_CONFIG --libs "
+ xcursor
+@@ -27675,8 +27361,9 @@
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -27689,27 +27376,27 @@
+ _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
+
+- { $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_xcursor=no
+ elif test $pkg_failed = untried; then
+ have_xcursor=no
+ else
+ XCURSOR_CFLAGS=$pkg_cv_XCURSOR_CFLAGS
+ XCURSOR_LIBS=$pkg_cv_XCURSOR_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_xcursor=yes
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -27729,8 +27416,8 @@
+
+
+ if test x$have_xcursor = xyes; then
+- { $as_echo "$as_me:$LINENO: checking for XCURSOR cursor location" >&5
+-$as_echo_n "checking for XCURSOR cursor location... " >&6; }
++ { echo "$as_me:$LINENO: checking for XCURSOR cursor location" >&5
++echo $ECHO_N "checking for XCURSOR cursor location... $ECHO_C" >&6; }
+ XCURSOR_ICONDIR=$($PKG_CONFIG --variable=icondir xcursor)
+ if test "x$XCURSOR_ICONDIR" != x; then
+
+@@ -27741,48 +27428,52 @@
+ else
+ XCURSOR_ICONDIR=none
+ fi
+- { $as_echo "$as_me:$LINENO: result: ${XCURSOR_ICONDIR}" >&5
+-$as_echo "${XCURSOR_ICONDIR}" >&6; }
++ { echo "$as_me:$LINENO: result: ${XCURSOR_ICONDIR}" >&5
++echo "${ECHO_T}${XCURSOR_ICONDIR}" >&6; }
+ fi
+
+ CAPPLET_LIBS="$CAPPLET_LIBS $XCURSOR_LIBS"
+
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for LIBGNOMEKBD" >&5
+-$as_echo_n "checking for LIBGNOMEKBD... " >&6; }
++{ echo "$as_me:$LINENO: checking for LIBGNOMEKBD" >&5
++echo $ECHO_N "checking for LIBGNOMEKBD... $ECHO_C" >&6; }
+
+-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.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.6" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -27795,14 +27486,14 @@
+ _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.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
+
+@@ -27813,7 +27504,7 @@
+ 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.6) were not met:
++echo "$as_me: error: Package requirements (libgnomekbd >= 2.21.4.1 libxklavier >= 3.6) were not met:
+
+ $LIBGNOMEKBD_PKG_ERRORS
+
+@@ -27826,7 +27517,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.
+
+@@ -27836,7 +27527,7 @@
+
+ To get pkg-config, see .
+ 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.
+
+@@ -27850,8 +27541,8 @@
+ else
+ LIBGNOMEKBD_CFLAGS=$pkg_cv_LIBGNOMEKBD_CFLAGS
+ LIBGNOMEKBD_LIBS=$pkg_cv_LIBGNOMEKBD_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
+
+@@ -27859,40 +27550,44 @@
+
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for LIBGNOMEKBDUI" >&5
+-$as_echo_n "checking for LIBGNOMEKBDUI... " >&6; }
++{ echo "$as_me:$LINENO: checking for LIBGNOMEKBDUI" >&5
++echo $ECHO_N "checking for LIBGNOMEKBDUI... $ECHO_C" >&6; }
+
+-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=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_LIBGNOMEKBDUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomekbdui >= 2.21" 2>/dev/null`
+ else
+ 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=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_LIBGNOMEKBDUI_LIBS=`$PKG_CONFIG --libs "libgnomekbdui >= 2.21" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -27905,14 +27600,14 @@
+ _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
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (libgnomekbdui >= 2.21) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (libgnomekbdui >= 2.21) were not met:
+
+ $LIBGNOMEKBDUI_PKG_ERRORS
+
+@@ -27923,7 +27618,7 @@
+ and LIBGNOMEKBDUI_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 (libgnomekbdui >= 2.21) were not met:
++echo "$as_me: error: Package requirements (libgnomekbdui >= 2.21) were not met:
+
+ $LIBGNOMEKBDUI_PKG_ERRORS
+
+@@ -27936,7 +27631,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.
+
+@@ -27946,7 +27641,7 @@
+
+ To get pkg-config, see .
+ 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.
+
+@@ -27960,16 +27655,16 @@
+ else
+ LIBGNOMEKBDUI_CFLAGS=$pkg_cv_LIBGNOMEKBDUI_CFLAGS
+ LIBGNOMEKBDUI_LIBS=$pkg_cv_LIBGNOMEKBDUI_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
+
+
+
+
+-{ $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 +27672,50 @@
+ 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 "$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_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_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 +27728,14 @@
+ _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 "$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 +27746,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
+
+@@ -28060,7 +27759,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.
+
+@@ -28070,7 +27769,7 @@
+
+ To get pkg-config, see .
+ 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.
+
+@@ -28084,8 +27783,8 @@
+ 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
+@@ -28111,40 +27810,44 @@
+ 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 "$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_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_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 +27860,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32" 2>&1`
++ HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32"`
+ else
+- HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32" 2>&1`
++ HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$HAL_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32) were not met:
++ { { 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 +27878,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
+
+@@ -28188,7 +27891,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.
+
+@@ -28198,7 +27901,7 @@
+
+ To get pkg-config, see .
+ 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.
+
+@@ -28212,8 +27915,8 @@
+ else
+ HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
+ HAL_LIBS=$pkg_cv_HAL_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 USE_HAL 1
+@@ -28227,10 +27930,10 @@
+
+ # Extract the first word of "glib-genmarshal", so it can be a program name with args.
+ set dummy glib-genmarshal; 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_GLIB_GENMARSHAL+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $GLIB_GENMARSHAL in
+ [\\/]* | ?:[\\/]*)
+@@ -28245,7 +27948,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
+- $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
+@@ -28258,18 +27961,18 @@
+ fi
+ GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
+ if test -n "$GLIB_GENMARSHAL"; then
+- { $as_echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5
+-$as_echo "$GLIB_GENMARSHAL" >&6; }
++ { echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5
++echo "${ECHO_T}$GLIB_GENMARSHAL" >&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"$GLIB_GENMARSHAL" = xno; then
+- { { $as_echo "$as_me:$LINENO: error: glib-genmarshal executable not found in your path - should be installed with glib" >&5
+-$as_echo "$as_me: error: glib-genmarshal executable not found in your path - should be installed with glib" >&2;}
++ { { echo "$as_me:$LINENO: error: glib-genmarshal executable not found in your path - should be installed with glib" >&5
++echo "$as_me: error: glib-genmarshal executable not found in your path - should be installed with glib" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+@@ -28278,10 +27981,10 @@
+
+ # Extract the first word of "gconftool-2", so it can be a program name with args.
+ set dummy gconftool-2; 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_GCONFTOOL+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $GCONFTOOL in
+ [\\/]* | ?:[\\/]*)
+@@ -28296,7 +27999,7 @@
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
+- $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
+@@ -28309,18 +28012,18 @@
+ fi
+ GCONFTOOL=$ac_cv_path_GCONFTOOL
+ if test -n "$GCONFTOOL"; then
+- { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
+-$as_echo "$GCONFTOOL" >&6; }
++ { echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
++echo "${ECHO_T}$GCONFTOOL" >&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"$GCONFTOOL" = xno; then
+- { { $as_echo "$as_me:$LINENO: error: gconftool-2 executable not found in your path - should be installed with GConf" >&5
+-$as_echo "$as_me: error: gconftool-2 executable not found in your path - should be installed with GConf" >&2;}
++ { { echo "$as_me:$LINENO: error: gconftool-2 executable not found in your path - should be installed with GConf" >&5
++echo "$as_me: error: gconftool-2 executable not found in your path - should be installed with GConf" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+@@ -28339,8 +28042,8 @@
+
+
+
+- { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
+-$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
++ { echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
++echo "${ECHO_T}Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
+
+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+@@ -28354,15 +28057,15 @@
+
+
+
+- { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
+-$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
++ { echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
++echo "${ECHO_T}Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
+
+ # Check whether --enable-schemas-install was given.
+ if test "${enable_schemas_install+set}" = set; then
+ enableval=$enable_schemas_install; case ${enableval} in
+ yes|no) ;;
+- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
+-$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
++ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
++echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+ fi
+@@ -28385,12 +28088,12 @@
+ yes) ENABLE_GSTREAMER=yes ;;
+ 0.10) ENABLE_GSTREAMER=yes && GST_MAJORMINOR=0.10 ;;
+ no) ENABLE_GSTREAMER=no ;;
+- *) { { $as_echo "$as_me:$LINENO: error:
++ *) { { echo "$as_me:$LINENO: error:
+ *** Bad value ${enableval} for --enable-gstreamer
+ *** Please use one of the following:
+ *** --enable-gstreamer=0.10
+ " >&5
+-$as_echo "$as_me: error:
++echo "$as_me: error:
+ *** Bad value ${enableval} for --enable-gstreamer
+ *** Please use one of the following:
+ *** --enable-gstreamer=0.10
+@@ -28408,40 +28111,44 @@
+
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for GST" >&5
+-$as_echo_n "checking for GST... " >&6; }
++{ echo "$as_me:$LINENO: checking for GST" >&5
++echo $ECHO_N "checking for GST... $ECHO_C" >&6; }
+
+-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=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "$PKGS" 2>/dev/null`
+ else
+ 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=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "$PKGS" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -28454,32 +28161,32 @@
+ _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
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ else
+ GST_CFLAGS=$pkg_cv_GST_CFLAGS
+ GST_LIBS=$pkg_cv_GST_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_gstreamer=yes
+ fi
+
+ GST_LIBS="$GST_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10"
+ else
+- { $as_echo "$as_me:$LINENO: *** GStreamer support disabled ***" >&5
+-$as_echo "$as_me: *** GStreamer support disabled ***" >&6;}
++ { echo "$as_me:$LINENO: *** GStreamer support disabled ***" >&5
++echo "$as_me: *** GStreamer support disabled ***" >&6;}
+ fi
+ if test "x$have_gstreamer" = "xyes"; then
+ HAVE_GSTREAMER_TRUE=
+@@ -28505,40 +28212,44 @@
+ 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 +28262,23 @@
+ _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 +28288,16 @@
+
+ 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
+ if test "x$with_libcanberra" = "xyes"; then
+ BUILD_SOUND_TRUE=
+@@ -28616,10 +28327,10 @@
+
+ # 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
+-{ $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_UPDATE_MIME_DATABASE+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $UPDATE_MIME_DATABASE in
+ [\\/]* | ?:[\\/]*)
+@@ -28634,7 +28345,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_UPDATE_MIME_DATABASE="$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
+@@ -28647,11 +28358,11 @@
+ fi
+ UPDATE_MIME_DATABASE=$ac_cv_path_UPDATE_MIME_DATABASE
+ if test -n "$UPDATE_MIME_DATABASE"; then
+- { $as_echo "$as_me:$LINENO: result: $UPDATE_MIME_DATABASE" >&5
+-$as_echo "$UPDATE_MIME_DATABASE" >&6; }
++ { echo "$as_me:$LINENO: result: $UPDATE_MIME_DATABASE" >&5
++echo "${ECHO_T}$UPDATE_MIME_DATABASE" >&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
+
+
+@@ -28703,12 +28414,11 @@
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) $as_unset $ac_var ;;
+ esac ;;
+ esac
+@@ -28741,12 +28451,12 @@
+ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+ test "x$cache_file" != "x/dev/null" &&
+- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+-$as_echo "$as_me: updating cache $cache_file" >&6;}
++ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
++echo "$as_me: updating cache $cache_file" >&6;}
+ cat confcache >$cache_file
+ else
+- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
++ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
++echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ fi
+ fi
+ rm -f confcache
+@@ -28762,7 +28472,7 @@
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+ # 1. Remove the extension, and $U if already installed.
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
++ ac_i=`echo "$ac_i" | sed "$ac_script"`
+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
+ # will be set to the directory where LIBOBJS objects are built.
+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+@@ -28774,51 +28484,51 @@
+
+
+ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
++echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
++echo "$as_me: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
++echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
++echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
++echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
++echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
++echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -28827,76 +28537,75 @@
+
+
+ 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.
++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.
++ { { 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.
++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
+ 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.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"HAVE_RANDR\" was never defined.
++echo "$as_me: error: conditional \"HAVE_RANDR\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${HAVE_XCURSOR_TRUE}" && test -z "${HAVE_XCURSOR_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XCURSOR\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_XCURSOR\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"HAVE_XCURSOR\" was never defined.
++echo "$as_me: error: conditional \"HAVE_XCURSOR\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${BUILD_ABOUTME_TRUE}" && test -z "${BUILD_ABOUTME_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_ABOUTME\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"BUILD_ABOUTME\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"BUILD_ABOUTME\" was never defined.
++echo "$as_me: error: conditional \"BUILD_ABOUTME\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
++echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${HAVE_GSTREAMER_TRUE}" && test -z "${HAVE_GSTREAMER_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GSTREAMER\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GSTREAMER\" was never defined.
+ 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
+ if test -z "${ENABLE_UPDATE_MIMEDB_TRUE}" && test -z "${ENABLE_UPDATE_MIMEDB_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_UPDATE_MIMEDB\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_UPDATE_MIMEDB\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"ENABLE_UPDATE_MIMEDB\" was never defined.
++echo "$as_me: error: conditional \"ENABLE_UPDATE_MIMEDB\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ : ${CONFIG_STATUS=./config.status}
+-ac_write_fail=0
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
++echo "$as_me: creating $CONFIG_STATUS" >&6;}
++cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+ # Generated by $as_me.
+ # Run this file to recreate the current configuration.
+@@ -28909,7 +28618,7 @@
+ SHELL=\${CONFIG_SHELL-$SHELL}
+ _ACEOF
+
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ ## --------------------- ##
+ ## M4sh Initialization. ##
+ ## --------------------- ##
+@@ -28919,7 +28628,7 @@
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+@@ -28941,45 +28650,17 @@
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+-as_nl='
+-'
+-export as_nl
+-# Printing a long string crashes Solaris 7 /usr/bin/printf.
+-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+- as_echo='printf %s\n'
+- as_echo_n='printf %s'
+-else
+- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+- as_echo_n='/usr/ucb/echo -n'
+- else
+- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+- as_echo_n_body='eval
+- arg=$1;
+- case $arg in
+- *"$as_nl"*)
+- expr "X$arg" : "X\\(.*\\)$as_nl";
+- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+- esac;
+- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+- '
+- export as_echo_n_body
+- as_echo_n='sh -c $as_echo_n_body as_echo'
+- fi
+- export as_echo_body
+- as_echo='sh -c $as_echo_body as_echo'
+-fi
+-
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+- PATH_SEPARATOR=:
+- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+- PATH_SEPARATOR=';'
+- }
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
++ fi
++ rm -f conf$$.sh
+ fi
+
+ # Support unset when possible.
+@@ -28995,6 +28676,8 @@
+ # 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.)
++as_nl='
++'
+ IFS=" "" $as_nl"
+
+ # Find who we are. Look in the path if we contain no directory separator.
+@@ -29017,7 +28700,7 @@
+ as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ { (exit 1); exit 1; }
+ fi
+
+@@ -29030,10 +28713,17 @@
+ PS4='+ '
+
+ # NLS nuisances.
+-LC_ALL=C
+-export LC_ALL
+-LANGUAGE=C
+-export LANGUAGE
++for as_var in \
++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++ LC_TELEPHONE LC_TIME
++do
++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++ eval $as_var=C; export $as_var
++ else
++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++ fi
++done
+
+ # Required to use basename.
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+@@ -29055,7 +28745,7 @@
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X/"$0" |
++echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+@@ -29106,7 +28796,7 @@
+ s/-\n.*//
+ ' >$as_me.lineno &&
+ chmod +x "$as_me.lineno" ||
+- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { (exit 1); exit 1; }; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+@@ -29134,6 +28824,7 @@
+ *)
+ ECHO_N='-n';;
+ esac
++
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+@@ -29146,22 +28837,19 @@
+ rm -f conf$$.dir/conf$$.file
+ else
+ rm -f conf$$.dir
+- mkdir conf$$.dir 2>/dev/null
++ mkdir conf$$.dir
+ fi
+-if (echo >conf$$.file) 2>/dev/null; then
+- if ln -s conf$$.file conf$$ 2>/dev/null; then
+- as_ln_s='ln -s'
+- # ... but there are two gotchas:
+- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+- # In both cases, we have to default to `cp -p'.
+- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+- as_ln_s='cp -p'
+- elif ln conf$$.file conf$$ 2>/dev/null; then
+- as_ln_s=ln
+- else
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++ as_ln_s='ln -s'
++ # ... but there are two gotchas:
++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++ # In both cases, we have to default to `cp -p'.
++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+- fi
++elif ln conf$$.file conf$$ 2>/dev/null; then
++ as_ln_s=ln
+ else
+ as_ln_s='cp -p'
+ fi
+@@ -29186,10 +28874,10 @@
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+- test -d "$1/.";
++ test -d "$1/.";
+ else
+ case $1 in
+- -*)set "./$1";;
++ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ ???[sx]*):;;*)false;;esac;fi
+@@ -29212,7 +28900,7 @@
+ # values after options handling.
+ ac_log="
+ 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
+@@ -29225,7 +28913,7 @@
+
+ _ACEOF
+
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+ # Files that config.status was made for.
+ config_files="$ac_config_files"
+ config_headers="$ac_config_headers"
+@@ -29233,7 +28921,7 @@
+
+ _ACEOF
+
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ ac_cs_usage="\
+ \`$as_me' instantiates files from templates according to the
+ current configuration.
+@@ -29246,9 +28934,9 @@
+ -d, --debug don't remove temporary files
+ --recheck update $as_me by reconfiguring in the same conditions
+ --file=FILE[:TEMPLATE]
+- instantiate the configuration file FILE
++ instantiate the configuration file FILE
+ --header=FILE[:TEMPLATE]
+- instantiate the configuration header FILE
++ instantiate the configuration header FILE
+
+ Configuration files:
+ $config_files
+@@ -29262,13 +28950,13 @@
+ Report bugs to ."
+
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ 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,
++ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+-Copyright (C) 2008 Free Software Foundation, Inc.
++Copyright (C) 2006 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+
+@@ -29276,12 +28964,11 @@
+ srcdir='$srcdir'
+ INSTALL='$INSTALL'
+ MKDIR_P='$MKDIR_P'
+-AWK='$AWK'
+-test -n "\$AWK" || AWK=awk
+ _ACEOF
+
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-# The default lists apply if the user does not specify any file.
++cat >>$CONFIG_STATUS <<\_ACEOF
++# If no file are specified by the user, then we need to provide default
++# value. By we need to know if files were specified by the user.
+ ac_need_defaults=:
+ while test $# != 0
+ do
+@@ -29303,36 +28990,30 @@
+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+ ac_cs_recheck=: ;;
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+- $as_echo "$ac_cs_version"; exit ;;
++ echo "$ac_cs_version"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
+ debug=: ;;
+ --file | --fil | --fi | --f )
+ $ac_shift
+- case $ac_optarg in
+- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+- esac
+- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
++ CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+ ac_need_defaults=false;;
+ --header | --heade | --head | --hea )
+ $ac_shift
+- case $ac_optarg in
+- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+- esac
+- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
++ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+ ac_need_defaults=false;;
+ --he | --h)
+ # Conflict between --help and --header
+- { $as_echo "$as_me: error: ambiguous option: $1
++ { echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; };;
+ --help | --hel | -h )
+- $as_echo "$ac_cs_usage"; exit ;;
++ echo "$ac_cs_usage"; exit ;;
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil | --si | --s)
+ ac_cs_silent=: ;;
+
+ # This is an error.
+- -*) { $as_echo "$as_me: error: unrecognized option: $1
++ -*) { echo "$as_me: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; } ;;
+
+@@ -29351,29 +29032,27 @@
+ fi
+
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+ if \$ac_cs_recheck; then
+- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+- shift
+- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+- CONFIG_SHELL='$SHELL'
++ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++ CONFIG_SHELL=$SHELL
+ export CONFIG_SHELL
+- exec "\$@"
++ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ fi
+
+ _ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ exec 5>>config.log
+ {
+ echo
+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+ ## Running $as_me. ##
+ _ASBOX
+- $as_echo "$ac_log"
++ echo "$ac_log"
+ } >&5
+
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+ #
+ # INIT-COMMANDS
+ #
+@@ -29382,7 +29061,7 @@
+
+ _ACEOF
+
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+
+ # Handling of arguments.
+ for ac_config_target in $ac_config_targets
+@@ -29434,8 +29113,8 @@
+ "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
+-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
++ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
++echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+ done
+@@ -29476,143 +29155,390 @@
+ (umask 077 && mkdir "$tmp")
+ } ||
+ {
+- $as_echo "$as_me: cannot create a temporary directory in ." >&2
++ echo "$me: cannot create a temporary directory in ." >&2
+ { (exit 1); exit 1; }
+ }
+
+-# Set up the scripts for CONFIG_FILES section.
+-# No need to generate them if there are no CONFIG_FILES.
+-# This happens for instance with `./config.status config.h'.
++#
++# Set up the sed scripts for CONFIG_FILES section.
++#
++
++# No need to generate the scripts if there are no CONFIG_FILES.
++# This happens for instance when ./config.status config.h
+ if test -n "$CONFIG_FILES"; then
+
++_ACEOF
+
+-ac_cr='
'
+-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null`
+-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+- ac_cs_awk_cr='\\r'
+-else
+- ac_cs_awk_cr=$ac_cr
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++ cat >conf$$subs.sed <<_ACEOF
++SHELL!$SHELL$ac_delim
++PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
++PACKAGE_NAME!$PACKAGE_NAME$ac_delim
++PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
++PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
++PACKAGE_STRING!$PACKAGE_STRING$ac_delim
++PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
++exec_prefix!$exec_prefix$ac_delim
++prefix!$prefix$ac_delim
++program_transform_name!$program_transform_name$ac_delim
++bindir!$bindir$ac_delim
++sbindir!$sbindir$ac_delim
++libexecdir!$libexecdir$ac_delim
++datarootdir!$datarootdir$ac_delim
++datadir!$datadir$ac_delim
++sysconfdir!$sysconfdir$ac_delim
++sharedstatedir!$sharedstatedir$ac_delim
++localstatedir!$localstatedir$ac_delim
++includedir!$includedir$ac_delim
++oldincludedir!$oldincludedir$ac_delim
++docdir!$docdir$ac_delim
++infodir!$infodir$ac_delim
++htmldir!$htmldir$ac_delim
++dvidir!$dvidir$ac_delim
++pdfdir!$pdfdir$ac_delim
++psdir!$psdir$ac_delim
++libdir!$libdir$ac_delim
++localedir!$localedir$ac_delim
++mandir!$mandir$ac_delim
++DEFS!$DEFS$ac_delim
++ECHO_C!$ECHO_C$ac_delim
++ECHO_N!$ECHO_N$ac_delim
++ECHO_T!$ECHO_T$ac_delim
++LIBS!$LIBS$ac_delim
++build_alias!$build_alias$ac_delim
++host_alias!$host_alias$ac_delim
++target_alias!$target_alias$ac_delim
++INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
++INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
++INSTALL_DATA!$INSTALL_DATA$ac_delim
++am__isrc!$am__isrc$ac_delim
++CYGPATH_W!$CYGPATH_W$ac_delim
++PACKAGE!$PACKAGE$ac_delim
++VERSION!$VERSION$ac_delim
++ACLOCAL!$ACLOCAL$ac_delim
++AUTOCONF!$AUTOCONF$ac_delim
++AUTOMAKE!$AUTOMAKE$ac_delim
++AUTOHEADER!$AUTOHEADER$ac_delim
++MAKEINFO!$MAKEINFO$ac_delim
++install_sh!$install_sh$ac_delim
++STRIP!$STRIP$ac_delim
++INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
++mkdir_p!$mkdir_p$ac_delim
++AWK!$AWK$ac_delim
++SET_MAKE!$SET_MAKE$ac_delim
++am__leading_dot!$am__leading_dot$ac_delim
++AMTAR!$AMTAR$ac_delim
++am__tar!$am__tar$ac_delim
++am__untar!$am__untar$ac_delim
++MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
++MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
++MAINT!$MAINT$ac_delim
++CC!$CC$ac_delim
++CFLAGS!$CFLAGS$ac_delim
++LDFLAGS!$LDFLAGS$ac_delim
++CPPFLAGS!$CPPFLAGS$ac_delim
++ac_ct_CC!$ac_ct_CC$ac_delim
++EXEEXT!$EXEEXT$ac_delim
++OBJEXT!$OBJEXT$ac_delim
++DEPDIR!$DEPDIR$ac_delim
++am__include!$am__include$ac_delim
++am__quote!$am__quote$ac_delim
++AMDEP_TRUE!$AMDEP_TRUE$ac_delim
++AMDEP_FALSE!$AMDEP_FALSE$ac_delim
++AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
++CCDEPMODE!$CCDEPMODE$ac_delim
++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
++am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
++CPP!$CPP$ac_delim
++GREP!$GREP$ac_delim
++EGREP!$EGREP$ac_delim
++build!$build$ac_delim
++build_cpu!$build_cpu$ac_delim
++build_vendor!$build_vendor$ac_delim
++build_os!$build_os$ac_delim
++host!$host$ac_delim
++host_cpu!$host_cpu$ac_delim
++host_vendor!$host_vendor$ac_delim
++host_os!$host_os$ac_delim
++SED!$SED$ac_delim
++LN_S!$LN_S$ac_delim
++ECHO!$ECHO$ac_delim
++AR!$AR$ac_delim
++RANLIB!$RANLIB$ac_delim
++DSYMUTIL!$DSYMUTIL$ac_delim
++NMEDIT!$NMEDIT$ac_delim
++CXX!$CXX$ac_delim
++_ACEOF
++
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
++ break
++ elif $ac_last_try; then
++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++ { (exit 1); exit 1; }; }
++ else
++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++ fi
++done
++
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++ ac_eof=`expr $ac_eof + 1`
+ fi
+
+-echo 'BEGIN {' >"$tmp/subs1.awk" &&
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
+ _ACEOF
+
+
+-{
+- echo "cat >conf$$subs.awk <<_ACEOF" &&
+- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+- echo "_ACEOF"
+-} >conf$$subs.sh ||
+- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+- { (exit 1); exit 1; }; }
+-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+- . ./conf$$subs.sh ||
+- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+- { (exit 1); exit 1; }; }
++ cat >conf$$subs.sed <<_ACEOF
++CXXFLAGS!$CXXFLAGS$ac_delim
++ac_ct_CXX!$ac_ct_CXX$ac_delim
++CXXDEPMODE!$CXXDEPMODE$ac_delim
++am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
++am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
++CXXCPP!$CXXCPP$ac_delim
++F77!$F77$ac_delim
++FFLAGS!$FFLAGS$ac_delim
++ac_ct_F77!$ac_ct_F77$ac_delim
++LIBTOOL!$LIBTOOL$ac_delim
++PKG_CONFIG!$PKG_CONFIG$ac_delim
++HELP_DIR!$HELP_DIR$ac_delim
++OMF_DIR!$OMF_DIR$ac_delim
++DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim
++ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim
++ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim
++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
++INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim
++INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim
++INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim
++INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim
++INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim
++INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim
++INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim
++INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim
++INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim
++INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim
++INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
++INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim
++INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
++INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
++INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
++INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
++XGETTEXT!$XGETTEXT$ac_delim
++MSGMERGE!$MSGMERGE$ac_delim
++MSGFMT!$MSGFMT$ac_delim
++INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
++ALL_LINGUAS!$ALL_LINGUAS$ac_delim
++DATADIRNAME!$DATADIRNAME$ac_delim
++GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
++USE_NLS!$USE_NLS$ac_delim
++MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
++GMSGFMT!$GMSGFMT$ac_delim
++CATALOGS!$CATALOGS$ac_delim
++CATOBJEXT!$CATOBJEXT$ac_delim
++GMOFILES!$GMOFILES$ac_delim
++INSTOBJEXT!$INSTOBJEXT$ac_delim
++INTLLIBS!$INTLLIBS$ac_delim
++PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
++PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
++POFILES!$POFILES$ac_delim
++POSUB!$POSUB$ac_delim
++MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
++ACLOCAL_AMFLAGS!$ACLOCAL_AMFLAGS$ac_delim
++WARN_CFLAGS!$WARN_CFLAGS$ac_delim
++DISABLE_DEPRECATED!$DISABLE_DEPRECATED$ac_delim
++XMKMF!$XMKMF$ac_delim
++X_CFLAGS!$X_CFLAGS$ac_delim
++X_PRE_LIBS!$X_PRE_LIBS$ac_delim
++X_LIBS!$X_LIBS$ac_delim
++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
++ENABLE_DYNAMIC_LIBSLAB_TRUE!$ENABLE_DYNAMIC_LIBSLAB_TRUE$ac_delim
++ENABLE_DYNAMIC_LIBSLAB_FALSE!$ENABLE_DYNAMIC_LIBSLAB_FALSE$ac_delim
++LIBSLAB_CFLAGS!$LIBSLAB_CFLAGS$ac_delim
++LIBSLAB_LIBS!$LIBSLAB_LIBS$ac_delim
++CAPPLET_CFLAGS!$CAPPLET_CFLAGS$ac_delim
++CAPPLET_LIBS!$CAPPLET_LIBS$ac_delim
++GNOMECC_CFLAGS!$GNOMECC_CFLAGS$ac_delim
++GNOMECC_LIBS!$GNOMECC_LIBS$ac_delim
++GNOME_CFLAGS!$GNOME_CFLAGS$ac_delim
++GNOME_LIBS!$GNOME_LIBS$ac_delim
++DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim
++DBUS_LIBS!$DBUS_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
++DEFAULT_APPLICATIONS_CAPPLET_LIBS!$DEFAULT_APPLICATIONS_CAPPLET_LIBS$ac_delim
++METACITY_CFLAGS!$METACITY_CFLAGS$ac_delim
++METACITY_LIBS!$METACITY_LIBS$ac_delim
++TYPING_CFLAGS!$TYPING_CFLAGS$ac_delim
++TYPING_LIBS!$TYPING_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
++_ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ break
+ elif $ac_last_try; then
+- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+ done
+-rm -f conf$$subs.sh
+
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+-_ACEOF
+-sed -n '
+-h
+-s/^/S["/; s/!.*/"]=/
+-p
+-g
+-s/^[^!]*!//
+-:repl
+-t repl
+-s/'"$ac_delim"'$//
+-t delim
+-:nl
+-h
+-s/\(.\{148\}\).*/\1/
+-t more1
+-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+-p
+-n
+-b repl
+-:more1
+-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+-p
+-g
+-s/.\{148\}//
+-t nl
+-:delim
+-h
+-s/\(.\{148\}\).*/\1/
+-t more2
+-s/["\\]/\\&/g; s/^/"/; s/$/"/
+-p
+-b
+-:more2
+-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+-p
+-g
+-s/.\{148\}//
+-t delim
+-' >$CONFIG_STATUS || ac_write_fail=1
+-rm -f conf$$subs.awk
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-_ACAWK
+-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+- for (key in S) S_is_set[key] = 1
+- FS = ""
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++ ac_eof=`expr $ac_eof + 1`
++fi
+
+-}
+-{
+- line = $ 0
+- nfields = split(line, field, "@")
+- substed = 0
+- len = length(field[1])
+- for (i = 2; i < nfields; i++) {
+- key = field[i]
+- keylen = length(key)
+- if (S_is_set[key]) {
+- value = S[key]
+- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+- len += length(value) + length(field[++i])
+- substed = 1
+- } else
+- len += 1 + keylen
+- }
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
++_ACEOF
+
+- print line
+-}
+
+-_ACAWK
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++ cat >conf$$subs.sed <<_ACEOF
++GIO_LIBS!$GIO_LIBS$ac_delim
++GTK_ENGINE_DIR!$GTK_ENGINE_DIR$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
++AT_CAPPLET_LIBS!$AT_CAPPLET_LIBS$ac_delim
++HAVE_RANDR_TRUE!$HAVE_RANDR_TRUE$ac_delim
++HAVE_RANDR_FALSE!$HAVE_RANDR_FALSE$ac_delim
++DISPLAY_CAPPLET_CFLAGS!$DISPLAY_CAPPLET_CFLAGS$ac_delim
++DISPLAY_CAPPLET_LIBS!$DISPLAY_CAPPLET_LIBS$ac_delim
++XCURSOR_CFLAGS!$XCURSOR_CFLAGS$ac_delim
++XCURSOR_LIBS!$XCURSOR_LIBS$ac_delim
++HAVE_XCURSOR_TRUE!$HAVE_XCURSOR_TRUE$ac_delim
++HAVE_XCURSOR_FALSE!$HAVE_XCURSOR_FALSE$ac_delim
++LIBGNOMEKBD_CFLAGS!$LIBGNOMEKBD_CFLAGS$ac_delim
++LIBGNOMEKBD_LIBS!$LIBGNOMEKBD_LIBS$ac_delim
++LIBGNOMEKBDUI_CFLAGS!$LIBGNOMEKBDUI_CFLAGS$ac_delim
++LIBGNOMEKBDUI_LIBS!$LIBGNOMEKBDUI_LIBS$ac_delim
++LIBEBOOK_CFLAGS!$LIBEBOOK_CFLAGS$ac_delim
++LIBEBOOK_LIBS!$LIBEBOOK_LIBS$ac_delim
++BUILD_ABOUTME_TRUE!$BUILD_ABOUTME_TRUE$ac_delim
++BUILD_ABOUTME_FALSE!$BUILD_ABOUTME_FALSE$ac_delim
++HAL_CFLAGS!$HAL_CFLAGS$ac_delim
++HAL_LIBS!$HAL_LIBS$ac_delim
++GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim
++GCONFTOOL!$GCONFTOOL$ac_delim
++GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim
++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
++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
++GNOMECC_CAPPLETS_LIBS!$GNOMECC_CAPPLETS_LIBS$ac_delim
++UPDATE_MIME_DATABASE!$UPDATE_MIME_DATABASE$ac_delim
++ENABLE_UPDATE_MIMEDB_TRUE!$ENABLE_UPDATE_MIMEDB_TRUE$ac_delim
++ENABLE_UPDATE_MIMEDB_FALSE!$ENABLE_UPDATE_MIMEDB_FALSE$ac_delim
++LIBOBJS!$LIBOBJS$ac_delim
++LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+-else
+- cat
+-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+- || { { $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` = 49; then
++ break
++ elif $ac_last_try; then
++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
++ else
++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++ fi
++done
++
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++ ac_eof=`expr $ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF
++:end
++s/|#_!!_#|//g
++CEOF$ac_eof
+ _ACEOF
+
++
+ # 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
+@@ -29628,133 +29554,19 @@
+ }'
+ fi
+
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ fi # test -n "$CONFIG_FILES"
+
+-# Set up the scripts for CONFIG_HEADERS section.
+-# No need to generate them if there are no CONFIG_HEADERS.
+-# This happens for instance with `./config.status Makefile'.
+-if test -n "$CONFIG_HEADERS"; then
+-cat >"$tmp/defines.awk" <<\_ACAWK ||
+-BEGIN {
+-_ACEOF
+-
+-# Transform confdefs.h into an awk script `defines.awk', embedded as
+-# here-document in config.status, that substitutes the proper values into
+-# config.h.in to produce config.h.
+
+-# Create a delimiter string that does not exist in confdefs.h, to ease
+-# handling of long lines.
+-ac_delim='%!_!# '
+-for ac_last_try in false false :; do
+- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+- if test -z "$ac_t"; then
+- break
+- elif $ac_last_try; then
+- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+- { (exit 1); exit 1; }; }
+- else
+- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+- fi
+-done
+-
+-# 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
+-t rset
+-:rset
+-s/^[ ]*#[ ]*define[ ][ ]*/ /
+-t def
+-d
+-:def
+-s/\\$//
+-t bsnl
+-s/["\\]/\\&/g
+-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+-D["\1"]=" \3"/p
+-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
+-d
+-:bsnl
+-s/["\\]/\\&/g
+-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+-D["\1"]=" \3\\\\\\n"\\/p
+-t cont
+-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+-t cont
+-d
+-:cont
+-n
+-s/.\{148\}/&'"$ac_delim"'/g
+-t clear
+-:clear
+-s/\\$//
+-t bsnlc
+-s/["\\]/\\&/g; s/^/"/; s/$/"/p
+-d
+-:bsnlc
+-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+-b cont
+-' >$CONFIG_STATUS || ac_write_fail=1
+-
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+- for (key in D) D_is_set[key] = 1
+- FS = ""
+-}
+-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+- line = \$ 0
+- split(line, arg, " ")
+- if (arg[1] == "#") {
+- defundef = arg[2]
+- mac1 = arg[3]
+- } else {
+- defundef = substr(arg[1], 2)
+- mac1 = arg[2]
+- }
+- split(mac1, mac2, "(") #)
+- macro = mac2[1]
+- if (D_is_set[macro]) {
+- # Preserve the white space surrounding the "#".
+- prefix = substr(line, 1, index(line, defundef) - 1)
+- print prefix "define", macro P[macro] D[macro]
+- next
+- } else {
+- # Replace #undef with comments. This is necessary, for example,
+- # in the case of _POSIX_SOURCE, which is predefined and required
+- # on some systems where configure will not decide to define it.
+- if (defundef == "undef") {
+- print "/*", line, "*/"
+- next
+- }
+- }
+-}
+-{ print }
+-_ACAWK
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+-$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
+-for ac_tag
++for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
+ do
+ case $ac_tag in
+ :[FHLC]) ac_mode=$ac_tag; continue;;
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+-$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
++ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
++echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+ { (exit 1); exit 1; }; };;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+@@ -29783,38 +29595,26 @@
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
++ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
++echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+- ac_file_inputs="$ac_file_inputs '$ac_f'"
++ ac_file_inputs="$ac_file_inputs $ac_f"
+ done
+
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated by config.status. */
+- configure_input='Generated from '`
+- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+- `' by configure.'
++ configure_input="Generated from "`IFS=:
++ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+ if test x"$ac_file" != x-; then
+ configure_input="$ac_file. $configure_input"
+- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+-$as_echo "$as_me: creating $ac_file" >&6;}
++ { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
+ fi
+- # Neutralize special characters interpreted by sed in replacement strings.
+- case $configure_input in #(
+- *\&* | *\|* | *\\* )
+- ac_sed_conf_input=`$as_echo "$configure_input" |
+- sed 's/[\\\\&|]/\\\\&/g'`;; #(
+- *) ac_sed_conf_input=$configure_input;;
+- esac
+
+ case $ac_tag in
+- *:-:* | *:-) cat >"$tmp/stdin" \
+- || { { $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; }; } ;;
++ *:-:* | *:-) cat >"$tmp/stdin";;
+ esac
+ ;;
+ esac
+@@ -29824,7 +29624,7 @@
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$ac_file" |
++echo X"$ac_file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -29850,7 +29650,7 @@
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+@@ -29859,7 +29659,7 @@
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$as_dir" |
++echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -29880,17 +29680,17 @@
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ { (exit 1); exit 1; }; }; }
+ ac_builddir=.
+
+ case "$ac_dir" in
+ .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *)
+- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ # A ".." for each directory in $ac_dir_suffix.
+- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+@@ -29935,13 +29735,12 @@
+ esac
+ _ACEOF
+
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ # If the template does not know about datarootdir, expand it.
+ # FIXME: This hack should be removed a few years after 2.60.
+ ac_datarootdir_hack=; ac_datarootdir_seen=
+
+-ac_sed_dataroot='
+-/datarootdir/ {
++case `sed -n '/datarootdir/ {
+ p
+ q
+ }
+@@ -29950,14 +29749,13 @@
+ /@infodir@/p
+ /@localedir@/p
+ /@mandir@/p
+-'
+-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
++' $ac_file_inputs` in
+ *datarootdir*) ac_datarootdir_seen=yes;;
+ *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
++echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+ ac_datarootdir_hack='
+ s&@datadir@&$datadir&g
+ s&@docdir@&$docdir&g
+@@ -29971,16 +29769,15 @@
+ # Neutralize VPATH when `$srcdir' = `.'.
+ # Shell code in configure.ac might set extrasub.
+ # FIXME: do we really want to maintain this feature?
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-ac_sed_extra="$ac_vpsub
++cat >>$CONFIG_STATUS <<_ACEOF
++ sed "$ac_vpsub
+ $extrasub
+ _ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ :t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+-s|@configure_input@|$ac_sed_conf_input|;t t
++s&@configure_input@&$configure_input&;t t
+ s&@top_builddir@&$ac_top_builddir_sub&;t t
+-s&@top_build_prefix@&$ac_top_build_prefix&;t t
+ s&@srcdir@&$ac_srcdir&;t t
+ s&@abs_srcdir@&$ac_abs_srcdir&;t t
+ s&@top_srcdir@&$ac_top_srcdir&;t t
+@@ -29991,60 +29788,121 @@
+ s&@INSTALL@&$ac_INSTALL&;t t
+ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+ $ac_datarootdir_hack
+-"
+-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+- || { { $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; }; }
++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
+
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ which seems to be undefined. Please make sure it is defined." >&5
+-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ which seems to be undefined. Please make sure it is defined." >&2;}
+
+ rm -f "$tmp/stdin"
+ case $ac_file in
+- -) cat "$tmp/out" && rm -f "$tmp/out";;
+- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+- esac \
+- || { { $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; }; }
++ -) cat "$tmp/out"; rm -f "$tmp/out";;
++ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
++ esac
+ ;;
+ :H)
+ #
+ # CONFIG_HEADER
+ #
++_ACEOF
++
++# Transform confdefs.h into a sed script `conftest.defines', that
++# substitutes the proper values into config.h.in to produce config.h.
++rm -f conftest.defines conftest.tail
++# First, append a space to every undef/define line, to ease matching.
++echo 's/$/ /' >conftest.defines
++# Then, protect against being on the right side of a sed subst, or in
++# an unquoted here document, in config.status. If some macros were
++# called several times there might be several #defines for the same
++# symbol, which is useless. But do not sort them, since the last
++# AC_DEFINE must be honored.
++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
++# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
++# NAME is the cpp macro being defined, VALUE is the value it is being given.
++# PARAMS is the parameter list in the macro definition--in most cases, it's
++# just an empty string.
++ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
++ac_dB='\\)[ (].*,\\1define\\2'
++ac_dC=' '
++ac_dD=' ,'
++
++uniq confdefs.h |
++ sed -n '
++ t rset
++ :rset
++ s/^[ ]*#[ ]*define[ ][ ]*//
++ t ok
++ d
++ :ok
++ s/[\\&,]/\\&/g
++ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
++ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
++ ' >>conftest.defines
++
++# Remove the space that was appended to ease matching.
++# Then replace #undef with comments. This is necessary, for
++# example, in the case of _POSIX_SOURCE, which is predefined and required
++# on some systems where configure will not decide to define it.
++# (The regexp can be short, since the line contains either #define or #undef.)
++echo 's/ $//
++s,^[ #]*u.*,/* & */,' >>conftest.defines
++
++# Break up conftest.defines:
++ac_max_sed_lines=50
++
++# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
++# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
++# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
++# et cetera.
++ac_in='$ac_file_inputs'
++ac_out='"$tmp/out1"'
++ac_nxt='"$tmp/out2"'
++
++while :
++do
++ # Write a here document:
++ cat >>$CONFIG_STATUS <<_ACEOF
++ # First, check the format of the line:
++ cat >"\$tmp/defines.sed" <<\\CEOF
++/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
++/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
++b
++:def
++_ACEOF
++ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
++ echo 'CEOF
++ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
++ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
++ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
++ grep . conftest.tail >/dev/null || break
++ rm -f conftest.defines
++ mv conftest.tail conftest.defines
++done
++rm -f conftest.defines conftest.tail
++
++echo "ac_result=$ac_in" >>$CONFIG_STATUS
++cat >>$CONFIG_STATUS <<\_ACEOF
+ if test x"$ac_file" != x-; then
+- {
+- $as_echo "/* $configure_input */" \
+- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+- } >"$tmp/config.h" \
+- || { { $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; }; }
+- 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;}
++ 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; }; }
++ 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; }; }
++ echo "/* $configure_input */"
++ cat "$ac_result"
+ fi
+-# Compute "$ac_file"'s index in $config_headers.
+-_am_arg="$ac_file"
++ 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
+@@ -30059,7 +29917,7 @@
+ X"$_am_arg" : 'X\(//\)[^/]' \| \
+ X"$_am_arg" : 'X\(//\)$' \| \
+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$_am_arg" |
++echo X"$_am_arg" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -30079,8 +29937,8 @@
+ s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+-$as_echo "$as_me: executing $ac_file commands" >&6;}
++ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
++echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+ esac
+
+@@ -30102,7 +29960,7 @@
+ X"$mf" : 'X\(//\)[^/]' \| \
+ X"$mf" : 'X\(//\)$' \| \
+ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$mf" |
++echo X"$mf" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -30146,7 +30004,7 @@
+ X"$file" : 'X\(//\)[^/]' \| \
+ X"$file" : 'X\(//\)$' \| \
+ X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$file" |
++echo X"$file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -30172,7 +30030,7 @@
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+@@ -30181,7 +30039,7 @@
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$as_dir" |
++echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -30202,8 +30060,8 @@
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ { (exit 1); exit 1; }; }; }
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+@@ -30223,8 +30081,8 @@
+ "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
+
+ if test ! -f "po/Makefile"; then
+- { { $as_echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5
+-$as_echo "$as_me: error: po/Makefile is not ready." >&2;}
++ { { echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5
++echo "$as_me: error: po/Makefile is not ready." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ mv "po/Makefile" "po/Makefile.tmp"
+@@ -30246,11 +30104,6 @@
+ chmod +x $CONFIG_STATUS
+ ac_clean_files=$ac_clean_files_save
+
+-test $ac_write_fail = 0 ||
+- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+- { (exit 1); exit 1; }; }
+-
+
+ # configure is writing to config.log, and then calls config.status.
+ # config.status does its own redirection, appending to config.log.
+@@ -30272,8 +30125,4 @@
+ # would make configure fail if this is the last instruction.
+ $ac_cs_success || { (exit 1); exit 1; }
+ fi
+-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+- { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
+-$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
+-fi
+
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/help/Makefile.in gnome-control-center-2.24.0.1.new/help/Makefile.in
+--- gnome-control-center-2.24.0.1/help/Makefile.in 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/help/Makefile.in 2008-09-24 21:58:47.000000000 +0200
+@@ -288,7 +288,6 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/libslab/Makefile.in gnome-control-center-2.24.0.1.new/libslab/Makefile.in
+--- gnome-control-center-2.24.0.1/libslab/Makefile.in 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/libslab/Makefile.in 2008-09-24 21:58:48.000000000 +0200
+@@ -336,7 +336,6 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ INCLUDES = \
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/libwindow-settings/Makefile.in gnome-control-center-2.24.0.1.new/libwindow-settings/Makefile.in
+--- gnome-control-center-2.24.0.1/libwindow-settings/Makefile.in 2008-09-24 21:58:36.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/libwindow-settings/Makefile.in 2008-09-24 21:58:48.000000000 +0200
+@@ -317,7 +317,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 -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/Makefile.in gnome-control-center-2.24.0.1.new/Makefile.in
+--- gnome-control-center-2.24.0.1/Makefile.in 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/Makefile.in 2008-09-24 21:58:48.000000000 +0200
+@@ -293,7 +293,6 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = po libwindow-settings libslab capplets shell help \
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/shell/Makefile.in gnome-control-center-2.24.0.1.new/shell/Makefile.in
+--- gnome-control-center-2.24.0.1/shell/Makefile.in 2008-09-24 21:58:33.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/shell/Makefile.in 2008-09-24 21:58:48.000000000 +0200
+@@ -302,7 +302,6 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ INCLUDES = \
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/typing-break/Makefile.in gnome-control-center-2.24.0.1.new/typing-break/Makefile.in
+--- gnome-control-center-2.24.0.1/typing-break/Makefile.in 2008-09-24 21:58:34.000000000 +0200
++++ gnome-control-center-2.24.0.1.new/typing-break/Makefile.in 2008-09-24 21:58:48.000000000 +0200
+@@ -308,7 +308,6 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ gnome_typing_monitor_SOURCES = \
--- gnome-control-center-2.24.0.1.orig/debian/patches/16_preferred_applications_list_cleanup.patch
+++ gnome-control-center-2.24.0.1/debian/patches/16_preferred_applications_list_cleanup.patch
@@ -0,0 +1,47 @@
+# Description: don't list mozilla commands which are compatibility symlinks
+# Ubuntu: http://bugs.launchpad.net/bugs/55963
+# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=499327
+diff -Nur gnome-control-center-2.19.1/capplets/default-applications/gnome-default-applications.xml.in gnome-control-center-2.19.1.new/capplets/default-applications/gnome-default-applications.xml.in
+--- gnome-control-center-2.19.1/capplets/default-applications/gnome-default-applications.xml.in 2007-05-02 17:39:17.000000000 +0200
++++ gnome-control-center-2.19.1.new/capplets/default-applications/gnome-default-applications.xml.in 2007-05-02 17:40:38.000000000 +0200
+@@ -82,26 +82,6 @@
+ iceweasel -remote "openurl(%s,new-window)"
+
+
+- <_name>Mozilla 1.6
+- mozilla-1.6
+- mozilla-1.6 %s
+- mozilla-icon
+- false
+- true
+- mozilla-1.6 -remote "openurl(%s,new-tab)"
+- mozilla-1.6 -remote "openurl(%s,new-window)"
+-
+-
+- <_name>Mozilla
+- mozilla
+- mozilla %s
+- mozilla-icon
+- false
+- true
+- mozilla -remote "openurl(%s,new-tab)"
+- mozilla -remote "openurl(%s,new-window)"
+-
+-
+ <_name>SeaMonkey
+ seamonkey
+ seamonkey %s
+@@ -241,13 +206,6 @@
+ false
+
+
+- <_name>Mozilla Mail
+- mozilla
+- mozilla -mail %s
+- mozilla-mail-icon
+- false
+-
+-
+ <_name>SeaMonkey Mail
+ seamonkey
+ seamonkey -mail %s
--- gnome-control-center-2.24.0.1.orig/debian/patches/95_desktop-effects-integration.patch
+++ gnome-control-center-2.24.0.1/debian/patches/95_desktop-effects-integration.patch
@@ -0,0 +1,1499 @@
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/appearance/appearance-effects.c gnome-control-center-2.24.0.1.new/capplets/appearance/appearance-effects.c
+--- gnome-control-center-2.24.0.1/capplets/appearance/appearance-effects.c 1970-01-01 01:00:00.000000000 +0100
++++ gnome-control-center-2.24.0.1.new/capplets/appearance/appearance-effects.c 2008-10-13 15:32:26.000000000 +0100
+@@ -0,0 +1,1120 @@
++/*
++ * Copyright (C) 2007 Canonical
++ * Written by Michael Vogt
++ * and Mirco Müller
++ * All Rights Reserved
++ *
++ * Based on desktop-effects.c:
++ * Desktop Effects. A preference panel for compiz.
++ * Copyright (C) 2006 Red Hat, Inc.
++ * Author: Soren Sandmann (sandmann@redhat.com) *
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * 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.,
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ */
++
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++
++#include "appearance.h"
++
++#include "gconf-property-editor.h"
++
++typedef enum {
++ COMPIZ,
++ METACITY
++} WindowManager;
++
++#define WINDOW_MANAGER_KEY "/desktop/gnome/session/required_components/windowmanager"
++#define REVERT_COUNT 40
++#define SECONDS_WE_WILL_WAIT_FOR_COMPIZ_TO_START 8
++#define PLUGIN_LIST_KEY "/apps/compiz/general/allscreens/options/active_plugins"
++#define NUM_WORKSPACES "/apps/metacity/general/num_workspaces"
++
++/* helper structure to pass pager data around */
++typedef struct _TraversalChunk {
++ GConfClient *client;
++ GArray *numRowsArray;
++ gint rows;
++} TraversalChunk;
++
++/* possible effects level */
++enum {
++ NO_EFFECTS,
++ NORMAL_EFFECTS,
++ EXTRA_EFFECTS,
++ CUSTOM_EFFECTS
++};
++
++/* radio-button names in glade-file */
++static const char *effect_choices[] = {
++ "no_effects_button",
++ "normal_effects_button",
++ "extra_effects_button",
++ "custom_effects_button"
++};
++
++/* plugin-set for extra-effects level */
++static const gchar* extra_effects[] = {
++ "shift",
++ "wobbly",
++ NULL
++};
++
++static gboolean
++check_graphics_driver (void)
++{
++ return system ("jockey-gtk --check-composite") == 0;
++}
++
++static gboolean
++check_simple_ccsm (void)
++{
++ return g_file_test ("/usr/bin/simple-ccsm", G_FILE_TEST_IS_EXECUTABLE);
++}
++
++static void
++run_simple_ccsm (GtkButton *widget,
++ gpointer data)
++{
++ g_spawn_command_line_async ("/usr/bin/simple-ccsm", NULL);
++}
++
++static GSList *
++get_plugins (AppearanceData *app,
++ GError **err)
++{
++ return gconf_client_get_list (app->client,
++ PLUGIN_LIST_KEY,
++ GCONF_VALUE_STRING,
++ err);
++}
++
++static gboolean
++contains_string (GSList *plugins,
++ const gchar *needle)
++{
++ GSList *slist;
++
++ for (slist = plugins; slist != NULL; slist = slist->next)
++ {
++ const char *s = slist->data;
++
++ if (s && strcmp (s, needle) == 0)
++ return TRUE;
++ }
++
++ return FALSE;
++}
++
++
++static void
++show_info (const char *text)
++{
++ GtkWidget *dialog;
++
++ dialog = gtk_message_dialog_new (NULL,
++ GTK_DIALOG_MODAL,
++ GTK_MESSAGE_INFO,
++ GTK_BUTTONS_OK,
++ text);
++
++ gtk_dialog_run (GTK_DIALOG (dialog));
++ gtk_widget_destroy (dialog);
++}
++
++static gchar*
++get_string_value (GConfClient* client,
++ const gchar* key)
++{
++ gchar *value = NULL;
++ GError *error = NULL;
++
++ g_assert (client != NULL);
++ g_assert (key != NULL);
++
++ value = gconf_client_get_string (client, key, &error);
++ if (error)
++ return NULL;
++
++ return value;
++}
++
++static gint
++get_int_value (GConfClient* client,
++ const gchar* key)
++{
++ gint value = 0;
++ GError* error = NULL;
++
++ g_assert (client != NULL);
++ g_assert (key != NULL);
++
++ value = gconf_client_get_int (client, key, &error);
++ if (error)
++ return 0;
++
++ return value;
++}
++
++static void
++check_for_wnck_entry (gpointer data,
++ gpointer user_data)
++{
++ gchar *appletId = (gchar*) data;
++ TraversalChunk *chunk = (TraversalChunk*) user_data;
++ GString *propertyPath = NULL;
++ gchar *value = NULL;
++ gint rows = 0;
++ gint position = 0;
++
++ /* get bonobo-id of applet */
++ propertyPath = g_string_new ("/apps/panel/applets/");
++ propertyPath = g_string_append (propertyPath, appletId);
++ propertyPath = g_string_append (propertyPath, "/bonobo_iid");
++ value = get_string_value (chunk->client, propertyPath->str);
++
++ /* just exit if no bonobo-id was found */
++ if (!value)
++ {
++ g_string_free (propertyPath, TRUE);
++ return;
++ }
++
++ /* test if it is actually a switcher */
++ if (!g_ascii_strncasecmp (value,
++ "OAFIID:GNOME_WorkspaceSwitcherApplet",
++ 36))
++ {
++ /* assemble new gconf-path for num_rows gconf-key */
++ g_string_free (propertyPath, TRUE);
++ propertyPath = g_string_new ("/apps/panel/applets/");
++ propertyPath = g_string_append (propertyPath, appletId);
++ propertyPath = g_string_append (propertyPath, "/position");
++
++ /* get the value of position */
++ position = get_int_value (chunk->client, propertyPath->str);
++
++ if (position > 1)
++ {
++ /* assemble new gconf-path for num_rows gconf-key */
++ g_string_free (propertyPath, TRUE);
++ propertyPath = g_string_new ("/apps/panel/applets/");
++ propertyPath = g_string_append (propertyPath, appletId);
++ propertyPath = g_string_append (propertyPath,
++ "/prefs/num_rows");
++
++ /* get the value of rows */
++ rows = get_int_value (chunk->client, propertyPath->str);
++
++ if (!chunk->numRowsArray)
++ chunk->numRowsArray = g_array_new (TRUE,
++ TRUE,
++ sizeof (gint));
++
++ g_array_append_val (chunk->numRowsArray, rows);
++ }
++ }
++
++ g_string_free (propertyPath, TRUE);
++}
++
++gboolean
++set_int_value (GConfClient *client,
++ const gchar *key,
++ gint value)
++{
++ gboolean result = FALSE;
++ GError *error = NULL;
++
++ g_assert (client != NULL);
++ g_assert (key != NULL);
++
++ result = gconf_client_set_int (client,
++ key,
++ value,
++ &error);
++
++ if (error)
++ return FALSE;
++
++ return result;
++}
++
++static void
++set_wnck_entry (gpointer data,
++ gpointer user_data)
++{
++ gchar *appletId = (gchar*) data;
++ TraversalChunk *chunk = (TraversalChunk*) user_data;
++ GString *propertyPath = NULL;
++ gchar *value = NULL;
++ gint position = 0;
++
++ /* get bonobo-id of applet */
++ propertyPath = g_string_new ("/apps/panel/applets/");
++ propertyPath = g_string_append (propertyPath, appletId);
++ propertyPath = g_string_append (propertyPath, "/bonobo_iid");
++ value = get_string_value (chunk->client, propertyPath->str);
++
++ /* just exit if no bonobo-id was found */
++ if (!value)
++ {
++ g_string_free (propertyPath, TRUE);
++ return;
++ }
++
++ /* test if it is actually a switcher */
++ if (!g_ascii_strncasecmp (value,
++ "OAFIID:GNOME_WorkspaceSwitcherApplet",
++ 36))
++ {
++ /* assemble new gconf-path for applets position gconf-key */
++ g_string_free (propertyPath, TRUE);
++ propertyPath = g_string_new ("/apps/panel/applets/");
++ propertyPath = g_string_append (propertyPath, appletId);
++ propertyPath = g_string_append (propertyPath, "/position");
++
++ /* get the value of position */
++ position = get_int_value (chunk->client, propertyPath->str);
++
++ /* not the best way to test, if this applet is really active */
++ if (position > 1)
++ {
++ /* assemble new gconf-path for num_rows gconf-key */
++ g_string_free (propertyPath, TRUE);
++ propertyPath = g_string_new ("/apps/panel/applets/");
++ propertyPath = g_string_append (propertyPath, appletId);
++ propertyPath = g_string_append (propertyPath,
++ "/prefs/num_rows");
++
++ /* set the value of rows */
++ set_int_value (chunk->client,
++ propertyPath->str,
++ chunk->rows);
++ }
++ }
++
++ /* cleanup */
++ g_string_free (propertyPath, TRUE);
++}
++
++static gint
++get_pager_num_rows (GConfClient *client)
++{
++ GSList *idList = NULL;
++ TraversalChunk *chunk = NULL;
++ gint rows = 0;
++
++ /* get ids of all used applets */
++ idList = gconf_client_get_list (client,
++ "/apps/panel/general/applet_id_list",
++ GCONF_VALUE_STRING,
++ NULL);
++
++ if (!idList)
++ return 1;
++
++ /* create and initialize helper-structure */
++ chunk = g_new0 (TraversalChunk, 1);
++ if (!chunk)
++ {
++ g_slist_free (idList);
++ return 1;
++ }
++
++ chunk->client = client;
++
++ /* search list of applets for wnck-applet */
++ g_slist_foreach (idList,
++ check_for_wnck_entry,
++ (gpointer) chunk);
++
++ if (chunk->numRowsArray == NULL)
++ rows = 1;
++ else
++ rows = g_array_index (chunk->numRowsArray, gint, 0);
++
++ /* clean up */
++ g_slist_free (idList);
++ g_array_free (chunk->numRowsArray, TRUE);
++ g_free (chunk);
++
++ return rows;
++}
++
++/* sets the number of rows of the first pager-applet found */
++void static
++set_pager_num_rows (GConfClient *client,
++ gint rows)
++{
++ GSList *idList = NULL;
++ TraversalChunk *chunk = NULL;
++
++ /* get ids of all used applets */
++ idList = gconf_client_get_list (client,
++ "/apps/panel/general/applet_id_list",
++ GCONF_VALUE_STRING,
++ NULL);
++
++ /* if nothing is found at least return 1 to avoid a div. by 0 later */
++ if (!idList)
++ return;
++
++ /* create and initialize helper-structure */
++ chunk = g_new0 (TraversalChunk, 1);
++ if (!chunk)
++ {
++ g_slist_free (idList);
++ return;
++ }
++
++ chunk->client = client;
++ chunk->rows = rows;
++
++ /* search list of applets for wnck-applet */
++ g_slist_foreach (idList,
++ set_wnck_entry,
++ (gpointer) chunk);
++
++ /* clean up */
++ g_slist_free (idList);
++ g_array_free (chunk->numRowsArray, TRUE);
++ g_free (chunk);
++}
++
++static void
++apply_settings (AppearanceData *app,
++ gboolean effects_enabled)
++{
++ const char *str = effects_enabled? "compiz" : "metacity";
++ char *session_file;
++ gint vsize;
++ gint hsize;
++ gint workspaces;
++ gint rows;
++
++ gconf_client_set_string (app->client,
++ WINDOW_MANAGER_KEY,
++ str,
++ NULL);
++
++ session_file = g_build_filename (g_get_home_dir (),
++ ".gnome2",
++ "session",
++ NULL);
++
++ g_unlink (session_file);
++ g_free (session_file);
++
++ /* here the whole logic for mapping any N:M workspace-layout from
++ * metacity to compiz or vice versa is handled, currently only
++ * implemented for one-screen setups */
++ if (effects_enabled)
++ {
++ workspaces = get_int_value (app->client,
++ "/apps/metacity/general/num_workspaces");
++ rows = get_pager_num_rows (app->client);
++ set_int_value (app->client,
++ "/apps/compiz/general/screen0/options/vsize",
++ rows);
++ set_int_value (app->client,
++ "/apps/compiz/general/screen0/options/hsize",
++ (gint) ceilf ((gfloat) workspaces / (gfloat) rows));
++ set_pager_num_rows (app->client, 1);
++ }
++ else if (app->compiz_was_running)
++ {
++ vsize = get_int_value (app->client,
++ "/apps/compiz/general/screen0/options/vsize");
++ hsize = get_int_value (app->client,
++ "/apps/compiz/general/screen0/options/hsize");
++ set_int_value (app->client,
++ "/apps/metacity/general/num_workspaces",
++ vsize * hsize);
++ set_pager_num_rows (app->client, vsize);
++ }
++}
++
++static void
++set_busy (GtkWidget *widget,
++ gboolean busy)
++{
++ GdkCursor *cursor;
++
++ if (busy)
++ cursor = gdk_cursor_new (GDK_WATCH);
++ else
++ cursor = NULL;
++
++ gdk_window_set_cursor (widget->window, cursor);
++
++ if (cursor)
++ gdk_cursor_unref (cursor);
++
++ gdk_flush ();
++}
++
++/* get_wm_window() and current_window_manager() are essentially cutted and
++ * pasted from gnome-wm.c from gnome-control-center. */
++static Window
++get_wm_window (void)
++{
++ Window *xwindow;
++ Atom type;
++ gint format;
++ gulong nitems;
++ gulong bytes_after;
++ Window result;
++
++ XGetWindowProperty (GDK_DISPLAY (),
++ GDK_ROOT_WINDOW (),
++ XInternAtom (GDK_DISPLAY (),
++ "_NET_SUPPORTING_WM_CHECK",
++ False),
++ 0,
++ G_MAXLONG,
++ False,
++ XA_WINDOW,
++ &type,
++ &format,
++ &nitems,
++ &bytes_after,
++ (guchar **) &xwindow);
++
++ if (type != XA_WINDOW)
++ return None;
++
++ gdk_error_trap_push ();
++ XSelectInput (GDK_DISPLAY (),
++ *xwindow,
++ StructureNotifyMask | PropertyChangeMask);
++ XSync (GDK_DISPLAY (), False);
++
++ if (gdk_error_trap_pop ())
++ {
++ XFree (xwindow);
++ return None;
++ }
++
++ result = *xwindow;
++ XFree (xwindow);
++
++ return result;
++}
++
++static char*
++get_current_window_manager (void)
++{
++ Atom utf8_string;
++ Atom atom;
++ Atom type;
++ int result;
++ char *retval;
++ int format;
++ gulong nitems;
++ gulong bytes_after;
++ gchar *val;
++ Window wm_window = get_wm_window ();
++
++ utf8_string = XInternAtom (GDK_DISPLAY (), "UTF8_STRING", False);
++ atom = XInternAtom (GDK_DISPLAY (), "_NET_WM_NAME", False);
++
++ gdk_error_trap_push ();
++
++ result = XGetWindowProperty (GDK_DISPLAY (),
++ wm_window,
++ atom,
++ 0,
++ G_MAXLONG,
++ False,
++ utf8_string,
++ &type,
++ &format,
++ &nitems,
++ &bytes_after,
++ (guchar **)&val);
++
++ if (gdk_error_trap_pop () || result != Success)
++ return NULL;
++
++ if (type != utf8_string || format != 8 || nitems == 0)
++ {
++ if (val)
++ XFree (val);
++
++ return NULL;
++ }
++
++ if (!g_utf8_validate (val, nitems, NULL))
++ {
++ XFree (val);
++ return NULL;
++ }
++
++ retval = g_strndup (val, nitems);
++
++ XFree (val);
++
++ return retval;
++}
++
++static gboolean
++compiz_started (void)
++{
++ gboolean result;
++ char *wm = get_current_window_manager ();
++
++ result = wm && strcmp (wm, "compiz") == 0;
++
++ g_free (wm);
++
++ return result;
++}
++
++typedef struct TimedDialogInfo {
++ AppearanceData *app;
++ GTimer *timer;
++ GtkWidget *button;
++} TimedDialogInfo;
++
++static WindowManager
++current_configured_wm (AppearanceData *app,
++ GError **err)
++{
++ GError *tmp = NULL;
++
++ const char *str = gconf_client_get_string (app->client,
++ WINDOW_MANAGER_KEY,
++ &tmp);
++
++ if (tmp)
++ {
++ g_propagate_error (err, tmp);
++ return METACITY;
++ }
++
++ if (str && strcmp (str, "compiz") == 0)
++ return COMPIZ;
++ else
++ return METACITY;
++}
++
++static void
++show_error (const GError *err)
++{
++ GtkWidget *dialog;
++
++ if (!err)
++ return;
++
++ dialog = gtk_message_dialog_new (NULL,
++ GTK_DIALOG_DESTROY_WITH_PARENT,
++ GTK_MESSAGE_WARNING,
++ GTK_BUTTONS_OK,
++ err->message);
++
++ gtk_window_set_title (GTK_WINDOW (dialog), "");
++
++ gtk_dialog_run (GTK_DIALOG (dialog));
++ gtk_widget_destroy (dialog);
++}
++
++struct TimeoutData {
++ int time;
++ GtkLabel *label;
++ GtkDialog *dialog;
++ gboolean timed_out;
++};
++
++static gboolean
++free_at_idle (gpointer data)
++{
++ g_free (data);
++ return FALSE;
++}
++
++static char*
++idle_free (char *str)
++{
++ g_idle_add (free_at_idle, str);
++ return str;
++}
++
++static char *
++timeout_string (int time)
++{
++ char *str = g_strdup_printf (ngettext ("Testing the new settings. If you don't respond in %d second the previous settings will be restored.", "Testing the new settings. If you don't respond in %d seconds the previous settings will be restored.", time), time);
++
++ return idle_free (str);
++}
++
++static gboolean
++save_timeout_callback (gpointer data)
++{
++ struct TimeoutData *timeData = data;
++
++ timeData->time--;
++
++ if (timeData->time == 0)
++ {
++ gtk_dialog_response (timeData->dialog, GTK_RESPONSE_NO);
++ timeData->timed_out = TRUE;
++ return FALSE;
++ }
++
++ gtk_label_set_text (timeData->label, timeout_string (timeData->time));
++
++ return TRUE;
++}
++
++static gboolean
++run_timed_dialog (AppearanceData *app)
++{
++ GtkWidget *dialog;
++ GtkWidget *hbox;
++ GtkWidget *vbox;
++ GtkWidget *label;
++ GtkWidget *label_sec;
++ GtkWidget *image;
++ int res;
++ struct TimeoutData timeout_data;
++ guint timeout;
++
++ dialog = gtk_dialog_new ();
++ gtk_window_set_transient_for (GTK_WINDOW (dialog),
++ GTK_WINDOW (app->dialog));
++ gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
++ gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
++ gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
++ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
++ gtk_window_set_title (GTK_WINDOW (dialog), _("Keep Settings"));
++ gtk_window_set_position (GTK_WINDOW(dialog), GTK_WIN_POS_CENTER_ALWAYS);
++
++ label = gtk_label_new (NULL);
++ gtk_label_set_markup (GTK_LABEL (label),
++ idle_free (g_strdup_printf ("%s",
++ _("Do you want to keep these settings?"))));
++ image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION,
++ GTK_ICON_SIZE_DIALOG);
++ gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
++
++ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
++ gtk_label_set_selectable (GTK_LABEL (label), TRUE);
++ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
++
++ label_sec = gtk_label_new (timeout_string (REVERT_COUNT));
++ gtk_label_set_line_wrap (GTK_LABEL (label_sec), TRUE);
++ gtk_label_set_selectable (GTK_LABEL (label_sec), TRUE);
++ gtk_misc_set_alignment (GTK_MISC (label_sec), 0.0, 0.5);
++
++ hbox = gtk_hbox_new (FALSE, 6);
++ vbox = gtk_vbox_new (FALSE, 6);
++
++ gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
++ gtk_box_pack_start (GTK_BOX (vbox), label_sec, TRUE, TRUE, 0);
++ gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
++ gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
++ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
++ hbox,
++ FALSE,
++ FALSE,
++ 0);
++ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
++ _("Use _previous settings"),
++ GTK_RESPONSE_NO,
++ _("_Keep settings"),
++ GTK_RESPONSE_YES,
++ NULL);
++
++ gtk_widget_show_all (hbox);
++
++ timeout_data.time = REVERT_COUNT;
++ timeout_data.label = GTK_LABEL (label_sec);
++ timeout_data.dialog = GTK_DIALOG (dialog);
++ timeout_data.timed_out = FALSE;
++
++ timeout = g_timeout_add (1000, save_timeout_callback, &timeout_data);
++ res = gtk_dialog_run (GTK_DIALOG (dialog));
++
++ if (!timeout_data.timed_out)
++ g_source_remove (timeout);
++
++ gtk_widget_destroy (dialog);
++
++ return (res == GTK_RESPONSE_YES);
++}
++
++static gboolean
++show_dialog_timeout (gpointer data)
++{
++ TimedDialogInfo *info = data;
++ gboolean has_compiz;
++
++ gtk_window_present (GTK_WINDOW (info->app->dialog));
++
++ has_compiz = compiz_started ();
++
++ if (has_compiz ||
++ g_timer_elapsed (info->timer,
++ NULL) > SECONDS_WE_WILL_WAIT_FOR_COMPIZ_TO_START)
++ {
++ if (has_compiz)
++ {
++ set_busy (info->app->dialog, FALSE);
++
++ if (run_timed_dialog (info->app))
++ apply_settings (info->app,
++ info->app->desktop_effects_level >= 1);
++ else
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (info->button),
++ TRUE);
++ }
++ else
++ {
++ GtkWidget *dialog;
++
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (info->button),
++ TRUE);
++
++ set_busy (info->app->dialog, FALSE);
++
++ dialog = gtk_message_dialog_new ((GtkWindow*) info->app->dialog,
++ GTK_DIALOG_DESTROY_WITH_PARENT,
++ GTK_MESSAGE_WARNING,
++ GTK_BUTTONS_OK,
++ _("Desktop effects could not be enabled"));
++
++ gtk_window_set_title (GTK_WINDOW (dialog), "");
++ gtk_dialog_run (GTK_DIALOG (dialog));
++ gtk_widget_destroy (dialog);
++ }
++
++ gtk_widget_set_sensitive (info->app->dialog, TRUE);
++
++ g_timer_destroy (info->timer);
++ g_free (info);
++
++ return FALSE;
++ }
++
++ return TRUE;
++}
++
++static gboolean
++start_compiz (AppearanceData *app,
++ GError **err)
++{
++ if (!g_spawn_command_line_async ("compiz --replace", err))
++ return FALSE;
++
++ app->compiz_running = TRUE;
++
++ return TRUE;
++}
++
++static gboolean
++start_metacity (AppearanceData *app, GError **err)
++{
++ if (!g_spawn_command_line_async ("metacity --replace", err))
++ return FALSE;
++
++ app->compiz_running = FALSE;
++
++ return TRUE;
++}
++
++static gboolean
++has_composite ()
++{
++ int dummy1;
++ int dummy2;
++
++ if (XCompositeQueryExtension (GDK_DISPLAY (), &dummy1, &dummy2))
++ return TRUE;
++
++ return FALSE;
++}
++
++static void
++show_alert (const char *text)
++{
++ GtkWidget *dialog;
++
++ dialog = gtk_message_dialog_new (NULL,
++ GTK_DIALOG_MODAL,
++ GTK_MESSAGE_ERROR,
++ GTK_BUTTONS_OK,
++ text);
++
++ gtk_dialog_run (GTK_DIALOG (dialog));
++}
++
++static gboolean
++are_effects_enabled (AppearanceData* app,
++ const gchar** effects_list)
++{
++ int i;
++ gboolean res = TRUE;
++ GError *tmp = NULL;
++ GSList *plugins;
++
++ plugins = get_plugins (app, &tmp);
++ for (i = 0; effects_list[i] != NULL; i++)
++ res &= contains_string (plugins, effects_list[i]);
++
++ return res;
++}
++
++static gboolean
++reset_plugins (AppearanceData *app)
++{
++ GError *error = NULL;
++
++ return gconf_client_unset (app->client, PLUGIN_LIST_KEY, &error);
++}
++
++static gboolean
++are_normal_effects_enabled (AppearanceData *app)
++{
++ gboolean res = TRUE;
++ GError *err = NULL;
++ GSList *plugins, *default_plugins;
++
++ default_plugins = gconf_value_get_list ( gconf_client_get_default_from_schema (app->client, PLUGIN_LIST_KEY, &err));
++
++ err = NULL;
++ plugins = get_plugins (app, &err);
++ for(;default_plugins; default_plugins = g_slist_next(default_plugins))
++ res &= contains_string(plugins, gconf_value_get_string(default_plugins->data));
++
++ return res;
++}
++
++static gboolean
++are_extra_effects_enabled (AppearanceData *app)
++{
++ return (are_effects_enabled (app, extra_effects) &&
++ are_normal_effects_enabled (app));
++}
++
++static gint
++get_effects_level (AppearanceData *data)
++{
++ if (data->compiz_running)
++ {
++ if (are_extra_effects_enabled (data))
++ return EXTRA_EFFECTS;
++ else if (are_normal_effects_enabled (data))
++ return NORMAL_EFFECTS;
++ else
++ return CUSTOM_EFFECTS;
++ }
++ else
++ return NO_EFFECTS;
++}
++
++static gboolean
++enable_normal_effects (AppearanceData* app)
++{
++ return reset_plugins (app);
++}
++
++static gboolean
++enable_extra_effects (AppearanceData* app)
++{
++ GError *err = NULL;
++ GSList *plugins = NULL;
++ int i;
++
++ reset_plugins (app);
++
++ plugins = get_plugins (app, err);
++ for (i = 0; extra_effects[i] != NULL; i++)
++ plugins = g_slist_append (plugins,
++ (gchar*) extra_effects[i]);
++
++ err = NULL;
++ gconf_client_set_list (app->client,
++ PLUGIN_LIST_KEY,
++ GCONF_VALUE_STRING,
++ plugins,
++ &err);
++
++ return TRUE;
++}
++
++static void
++on_effects_toggle (GtkWidget *widget,
++ gpointer user_data)
++{
++ AppearanceData *appdata = user_data;
++ GtkWidget *previously_selected_button;
++ static gint old_effects_level;
++ static gboolean do_init = TRUE;
++ gint i;
++ GError *err = NULL;
++
++ if (do_init == TRUE)
++ {
++ old_effects_level = get_effects_level (appdata);
++ do_init = FALSE;
++ }
++
++ if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
++ return;
++
++ previously_selected_button = glade_xml_get_widget (appdata->xml,
++ effect_choices [old_effects_level]);
++
++ /* Look for the button which has been selected */
++ for (i = 0; i < G_N_ELEMENTS (effect_choices); i++)
++ {
++ if (widget == glade_xml_get_widget(appdata->xml,
++ effect_choices [i]))
++ break;
++ }
++
++ appdata->desktop_effects_level = i;
++
++ if (appdata->desktop_effects_level >= 1)
++ {
++ if (check_graphics_driver())
++ {
++ show_info (_("Please run \"Apperance/Desktop Effects\" again after restarting "
++ "the computer, when the new graphics driver is active."));
++ g_signal_handlers_block_by_func (widget,
++ on_effects_toggle,
++ appdata);
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget(appdata->xml,
++ effect_choices [old_effects_level])),
++ TRUE);
++ g_signal_handlers_unblock_by_func (widget,
++ on_effects_toggle,
++ appdata);
++ return;
++ }
++
++ if (!has_composite ())
++ {
++ show_alert ("The Composite extension is not available");
++ return;
++ }
++
++ if (old_effects_level == 0)
++ start_compiz (appdata, &err);
++
++ if (appdata->desktop_effects_level == NORMAL_EFFECTS)
++ enable_normal_effects (appdata);
++
++ if (appdata->desktop_effects_level == EXTRA_EFFECTS)
++ enable_extra_effects (appdata);
++ }
++ else
++ {
++ apply_settings (appdata, FALSE);
++ start_metacity (appdata, &err);
++ }
++
++ if (err)
++ {
++ show_error (err);
++
++ g_signal_handlers_block_by_func (widget,
++ on_effects_toggle,
++ appdata);
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (appdata->xml,
++ effect_choices [old_effects_level])),
++ TRUE);
++ g_signal_handlers_unblock_by_func (widget,
++ on_effects_toggle,
++ appdata);
++ }
++ else
++ {
++ if (appdata->desktop_effects_level >= 1 &&
++ old_effects_level == 0)
++ {
++ TimedDialogInfo *info = g_new0 (TimedDialogInfo, 1);
++
++ info->app = appdata;
++ info->button = previously_selected_button;
++ info->timer = g_timer_new ();
++
++ set_busy (info->app->dialog, TRUE);
++ gtk_widget_set_sensitive (appdata->dialog, FALSE);
++
++ g_timeout_add (250, show_dialog_timeout, info);
++ }
++ }
++
++ old_effects_level = i;
++}
++
++void
++effects_init (AppearanceData *data)
++{
++ GError *error = NULL;
++ GtkWidget *level_effects_button = NULL;
++ GtkWidget *hbox_custom_effects = NULL;
++ WindowManager wm = METACITY;
++ gint i;
++ const char *str = get_current_window_manager ();
++ if (str && strcmp (str, "compiz") == 0)
++ wm = COMPIZ;
++ g_free (str);
++
++ data->compiz_running = (wm == COMPIZ);
++ data->compiz_was_running = (wm == COMPIZ);
++ data->dialog = glade_xml_get_widget (data->xml, "appearance_window");
++
++ data->desktop_effects_level = get_effects_level (data);
++
++ for (i = 0; i < G_N_ELEMENTS (effect_choices); i++)
++ {
++ level_effects_button = glade_xml_get_widget (data->xml,
++ effect_choices[i]);
++ if (i == data->desktop_effects_level)
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (level_effects_button),
++ TRUE);
++
++ g_signal_connect (level_effects_button,
++ "toggled",
++ G_CALLBACK (on_effects_toggle),
++ data);
++ }
++
++ hbox_custom_effects = glade_xml_get_widget (data->xml,
++ "hbox_custom_effects");
++ if (check_simple_ccsm ())
++ {
++ GtkWidget *button = NULL;
++
++ gtk_widget_show (hbox_custom_effects);
++ button = glade_xml_get_widget (data->xml,
++ "custom_effects_edit_button");
++ g_signal_connect (button,
++ "clicked",
++ G_CALLBACK (run_simple_ccsm),
++ NULL);
++ }
++ else
++ gtk_widget_hide (hbox_custom_effects);
++}
++
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/appearance/appearance-effects.h gnome-control-center-2.24.0.1.new/capplets/appearance/appearance-effects.h
+--- gnome-control-center-2.24.0.1/capplets/appearance/appearance-effects.h 1970-01-01 01:00:00.000000000 +0100
++++ gnome-control-center-2.24.0.1.new/capplets/appearance/appearance-effects.h 2008-10-13 15:32:26.000000000 +0100
+@@ -0,0 +1,21 @@
++/*
++ * Copyright (C) 2007 Canonical
++ * Written by Michael Vogt
++ * All Rights Reserved
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * 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.,
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ */
++
++void effects_init (AppearanceData *data);
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/appearance/appearance.h gnome-control-center-2.24.0.1.new/capplets/appearance/appearance.h
+--- gnome-control-center-2.24.0.1/capplets/appearance/appearance.h 2008-10-13 15:32:23.000000000 +0100
++++ gnome-control-center-2.24.0.1.new/capplets/appearance/appearance.h 2008-10-13 15:32:26.000000000 +0100
+@@ -70,6 +70,12 @@
+ gchar *revert_windowtitle_font;
+ gchar *revert_monospace_font;
+
++ /* effects */
++ gboolean compiz_running;
++ gboolean compiz_was_running;
++ gint desktop_effects_level;
++ GtkWidget *dialog;
++
+ /* style */
+ GdkPixbuf *gtk_theme_icon;
+ GdkPixbuf *window_theme_icon;
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c gnome-control-center-2.24.0.1.new/capplets/appearance/appearance-main.c
+--- gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c 2008-10-13 15:32:23.000000000 +0100
++++ gnome-control-center-2.24.0.1.new/capplets/appearance/appearance-main.c 2008-10-13 15:36:59.000000000 +0100
+@@ -156,6 +156,7 @@
+ g_strfreev (wallpaper_files);
+ font_init (data);
+ ui_init (data);
++ effects_init (data);
+
+ /* prepare the main window */
+ w = glade_xml_get_widget (data->xml, "appearance_window");
+@@ -188,6 +189,14 @@
+ g_free (page_name);
+ }
+
++ /* de-sensitise effects tab if compiz isn't installed */
++ if (g_find_program_in_path ("compiz") == NULL) {
++ GtkWidget *w;
++
++ w = glade_xml_get_widget (data->xml, "effects_vbox");
++ gtk_widget_set_sensitive (w, FALSE);
++ }
++
+ /* start the mainloop */
+ gtk_main ();
+
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/appearance/data/appearance.glade gnome-control-center-2.24.0.1.new/capplets/appearance/data/appearance.glade
+--- gnome-control-center-2.24.0.1/capplets/appearance/data/appearance.glade 2008-10-13 15:32:23.000000000 +0100
++++ gnome-control-center-2.24.0.1.new/capplets/appearance/data/appearance.glade 2008-10-13 15:32:26.000000000 +0100
+@@ -1815,6 +1815,281 @@
+ False
+
+
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 6
++ 18
++ True
++
++
++ True
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 0
++ True
++ True
++
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 6
++ /usr/share/gnome-control-center/pixmaps/visual-effects_none.svg
++ 6
++
++
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 6
++ <b>_None:</b> Provides a simple desktop environment without any effects.
++ True
++ True
++ True
++
++
++ 1
++
++
++
++
++
++
++ False
++ False
++ 6
++
++
++
++
++ True
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 0
++ True
++ True
++ no_effects_button
++
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 6
++ /usr/share/gnome-control-center/pixmaps/visual-effects_normal.svg
++ 6
++
++
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 6
++ <b>N_ormal:</b> Provides improved usability and good balance between attractiveness and moderate performance requirements.
++ True
++ True
++ True
++
++
++ 1
++
++
++
++
++
++
++ False
++ False
++ 6
++ 1
++
++
++
++
++
++ False
++ False
++ 6
++ 2
++
++
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ True
++
++
++ True
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 0
++ True
++ True
++ no_effects_button
++
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 6
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 6
++ /usr/share/gnome-control-center/pixmaps/visual-effects_custom.svg
++ 6
++
++
++ False
++ False
++
++
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ <b>C_ustom:</b> Uses custom set of effects.
++ True
++ True
++ True
++
++
++ False
++ False
++ 1
++
++
++
++
++
++
++ False
++ False
++
++
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++
++
++ False
++ False
++
++
++
++
++ True
++ True
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ gtk-preferences
++ True
++ 0
++
++
++ False
++ False
++ 1
++
++
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++
++
++ False
++ False
++ 2
++
++
++
++
++ False
++ False
++ 6
++ 1
++
++
++
++
++ False
++ False
++ 3
++
++
++
++
++ 4
++
++
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ Visual Effects
++
++
++ tab
++ 4
++ False
++
++
+
+
+ 1
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/appearance/Makefile.am gnome-control-center-2.24.0.1.new/capplets/appearance/Makefile.am
+--- gnome-control-center-2.24.0.1/capplets/appearance/Makefile.am 2008-10-13 15:32:23.000000000 +0100
++++ gnome-control-center-2.24.0.1.new/capplets/appearance/Makefile.am 2008-10-13 15:32:26.000000000 +0100
+@@ -9,6 +9,8 @@
+ appearance.h \
+ appearance-desktop.c \
+ appearance-desktop.h \
++ appearance-effects.c\
++ appearance-effects.h\
+ appearance-font.c \
+ appearance-font.h \
+ appearance-main.c \
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/po/POTFILES.in gnome-control-center-2.24.0.1.new/po/POTFILES.in
+--- gnome-control-center-2.24.0.1/po/POTFILES.in 2008-10-13 15:32:23.000000000 +0100
++++ gnome-control-center-2.24.0.1.new/po/POTFILES.in 2008-10-13 15:32:26.000000000 +0100
+@@ -11,6 +11,7 @@
+ capplets/accessibility/at-properties/at-properties.desktop.in.in
+ capplets/accessibility/at-properties/main.c
+ capplets/appearance/appearance-desktop.c
++capplets/appearance/appearance-effects.c
+ capplets/appearance/appearance-font.c
+ capplets/appearance/appearance-main.c
+ capplets/appearance/appearance-style.c
--- gnome-control-center-2.24.0.1.orig/debian/patches/109_screen_resolution_extra.patch
+++ gnome-control-center-2.24.0.1/debian/patches/109_screen_resolution_extra.patch
@@ -0,0 +1,291 @@
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/display/xrandr-capplet.c gnome-control-center-2.24.0.1-screen/capplets/display/xrandr-capplet.c
+--- gnome-control-center-2.24.0.1/capplets/display/xrandr-capplet.c 2008-09-24 18:36:22.000000000 +0200
++++ gnome-control-center-2.24.0.1-screen/capplets/display/xrandr-capplet.c 2008-09-29 16:07:45.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include
+ #include
+ #include
++#include "screen-package.h"
+
+ typedef struct App App;
+ typedef struct GrabInfo GrabInfo;
+@@ -74,13 +75,70 @@
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_OK, err->message);
++
++ gtk_window_set_title (GTK_WINDOW (dialog), "");
++
++ gtk_dialog_run (GTK_DIALOG (dialog));
++ gtk_widget_destroy (dialog);
++}
++#endif
+
++static void
++show_error_dialog (gchar *err)
++{
++ if (!err)
++ return;
++
++ GtkWidget *dialog = gtk_message_dialog_new (
++ NULL,
++ GTK_DIALOG_DESTROY_WITH_PARENT,
++ GTK_MESSAGE_WARNING,
++ GTK_BUTTONS_OK, "%s", err);
++
+ gtk_window_set_title (GTK_WINDOW (dialog), "");
++
++ gtk_dialog_run (GTK_DIALOG (dialog));
++ gtk_widget_destroy (dialog);
++}
+
++static void
++show_info_dialog (gchar *info)
++{
++ if (!info)
++ return;
++
++ GtkWidget *dialog = gtk_message_dialog_new (
++ NULL,
++ GTK_DIALOG_DESTROY_WITH_PARENT,
++ GTK_MESSAGE_INFO,
++ GTK_BUTTONS_OK, "%s", info);
++
++ gtk_window_set_title (GTK_WINDOW (dialog), "");
++
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+-#endif
++
++static gint
++show_question_dialog (gchar *question)
++{
++ if (!question)
++ return;
++
++ GtkWidget *dialog = gtk_message_dialog_new (
++ NULL,
++ GTK_DIALOG_DESTROY_WITH_PARENT,
++ GTK_MESSAGE_WARNING,
++ GTK_BUTTONS_YES_NO, "%s", question);
++
++ gtk_window_set_title (GTK_WINDOW (dialog), "");
++
++ gint response = gtk_dialog_run (GTK_DIALOG (dialog));
++
++ gtk_widget_destroy (dialog);
++
++ return response;
++}
+
+ static gboolean
+ do_free (gpointer data)
+@@ -1579,39 +1637,14 @@
+ return atom;
+ }
+
+-static void
+-compute_virtual_size_for_configuration (GnomeRRConfig *config, int *ret_width, int *ret_height)
+-{
+- int i;
+- int width, height;
+-
+- width = height = 0;
+-
+- for (i = 0; config->outputs[i] != NULL; i++)
+- {
+- GnomeOutputInfo *output;
+-
+- output = config->outputs[i];
+-
+- if (output->on)
+- {
+- width = MAX (width, output->x + output->width);
+- height = MAX (height, output->y + output->height);
+- }
+- }
+-
+- *ret_width = width;
+- *ret_height = height;
+-}
+-
+-static void
++static gboolean
+ check_required_virtual_size (App *app)
+ {
+ int req_width, req_height;
+ int min_width, max_width;
+ int min_height, max_height;
+
+- compute_virtual_size_for_configuration (app->current_configuration, &req_width, &req_height);
++ ubuntu_compute_virtual_size_for_configuration (app->current_configuration, &req_width, &req_height);
+
+ gnome_rr_screen_get_ranges (app->screen, &min_width, &max_width, &min_height, &max_height);
+
+@@ -1626,11 +1659,116 @@
+ if (!(min_width <= req_width && req_width <= max_width
+ && min_height <= req_height && req_height <= max_height))
+ {
+- /* FIXME: present a useful dialog, maybe even before the user tries to Apply */
+ #if 0
+ g_debug ("Your X server needs a larger Virtual size!");
+ #endif
++
++ /* Save the desired settings here since, if the
++ * framebuffer is not enough, the settings won't be
++ * saved to monitor.xml
++ */
++ GError *err = NULL;
++ gnome_rr_config_sanitize (app->current_configuration);
++
++ /* try to save the desired settings even though the
++ * current framebuffer size is not enough
++ */
++ ubuntu_gnome_rr_config_save_desired (app->current_configuration, &err);
++
++ /* If the Python program is available, we try to
++ * set the virtual resolution, otherwise we simply
++ * show a dialog and inform the user to do it
++ * manually
++ */
++ char *filename = "/usr/share/screen-resolution-extra/policyui.py";
++ gchar *error = _("Your settings cannot be applied because the virtual resolution in not big enough to contain your screens");
++
++ if ((g_file_test(filename, G_FILE_TEST_EXISTS)))
++ {
++ /* Send req_width and req_height to the Python program
++ * and it should set the virtual resolution.
++ * The Python program will have a normal exit status
++ * in the following cases:
++ * 1. If the virtual resolution is already set and
++ * its size is >= the required size
++ * 2. If the virtual resolution can be set without
++ * problems
++ * the Python program will exit with an error status if:
++ * 1. for several reasons the virtual resolution can't
++ * be set (e.g. PolicyKit can't get the authorisation
++ * or if there's a bug)
++ */
++ gboolean rc;
++ int status;
++ gchar *command = g_strconcat ("python ", filename, NULL);
++
++ gchar *ostr = g_strdup_printf (" %dx%d", req_width, req_height);
++ gchar *buf = g_strconcat (command, ostr, NULL);
++ g_free(command);
++ g_free(ostr);
++ command = buf;
++
++
++ rc = (g_spawn_command_line_sync (command, NULL, NULL, &status, NULL) && status == 0);
++ g_free (command);
++
++ /* rc is FALSE if the virtual resolution can't be set
++ */
++ if (! rc)
++ {
++ /* inform the user with an error dialog */
++ show_error_dialog (error);
++ /* g_free(error); */
++ }
++ else
++ {
++ /* Operation Complete.
++ * Inform the user with a dialog
++ */
++ gchar *info = _("Please log out and log back in again");
++ show_info_dialog(info);
++ }
++ }
++ else
++ {
++ /* ask the user to install screen-resolution-extra */
++ gchar *question = g_strdup_printf (_("The installation of an additional component (%s) is required in order to apply your settings. Would you like to install it now?"), "screen-resolution-extra"); /* screen-resolution-extra mustn't be translated */
++ gint reply = show_question_dialog (question);
++ g_free(question);
++
++ if (reply != -8)
++ {
++ /* inform the user with an error dialog */
++ show_error_dialog (error);
++ }
++ else
++ {
++ gchar **packages;
++ gboolean installed;
++ gint i = 0;
++
++ packages = g_new0 (gchar*, 3);
++
++ packages[i++] = g_strdup ("screen-resolution-extra");
++
++ installed = ubuntu_packages_install (GTK_WINDOW (app->dialog), packages);
++ g_strfreev (packages);
++
++ if (installed)
++ {
++ /* screen-resolution-extra was installed.
++ * Call this function again so as to use screen-resolution-extra.
++ */
++ gboolean result = check_required_virtual_size (app);
++ return result;
++ }
++
++ }
++ }
++ return FALSE;
+ }
++ else
++ return TRUE;
+ }
+
+ static void
+@@ -1639,27 +1777,32 @@
+ GError *err = NULL;
+
+ gnome_rr_config_sanitize (app->current_configuration);
+-
+- check_required_virtual_size (app);
+-
+- foo_scroll_area_invalidate (FOO_SCROLL_AREA (app->area));
+-
+- if (gnome_rr_config_save (app->current_configuration, &err))
++
++ /* Don't try to apply the settings unless the framebuffer
++ * is enough. The user will be notified in
++ * check_required_virtual_size()
++ */
++ if (check_required_virtual_size (app))
+ {
+- XEvent message;
+-
+- message.xclient.type = ClientMessage;
+- message.xclient.message_type = gnome_randr_atom();
+- message.xclient.format = 8;
++ foo_scroll_area_invalidate (FOO_SCROLL_AREA (app->area));
++
++ if (gnome_rr_config_save (app->current_configuration, &err))
++ {
++ XEvent message;
++
++ message.xclient.type = ClientMessage;
++ message.xclient.message_type = gnome_randr_atom();
++ message.xclient.format = 8;
+
+ #if 0
+ g_debug ("Sending client message");
+ #endif
+
+- XSendEvent (gdk_x11_get_default_xdisplay(),
+- gdk_x11_get_default_root_xwindow(),
+- FALSE,
+- StructureNotifyMask, &message);
++ XSendEvent (gdk_x11_get_default_xdisplay(),
++ gdk_x11_get_default_root_xwindow(),
++ FALSE,
++ StructureNotifyMask, &message);
++ }
+ }
+ }
+
--- gnome-control-center-2.24.0.1.orig/debian/patches/26_add_touchpad_to_mouse_settings.patch
+++ gnome-control-center-2.24.0.1/debian/patches/26_add_touchpad_to_mouse_settings.patch
@@ -0,0 +1,310 @@
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.21.90/capplets/mouse/gnome-mouse-properties.c gnome-control-center-2.21.90.new/capplets/mouse/gnome-mouse-properties.c
+--- gnome-control-center-2.21.90/capplets/mouse/gnome-mouse-properties.c 2008-02-14 09:15:50.000000000 +0000
++++ gnome-control-center-2.21.90.new/capplets/mouse/gnome-mouse-properties.c 2008-02-14 09:18:13.000000000 +0000
+@@ -41,6 +41,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #ifdef HAVE_XCURSOR
+ #include
+@@ -341,6 +342,35 @@
+ return new_value;
+ }
+
++static gboolean
++find_synaptics()
++{
++ int numdevices, i;
++ gboolean ret = FALSE;
++ XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices);
++ for (i = 0; i < numdevices; i++) {
++ if (strcmp (devicelist[i].name, "Synaptics Touchpad") == 0)
++ ret = TRUE;
++ }
++
++ XFreeDeviceList(devicelist);
++ return ret;
++}
++
++
++static void
++touchpad_enabled_toggle_cb (GtkToggleButton *button, GladeXML *dialog)
++{
++ gboolean active;
++
++ active = gtk_toggle_button_get_active (button);
++
++ gtk_widget_set_sensitive (WID ("tap_to_click_toggle"), active);
++ gtk_widget_set_sensitive (WID ("vert_scroll_toggle"), active);
++ gtk_widget_set_sensitive (WID ("horiz_scroll_toggle"), active);
++
++}
++
+ /* Set up the property editors in the dialog. */
+ static void
+ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
+@@ -387,6 +417,23 @@
+ (changeset, "/desktop/gnome/peripherals/mouse/drag_threshold", WID ("drag_threshold_scale"),
+ "conv-to-widget-cb", drag_threshold_from_gconf,
+ NULL);
++
++ /* Trackpad page */
++ if (find_synaptics() == FALSE)
++ gtk_notebook_remove_page (GTK_NOTEBOOK(WID("prefs_widget")),-1);
++ else {
++ g_signal_connect (G_OBJECT (WID ("touchpad_enabled_toggle")), "toggled", (GCallback) touchpad_enabled_toggle_cb, dialog);
++
++ peditor = gconf_peditor_new_boolean
++ (changeset, "/desktop/gnome/peripherals/mouse/touchpad_enabled", WID ("touchpad_enabled_toggle"), NULL);
++ peditor = gconf_peditor_new_boolean
++ (changeset, "/desktop/gnome/peripherals/mouse/tap_to_click", WID ("tap_to_click_toggle"), NULL);
++ peditor = gconf_peditor_new_boolean
++ (changeset, "/desktop/gnome/peripherals/mouse/pad_vert_scroll", WID ("vert_scroll_toggle"), NULL);
++ peditor = gconf_peditor_new_boolean
++ (changeset, "/desktop/gnome/peripherals/mouse/pad_horiz_scroll", WID ("horiz_scroll_toggle"), NULL);
++ }
++
+ }
+
+ /* Construct the dialog */
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.21.90/capplets/mouse/gnome-mouse-properties.glade gnome-control-center-2.21.90.new/capplets/mouse/gnome-mouse-properties.glade
+--- gnome-control-center-2.21.90/capplets/mouse/gnome-mouse-properties.glade 2008-02-14 09:15:50.000000000 +0000
++++ gnome-control-center-2.21.90.new/capplets/mouse/gnome-mouse-properties.glade 2008-02-14 09:17:39.000000000 +0000
+@@ -1288,6 +1288,235 @@
+ False
+
+
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 12
++ 18
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 6
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 0
++ 0
++ <b>General</b>
++ True
++
++
++ False
++ False
++
++
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 0
++ 0
++
++
++
++ False
++ False
++
++
++
++
++ True
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ Enable _touchpad
++ True
++ 0
++ True
++ True
++
++
++ 1
++
++
++
++
++ False
++ False
++ 1
++
++
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 0
++ 0
++
++
++
++ False
++ False
++
++
++
++
++ True
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ Enable mouse _clicks with touchpad
++ True
++ 0
++ True
++ True
++
++
++ 1
++
++
++
++
++ False
++ False
++ 2
++
++
++
++
++ False
++ False
++
++
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 6
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 0
++ 0
++ <b>Scrolling</b>
++ True
++
++
++ False
++ False
++
++
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 0
++ 0
++
++
++
++ False
++ False
++
++
++
++
++ True
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ Enable _vertical scrolling
++ True
++ 0
++ True
++ True
++
++
++ 1
++
++
++
++
++ False
++ False
++ 1
++
++
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++
++
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ 0
++ 0
++
++
++
++ False
++ False
++
++
++
++
++ True
++ True
++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
++ Enable _horizontal scrolling
++ True
++ 0
++ True
++
++
++ 1
++
++
++
++
++ False
++ False
++ 2
++
++
++
++
++ False
++ False
++ 1
++
++
++
++
++ 2
++
++
++
++
++ True
++ Touchpad
++ GTK_JUSTIFY_CENTER
++
++
++ tab
++ 2
++ False
++
++
+
+
+ 1
--- gnome-control-center-2.24.0.1.orig/debian/patches/110_screen_resolution_package.patch
+++ gnome-control-center-2.24.0.1/debian/patches/110_screen_resolution_package.patch
@@ -0,0 +1,309 @@
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/display/Makefile.am gnome-control-center-2.24.0.1-package/capplets/display/Makefile.am
+--- gnome-control-center-2.24.0.1/capplets/display/Makefile.am 2008-09-24 18:36:22.000000000 +0200
++++ gnome-control-center-2.24.0.1-package/capplets/display/Makefile.am 2008-09-29 15:55:57.000000000 +0200
+@@ -9,8 +9,10 @@
+ gnome_display_properties_SOURCES = \
+ xrandr-capplet.c \
+ scrollarea.c \
++ screen-package.c \
+ foo-marshal.c \
+ scrollarea.h \
++ screen-package.h \
+ foo-marshal.h
+
+ gnome_display_properties_LDFLAGS = -export-dynamic
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/display/Makefile.in gnome-control-center-2.24.0.1-package/capplets/display/Makefile.in
+--- gnome-control-center-2.24.0.1/capplets/display/Makefile.in 2008-09-24 18:41:37.000000000 +0200
++++ gnome-control-center-2.24.0.1-package/capplets/display/Makefile.in 2008-09-29 16:52:51.000000000 +0200
+@@ -55,7 +55,7 @@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+ am_gnome_display_properties_OBJECTS = xrandr-capplet.$(OBJEXT) \
+- scrollarea.$(OBJEXT) foo-marshal.$(OBJEXT)
++ scrollarea.$(OBJEXT) screen-package.$(OBJEXT) foo-marshal.$(OBJEXT)
+ gnome_display_properties_OBJECTS = \
+ $(am_gnome_display_properties_OBJECTS)
+ am__DEPENDENCIES_1 =
+@@ -327,8 +327,10 @@
+ gnome_display_properties_SOURCES = \
+ xrandr-capplet.c \
+ scrollarea.c \
++ screen-package.c \
+ foo-marshal.c \
+ scrollarea.h \
++ screen-package.h \
+ foo-marshal.h
+
+ gnome_display_properties_LDFLAGS = -export-dynamic
+@@ -432,6 +434,7 @@
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/foo-marshal.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scrollarea.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/screen-package.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xrandr-capplet.Po@am__quote@
+
+ .c.o:
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/display/screen-package.c gnome-control-center-2.24.0.1-package/capplets/display/screen-package.c
+--- gnome-control-center-2.24.0.1/capplets/display/screen-package.c 1970-01-01 01:00:00.000000000 +0100
++++ gnome-control-center-2.24.0.1-package/capplets/display/screen-package.c 2008-09-29 15:08:47.000000000 +0200
+@@ -0,0 +1,217 @@
++/*
++ * screen-package.c
++ *
++ * Copyright (C) 2004 Vincent Untz
++ * Copyright (C) 2008 Alberto Milone
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * 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., 51 Franklin Street, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
++ *
++ * Authors: Carlos Garnacho Parro
++ * Authors: Vincent Untz
++ * Authors: Guillaume Desmottes
++ *
++ */
++
++
++#ifdef HAVE_CONFIG_H
++# include
++#endif
++
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++
++#include "screen-package.h"
++
++static void
++show_error_dialog (GtkWindow *window,
++ const gchar *secondary_text)
++{
++ GtkWidget *dialog;
++
++ dialog = gtk_message_dialog_new (window,
++ GTK_DIALOG_MODAL,
++ GTK_MESSAGE_ERROR,
++ GTK_BUTTONS_CLOSE,
++ _("Could not install package"));
++
++ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), secondary_text);
++ gtk_dialog_run (GTK_DIALOG (dialog));
++ gtk_widget_destroy (dialog);
++}
++
++static gboolean
++find_app (GtkWindow *window,
++ const gchar *app)
++{
++ gchar *path;
++
++ path = g_find_program_in_path (app);
++
++ if (!path)
++ {
++ show_error_dialog (window,
++ _("The necessary applications to install"
++ " the package could not be found."));
++ return FALSE;
++ }
++
++ g_free (path);
++
++ return TRUE;
++}
++
++static gchar *
++create_temp_file (const gchar *packages[])
++{
++ int fd;
++ gchar *path, *str;
++
++ path = g_strdup_printf ("/tmp/packages.XXXXXX");
++ fd = mkstemp (path);
++
++ while (*packages)
++ {
++ str = g_strdup_printf ("%s\ti\n", *packages);
++ write (fd, str, strlen (str));
++ g_free (str);
++ packages++;
++ }
++
++ close (fd);
++ return path;
++}
++
++static gchar*
++get_synaptic_command_line (GtkWindow *window,
++ const gchar *path)
++{
++ gchar *synaptic_path, *command;
++
++ synaptic_path = g_find_program_in_path ("synaptic");
++ command = g_strdup_printf ("%s --hide-main-window --non-interactive "
++ "--set-selections-file %s --parent-window-id %d",
++ synaptic_path, path, GDK_WINDOW_XID (GTK_WIDGET (window)->window));
++ g_free (synaptic_path);
++ return command;
++}
++
++static gboolean
++spawn_synaptic (GtkWindow *window,
++ const gchar *path,
++ gint *child_pid)
++{
++ gchar **argv;
++ GError *error = NULL;
++ gboolean retval = TRUE;
++ gint i = 0;
++
++ argv = g_new0 (gchar*, 6);
++ argv[i++] = g_find_program_in_path ("gksudo");
++ argv[i++] = g_strdup ("--desktop");
++ argv[i++] = g_strdup ("/usr/share/applications/synaptic.desktop");
++ argv[i++] = g_strdup ("--disable-grab");
++ argv[i++] = get_synaptic_command_line (window, path);
++ argv[i++] = NULL;
++
++ if (!gdk_spawn_on_screen (gtk_window_get_screen (window),
++ NULL, argv, NULL,
++ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
++ NULL, NULL, child_pid, &error))
++ {
++ show_error_dialog (window, (error) ? error->message : "");
++ g_error_free (error);
++ retval = FALSE;
++ }
++
++ g_strfreev (argv);
++
++ return retval;
++}
++
++static gboolean
++on_wait_timeout (gpointer data)
++{
++ gint pid, status;
++
++ pid = GPOINTER_TO_INT (data);
++
++ if (waitpid (pid, &status, WNOHANG) > 0)
++ {
++ /* FIXME: should show an error dialog if the installation fails,
++ * but funnily I'm getting always an exit status 0 here... maybe gksudo fault? */
++ gtk_main_quit ();
++ return FALSE;
++ }
++
++ return TRUE;
++}
++
++static gboolean
++wait_for_synaptic (GtkWindow *window, gint pid)
++{
++ GdkCursor *cursor;
++ gint timer;
++
++ cursor = gdk_cursor_new (GDK_WATCH);
++ gdk_window_set_cursor (GTK_WIDGET (window)->window, cursor);
++ gtk_widget_set_sensitive (GTK_WIDGET (window), FALSE);
++
++ /* wait here a bit until the process has exited */
++ timer = g_timeout_add (500, on_wait_timeout, GINT_TO_POINTER (pid));
++ gtk_main ();
++
++ g_source_remove (timer);
++ gtk_widget_set_sensitive (GTK_WIDGET (window), TRUE);
++ gdk_window_set_cursor (GTK_WIDGET (window)->window, NULL);
++
++ gdk_cursor_unref (cursor);
++
++ /* keep this until we can get status
++ * info from the launched process */
++ return TRUE;
++}
++
++gboolean
++ubuntu_packages_install (GtkWindow *window,
++ const gchar *packages[])
++{
++ gchar *path;
++ pid_t pid;
++ gboolean retval = FALSE;
++
++ g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
++
++ if (!find_app (window, "synaptic") || !find_app (window, "gksudo"))
++ return FALSE;
++
++ path = create_temp_file (packages);
++
++ if (spawn_synaptic (window, path, &pid))
++ retval = wait_for_synaptic (window, pid);
++
++ unlink (path);
++ g_free (path);
++
++ return retval;
++}
++
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/display/screen-package.h gnome-control-center-2.24.0.1-package/capplets/display/screen-package.h
+--- gnome-control-center-2.24.0.1/capplets/display/screen-package.h 1970-01-01 01:00:00.000000000 +0100
++++ gnome-control-center-2.24.0.1-package/capplets/display/screen-package.h 2008-09-29 15:21:39.000000000 +0200
+@@ -0,0 +1,39 @@
++/*
++ * screen-package.h
++ *
++ * Copyright (C) 2004 Vincent Untz
++ * Copyright 2008 Alberto Milone
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * 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., 51 Franklin Street, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
++ *
++ * Authors: Carlos Garnacho Parro
++ * Authors: Vincent Untz
++ * Authors: Guillaume Desmottes
++ *
++ */
++
++#ifndef __SCREEN_PACKAGES_H__
++#define __SCREEN_PACKAGES_H__
++
++#include
++
++G_BEGIN_DECLS
++
++gboolean ubuntu_packages_install (GtkWindow *window, const char **packages);
++
++G_END_DECLS
++
++#endif /* __SCREEN_PACKAGES_H__ */
--- gnome-control-center-2.24.0.1.orig/debian/patches/50_ubuntu_systemwide_prefs.patch
+++ gnome-control-center-2.24.0.1/debian/patches/50_ubuntu_systemwide_prefs.patch
@@ -0,0 +1,2448 @@
+=== modified file 'capplets/network/gnome-network-preferences.c'
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0/capplets/network/gnome-network-preferences.c gnome-control-center-2.24.0.new/capplets/network/gnome-network-preferences.c
+--- gnome-control-center-2.24.0/capplets/network/gnome-network-preferences.c 2008-09-24 10:04:57.000000000 +0200
++++ gnome-control-center-2.24.0.new/capplets/network/gnome-network-preferences.c 2008-09-24 10:05:03.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "capplet-util.h"
+ #include "gconf-property-editor.h"
+@@ -173,6 +174,246 @@
+ }
+ }
+
++static gboolean
++dbus_set_proxy_helper(DBusGProxy *dbus_proxy,
++ const char *proxy_type,
++ const char *host,
++ int port)
++{
++ GError *error = NULL;
++ gboolean dbus_ret, res;
++ gchar *proxy_str = NULL;
++
++ fprintf(stderr, "set_proxy_helper: '%s' '%s'\n", proxy_type, host);
++
++ /* FIXME: add proxy auth support when a "secure" store for the proxy
++ password is available */
++ proxy_str = g_strdup_printf("%s://%s:%i/", proxy_type, host, port);
++ g_print("p: %s\n", proxy_str);
++
++ dbus_ret = dbus_g_proxy_call (dbus_proxy, "set_proxy", &error,
++ G_TYPE_STRING, proxy_type,
++ G_TYPE_STRING, proxy_str,
++ G_TYPE_INVALID,
++ G_TYPE_BOOLEAN, &res,
++ G_TYPE_INVALID);
++
++ if(!dbus_ret) {
++ if (error->domain == DBUS_GERROR &&
++ error->code == DBUS_GERROR_REMOTE_EXCEPTION)
++ g_printerr ("Caught remote method exception %s: %s",
++ dbus_g_error_get_name (error),
++ error->message);
++ else
++ g_printerr ("Error: %s\n", error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++ g_print("set_proxy() returned: %i\n", res);
++ return TRUE;
++}
++
++static gboolean
++dbus_reset_proxy_helper(DBusGProxy *dbus_proxy, const char *proxy_type)
++{
++ GError *error = NULL;
++ gboolean dbus_ret, res;
++
++ fprintf(stderr, "reseting proxy %s\n", proxy_type);
++
++ dbus_ret = dbus_g_proxy_call (dbus_proxy, "set_proxy", &error,
++ G_TYPE_STRING, proxy_type,
++ G_TYPE_STRING, "",
++ G_TYPE_INVALID,
++ G_TYPE_BOOLEAN, &res,
++ G_TYPE_INVALID);
++ fprintf(stderr, "reset_proxy() returned: %i\n", res);
++
++ if(!dbus_ret)
++ {
++ if (error->domain == DBUS_GERROR &&
++ error->code == DBUS_GERROR_REMOTE_EXCEPTION)
++ g_printerr ("Caught remote method exception %s: %s",
++ dbus_g_error_get_name (error),
++ error->message);
++ else
++ g_printerr ("Error: %s\n", error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++ return TRUE;
++}
++
++static gboolean
++dbus_set_to_system_gconf_helper(DBusGProxy *dbus_proxy)
++{
++ GConfClient *client;
++ GError *error = NULL;
++ gboolean dbus_ret;
++ gchar* include[] = {"/system/proxy","/system/http_proxy", NULL};
++ gchar* exclude[] = {NULL};
++
++ fprintf(stderr, "set_set_to_system_gconf_helper\n");
++
++ client = gconf_client_get_default ();
++ gconf_client_suggest_sync (client, &error);
++ dbus_ret = dbus_g_proxy_call (dbus_proxy, "SetSystem", &error,
++ G_TYPE_STRV, include,
++ G_TYPE_STRV, exclude,
++ G_TYPE_INVALID,
++ G_TYPE_INVALID);
++
++ if(!dbus_ret) {
++ if (error->domain == DBUS_GERROR &&
++ error->code == DBUS_GERROR_REMOTE_EXCEPTION)
++ g_printerr ("Caught remote method exception %s: %s",
++ dbus_g_error_get_name (error),
++ error->message);
++ else
++ g_printerr ("Error: %s\n", error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++ return TRUE;
++}
++
++static void
++cb_reset_system_default (GtkButton *button, gpointer data)
++{
++ GConfClient *client;
++ GError *error;
++ gboolean res;
++
++ client = gconf_client_get_default ();
++ res = gconf_client_recursive_unset (client, "/system/proxy", 0, &error);
++ if(!res)
++ g_printerr("recursive_unset: %s", dbus_g_error_get_name(error), error->message);
++ res = gconf_client_recursive_unset (client, "/system/http_proxy", 0, &error);
++ if(!res)
++ g_printerr("recursive_unset: %s", dbus_g_error_get_name(error), error->message);
++}
++
++static void
++cb_make_system_default (GtkButton *button, gpointer data)
++{
++ DBusGConnection *systembus, *sessionbus;
++ GError *error = NULL;
++ DBusGProxy *dbus_proxy;
++ GConfClient *client;
++ gchar *http_proxy, *proxy_str, *ftp_proxy, *https_proxy;
++ gint http_port, ftp_port, https_port;
++ gboolean use_proxy;
++ gboolean res;
++
++ GladeXML *dialog = (GladeXML *) data;
++ g_print ("cb_make_system_default\n");
++
++ // do ride the dbus
++ sessionbus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
++ if (sessionbus == NULL) {
++ g_printerr ("Failed to open connection to bus: %s\n",
++ error->message);
++ g_error_free (error);
++ return;
++ }
++
++ dbus_proxy = dbus_g_proxy_new_for_name (sessionbus,
++ "org.freedesktop.PolicyKit.AuthenticationAgent",
++ "/",
++ "org.freedesktop.PolicyKit.AuthenticationAgent");
++ if (dbus_proxy == NULL) {
++ g_printerr ("Failed to get proxy: %s\n",
++ error->message);
++ g_error_free (error);
++ return;
++ }
++
++ if (!dbus_g_proxy_call (dbus_proxy, "ObtainAuthorization", &error,
++ G_TYPE_STRING, "org.gnome.gconf.defaults.set-system",
++ G_TYPE_UINT, 0,
++ G_TYPE_UINT, getpid(),
++ G_TYPE_INVALID,
++ G_TYPE_BOOLEAN, &res, G_TYPE_INVALID))
++ {
++ if (error->domain == DBUS_GERROR &&
++ error->code == DBUS_GERROR_REMOTE_EXCEPTION)
++ g_printerr ("Caught remote method exception %s: %s",
++ dbus_g_error_get_name (error),
++ error->message);
++ else
++ g_printerr ("Error: %s\n", error->message);
++ g_error_free (error);
++ return;
++ }
++ g_object_unref(dbus_proxy);
++ g_print("ObtainAuth returned: %i\n", res);
++ // so we get a "0" here too if the auth is not required ?!?
++ // if(!res)
++ // return;
++
++ // if we make it to this point, we have authorization to set the proxy
++ systembus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
++ dbus_proxy = dbus_g_proxy_new_for_name (systembus,
++ "com.ubuntu.SystemService",
++ "/",
++ "com.ubuntu.SystemService");
++ if (dbus_proxy == NULL) {
++ g_printerr ("Failed to get proxy: %s\n",
++ error->message);
++ g_error_free (error);
++ return;
++ }
++ client = gconf_client_get_default ();
++ use_proxy = gconf_client_get_bool (client, USE_PROXY_KEY, NULL);
++
++ if (use_proxy) {
++ // read the proxy settings
++ http_proxy = gconf_client_get_string (client, HTTP_PROXY_HOST_KEY, NULL);
++ http_port = gconf_client_get_int (client, HTTP_PROXY_PORT_KEY, NULL);
++ if(http_proxy == NULL || strlen(http_proxy) == 0)
++ dbus_reset_proxy_helper(dbus_proxy, "http");
++ else
++ dbus_set_proxy_helper(dbus_proxy, "http", http_proxy, http_port);
++
++ ftp_proxy = gconf_client_get_string (client, FTP_PROXY_HOST_KEY, NULL);
++ ftp_port = gconf_client_get_int (client, FTP_PROXY_PORT_KEY, NULL);
++ if(ftp_proxy == NULL || strlen(ftp_proxy) == 0)
++ dbus_reset_proxy_helper(dbus_proxy, "ftp");
++ else
++ dbus_set_proxy_helper(dbus_proxy, "ftp", ftp_proxy, ftp_port);
++
++ https_proxy = gconf_client_get_string (client, SECURE_PROXY_HOST_KEY, NULL);
++ https_port = gconf_client_get_int (client, SECURE_PROXY_PORT_KEY, NULL);
++ if(https_proxy == NULL || strlen(https_proxy) == 0)
++ dbus_reset_proxy_helper(dbus_proxy, "https");
++ else
++ dbus_set_proxy_helper(dbus_proxy, "https", https_proxy, https_port);
++ g_object_unref(dbus_proxy);
++ } else {
++ // we don't use a proxy
++ dbus_reset_proxy_helper(dbus_proxy, "http");
++ dbus_reset_proxy_helper(dbus_proxy, "ftp");
++ dbus_reset_proxy_helper(dbus_proxy, "https");
++ }
++
++
++ // set it to gconf as well
++ dbus_proxy = dbus_g_proxy_new_for_name (systembus,
++ "org.gnome.GConf.Defaults",
++ "/",
++ "org.gnome.GConf.Defaults");
++ if (dbus_proxy == NULL) {
++ g_printerr ("Failed to get proxy: %s\n",
++ error->message);
++ g_error_free (error);
++ return;
++ }
++ dbus_set_to_system_gconf_helper(dbus_proxy);
++
++ g_object_unref(dbus_proxy);
++}
++
++
+ static void
+ cb_dialog_response (GtkDialog *dialog, gint response_id)
+ {
+@@ -441,7 +682,6 @@
+
+ mode_type = g_enum_register_static ("NetworkPreferencesProxyType",
+ proxytype_values);
+-
+ /* There's a bug in peditors that cause them to not initialize the entry
+ * correctly. */
+ client = gconf_client_get_default ();
+@@ -515,7 +755,7 @@
+ peditor = GCONF_PROPERTY_EDITOR (gconf_peditor_new_integer (
+ NULL, SOCKS_PROXY_PORT_KEY, WID ("socks_port_spinbutton"),
+ NULL));
+-
++
+ /* Set the proxy entries insensitive if we are using the same proxy for all */
+ if (gconf_client_get_bool (client, USE_SAME_PROXY_KEY, NULL))
+ {
+@@ -550,6 +790,12 @@
+ G_CALLBACK (cb_add_url), dialog);
+ g_signal_connect (WID ("button_remove_url"), "clicked",
+ G_CALLBACK (cb_remove_url), dialog);
++
++ /* System-wide default */
++ g_signal_connect(WID("button_make_system_default"), "clicked",
++ G_CALLBACK(cb_make_system_default), dialog);
++ g_signal_connect(WID("button_reset_to_defaults"), "clicked",
++ G_CALLBACK(cb_reset_system_default), dialog);
+ }
+
+ int
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0/capplets/network/gnome-network-preferences.glade gnome-control-center-2.24.0.new/capplets/network/gnome-network-preferences.glade
+--- gnome-control-center-2.24.0/capplets/network/gnome-network-preferences.glade 2008-09-24 10:04:57.000000000 +0200
++++ gnome-control-center-2.24.0.new/capplets/network/gnome-network-preferences.glade 2008-09-24 10:14:43.000000000 +0200
+@@ -1,1313 +1,844 @@
+-
+-
+-
++
++
++
+
+-
+-
+-
+- 5
+- Network Proxy Preferences
+- GTK_WINDOW_TOPLEVEL
+- GTK_WIN_POS_NONE
+- False
+- False
+- False
+- True
+- False
+- False
+- GDK_WINDOW_TYPE_HINT_DIALOG
+- GDK_GRAVITY_NORTH_WEST
+- True
+- False
+- False
+-
+-
+-
+- True
+- False
+- 2
+-
+-
+-
+- True
+- GTK_BUTTONBOX_END
+-
+-
+-
+- True
+- True
+- True
+- gtk-help
+- True
+- GTK_RELIEF_NORMAL
+- True
+- -11
+-
+-
+-
+-
+-
+- True
+- True
+- True
+- gtk-close
+- True
+- GTK_RELIEF_NORMAL
+- True
+- -7
+-
+-
+-
+-
+- 0
+- False
+- True
+- GTK_PACK_END
+-
+-
+-
+-
+-
+- 5
+- True
+- True
+- True
+- True
+- GTK_POS_TOP
+- False
+- False
+-
+-
+-
+- 12
+- True
+- False
+- 18
+-
+-
+-
+- True
+- True
+- <b>Di_rect internet connection</b>
+- True
+- GTK_RELIEF_NORMAL
+- True
+- False
+- False
+- True
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+-
+- True
+- False
+- 18
+-
+-
+-
+- True
+- False
+- 6
+-
+-
+-
+- True
+- True
+- <b>_Manual proxy configuration</b>
+- True
+- GTK_RELIEF_NORMAL
+- True
+- False
+- False
+- True
+- none_radiobutton
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+-
+- True
+- False
+- True
+- _Use the same proxy for all protocols
+- True
+- GTK_RELIEF_NORMAL
+- True
+- False
+- False
+- True
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+-
+- True
+- False
+- False
+- 0
+-
+-
+-
+- True
+-
+- False
+- False
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0.5
+- 0.5
+- 0
+- 0
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+-
+- True
+- 4
+- 5
+- False
+- 6
+- 12
+-
+-
+-
+- True
+- H_TTP proxy:
+- True
+- False
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0
+- 0.5
+- 0
+- 0
+- http_host_entry
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+- 0
+- 1
+- 0
+- 1
+- fill
+-
+-
+-
+-
+-
+-
+- True
+- _Secure HTTP proxy:
+- True
+- False
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0
+- 0.5
+- 0
+- 0
+- secure_host_entry
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+- 0
+- 1
+- 1
+- 2
+- fill
+-
+-
+-
+-
+-
+-
+- True
+- _FTP proxy:
+- True
+- False
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0
+- 0.5
+- 0
+- 0
+- ftp_host_entry
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+- 0
+- 1
+- 2
+- 3
+- fill
+-
+-
+-
+-
+-
+-
+- True
+- S_ocks host:
+- True
+- False
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0
+- 0.5
+- 0
+- 0
+- socks_host_entry
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+- 0
+- 1
+- 3
+- 4
+- fill
+-
+-
+-
+-
+-
+-
+- True
+- True
+- True
+- True
+- 0
+-
+- True
+- False
+-
+-
+- 1
+- 2
+- 0
+- 1
+-
+-
+-
+-
+-
+-
+- True
+- True
+- True
+- True
+- 0
+-
+- True
+- False
+-
+-
+- 1
+- 2
+- 1
+- 2
+-
+-
+-
+-
+-
+-
+- True
+- True
+- True
+- True
+- 0
+-
+- True
+- False
+-
+-
+- 1
+- 2
+- 2
+- 3
+-
+-
+-
+-
+-
+-
+- True
+- True
+- True
+- True
+- 0
+-
+- True
+- False
+-
+-
+- 1
+- 2
+- 3
+- 4
+-
+-
+-
+-
+-
+-
+- True
+- Port:
+- False
+- False
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0
+- 0.5
+- 0
+- 0
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+-
+-
+-
+- 2
+- 3
+- 0
+- 1
+- fill
+-
+-
+-
+-
+-
+-
+- True
+- Port:
+- False
+- False
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0
+- 0.5
+- 0
+- 0
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+-
+-
+-
+- 2
+- 3
+- 1
+- 2
+- fill
+-
+-
+-
+-
+-
+-
+- True
+- Port:
+- False
+- False
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0
+- 0.5
+- 0
+- 0
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+-
+-
+-
+- 2
+- 3
+- 2
+- 3
+- fill
+-
+-
+-
+-
+-
+-
+- True
+- Port:
+- False
+- False
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0
+- 0.5
+- 0
+- 0
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+-
+-
+-
+- 2
+- 3
+- 3
+- 4
+- fill
+-
+-
+-
+-
+-
+-
+- True
+- True
+- 1
+- 0
+- False
+- GTK_UPDATE_ALWAYS
+- False
+- False
+- 0 0 65535 1 10 0
+-
+-
+-
+-
+-
+- 3
+- 4
+- 0
+- 1
+-
+-
+-
+-
+-
+-
+- True
+- True
+- 1
+- 0
+- False
+- GTK_UPDATE_ALWAYS
+- False
+- False
+- 0 0 65535 1 10 0
+-
+-
+-
+-
+-
+- 3
+- 4
+- 1
+- 2
+-
+-
+-
+-
+-
+-
+- True
+- True
+- 1
+- 0
+- False
+- GTK_UPDATE_ALWAYS
+- False
+- False
+- 0 0 65535 1 10 0
+-
+-
+-
+-
+-
+- 3
+- 4
+- 2
+- 3
+-
+-
+-
+-
+-
+-
+- True
+- True
+- 1
+- 0
+- False
+- GTK_UPDATE_ALWAYS
+- False
+- False
+- 0 0 65535 1 10 0
+-
+-
+-
+-
+-
+- 3
+- 4
+- 3
+- 4
+-
+-
+-
+-
+-
+-
+- True
+- True
+- _Details
+- True
+- GTK_RELIEF_NORMAL
+- True
+-
+-
+- 4
+- 5
+- 0
+- 1
+- fill
+-
+-
+-
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+-
+- True
+- False
+- 6
+-
+-
+-
+- True
+- True
+- <b>_Automatic proxy configuration</b>
+- True
+- GTK_RELIEF_NORMAL
+- True
+- False
+- False
+- True
+- none_radiobutton
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+-
+- True
+- False
+- 0
+-
+-
+-
+- True
+-
+- False
+- False
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0.5
+- 0.5
+- 0
+- 0
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+-
+- True
+- False
+- False
+- 12
+-
+-
+-
+- True
+- Autoconfiguration _URL:
+- True
+- False
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0.5
+- 0.5
+- 0
+- 0
+- autoconfig_entry
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+-
+- True
+- True
+- True
+- True
+- 0
+-
+- True
+- False
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+- False
+- True
+-
+-
+-
+-
+-
+- True
+- Proxy Configuration
+- False
+- False
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0.5
+- 0.5
+- 0
+- 0
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+- tab
+-
+-
+-
+-
+-
+- 12
+- True
+- False
+- 6
+-
+-
+-
+- True
+- <b>Ignore Host List</b>
+- False
+- False
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0
+- 0.5
+- 0
+- 0
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+-
+- True
+- False
+- 0
+-
+-
+-
+- True
+-
+- False
+- False
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0.5
+- 0.5
+- 0
+- 0
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+-
+- True
+- 2
+- 2
+- False
+- 6
+- 12
+-
+-
+-
+- True
+- True
+- True
+- True
+- 0
+-
+- True
+- False
+-
+-
+- 0
+- 1
+- 0
+- 1
+-
+-
+-
+-
+-
+-
+- True
+- True
+- gtk-add
+- True
+- GTK_RELIEF_NORMAL
+- True
+-
+-
+- 1
+- 2
+- 0
+- 1
+- fill
+-
+-
+-
+-
+-
+-
+- True
+- True
+- GTK_POLICY_AUTOMATIC
+- GTK_POLICY_AUTOMATIC
+- GTK_SHADOW_IN
+- GTK_CORNER_TOP_LEFT
+-
+-
+-
+- True
+- True
+- False
+- False
+- False
+- True
+- False
+- False
+- False
+-
+-
+-
+-
+- 0
+- 1
+- 1
+- 2
+- fill
+-
+-
+-
+-
+-
+- True
+- 0
+- 0
+- 1
+- 0
+- 0
+- 0
+- 0
+- 0
+-
+-
+-
+- True
+- False
+- 0
+-
+-
+-
+- True
+- True
+- gtk-remove
+- True
+- GTK_RELIEF_NORMAL
+- True
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+-
+-
+- 1
+- 2
+- 1
+- 2
+- fill
+- fill
+-
+-
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+- False
+- True
+-
+-
+-
+-
+-
+- True
+- Ignored Hosts
+- False
+- False
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0.5
+- 0.5
+- 0
+- 0
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+- tab
+-
+-
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+-
+-
+-
+- 5
+- HTTP Proxy Details
+- GTK_WINDOW_TOPLEVEL
+- GTK_WIN_POS_NONE
+- False
+- False
+- False
+- True
+- False
+- False
+- GDK_WINDOW_TYPE_HINT_DIALOG
+- GDK_GRAVITY_NORTH_WEST
+- True
+- False
+- False
+-
+-
+-
+- True
+- False
+- 2
+-
+-
+-
+- True
+- GTK_BUTTONBOX_END
+-
+-
+-
+- True
+- True
+- True
+- gtk-help
+- True
+- GTK_RELIEF_NORMAL
+- True
+- -11
+-
+-
+-
+-
+-
+- True
+- True
+- True
+- gtk-close
+- True
+- GTK_RELIEF_NORMAL
+- True
+- -7
+-
+-
+-
+-
+- 0
+- False
+- True
+- GTK_PACK_END
+-
+-
+-
+-
+-
+- 5
+- True
+- False
+- 6
+-
+-
+-
+- True
+- True
+- <b>_Use authentication</b>
+- True
+- GTK_RELIEF_NORMAL
+- True
+- False
+- False
+- True
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+-
+- True
+- False
+- 0
+-
+-
+-
+- True
+-
+- False
+- False
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0.5
+- 0.5
+- 0
+- 0
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+-
+- True
+- False
+- 2
+- 2
+- False
+- 6
+- 12
+-
+-
+-
+- True
+- U_sername:
+- True
+- False
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0
+- 0.5
+- 0
+- 0
+- username_entry
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+- 0
+- 1
+- 0
+- 1
+- fill
+-
+-
+-
+-
+-
+-
+- True
+- _Password:
+- True
+- False
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0
+- 0.5
+- 0
+- 0
+- password_entry
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+- 0
+- 1
+- 1
+- 2
+- fill
+-
+-
+-
+-
+-
+-
+- True
+- True
+- True
+- False
+- 0
+-
+- True
+- False
+-
+-
+- 1
+- 2
+- 1
+- 2
+-
+-
+-
+-
+-
+-
+- True
+- True
+- True
+- True
+- 0
+-
+- True
+- False
+-
+-
+- 1
+- 2
+- 0
+- 1
+-
+-
+-
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+-
+-
++
++ 5
++ Network Proxy Preferences
++ False
++ GDK_WINDOW_TYPE_HINT_DIALOG
++ False
++
++
++ True
++ 2
++
++
++ True
++ True
++ 5
++
++
++ True
++ 12
++ 18
++
++
++ True
++ True
++ <b>Di_rect internet connection</b>
++ True
++ 0
++ True
++
++
++ False
++ False
++
++
++
++
++ True
++ 18
++
++
++ True
++ 6
++
++
++ True
++ True
++ <b>_Manual proxy configuration</b>
++ True
++ 0
++ True
++ none_radiobutton
++
++
++ False
++ False
++
++
++
++
++ True
++ False
++ True
++ _Use the same proxy for all protocols
++ True
++ 0
++ True
++
++
++ False
++ False
++ 1
++
++
++
++
++ True
++ False
++
++
++ True
++
++
++
++ False
++ False
++
++
++
++
++ True
++ 4
++ 5
++ 12
++ 6
++
++
++
++
++
++
++
++
++
++
++
++ True
++ 0
++ H_TTP proxy:
++ True
++ http_host_entry
++
++
++ GTK_FILL
++
++
++
++
++
++ True
++ 0
++ _Secure HTTP proxy:
++ True
++ secure_host_entry
++
++
++ 1
++ 2
++ GTK_FILL
++
++
++
++
++
++ True
++ 0
++ _FTP proxy:
++ True
++ ftp_host_entry
++
++
++ 2
++ 3
++ GTK_FILL
++
++
++
++
++
++ True
++ 0
++ S_ocks host:
++ True
++ socks_host_entry
++
++
++ 3
++ 4
++ GTK_FILL
++
++
++
++
++
++ True
++ True
++
++
++ 1
++ 2
++
++
++
++
++
++ True
++ True
++
++
++ 1
++ 2
++ 1
++ 2
++
++
++
++
++
++ True
++ True
++
++
++ 1
++ 2
++ 2
++ 3
++
++
++
++
++
++ True
++ True
++
++
++ 1
++ 2
++ 3
++ 4
++
++
++
++
++
++ True
++ 0
++ Port:
++
++
++
++
++
++ 2
++ 3
++ GTK_FILL
++
++
++
++
++
++ True
++ 0
++ Port:
++
++
++
++
++
++ 2
++ 3
++ 1
++ 2
++ GTK_FILL
++
++
++
++
++
++ True
++ 0
++ Port:
++
++
++
++
++
++ 2
++ 3
++ 2
++ 3
++ GTK_FILL
++
++
++
++
++
++ True
++ 0
++ Port:
++
++
++
++
++
++ 2
++ 3
++ 3
++ 4
++ GTK_FILL
++
++
++
++
++
++ True
++ True
++ 0 0 65535 1 10 0
++ 1
++
++
++
++
++
++ 3
++ 4
++
++
++
++
++
++ True
++ True
++ 0 0 65535 1 10 0
++ 1
++
++
++
++
++
++ 3
++ 4
++ 1
++ 2
++
++
++
++
++
++ True
++ True
++ 0 0 65535 1 10 0
++ 1
++
++
++
++
++
++ 3
++ 4
++ 2
++ 3
++
++
++
++
++
++ True
++ True
++ 0 0 65535 1 10 0
++ 1
++
++
++
++
++
++ 3
++ 4
++ 3
++ 4
++
++
++
++
++
++ True
++ True
++ _Authentication
++ True
++ 0
++
++
++ 4
++ 5
++ GTK_FILL
++
++
++
++
++
++ 1
++
++
++
++
++ 2
++
++
++
++
++
++
++ True
++ 6
++
++
++ True
++ True
++ <b>_Automatic proxy configuration</b>
++ True
++ 0
++ True
++ none_radiobutton
++
++
++ False
++ False
++
++
++
++
++ True
++
++
++ True
++
++
++
++ False
++ False
++
++
++
++
++ True
++ False
++ 12
++
++
++ True
++ Autoconfiguration _URL:
++ True
++ autoconfig_entry
++
++
++ False
++ False
++
++
++
++
++ True
++ True
++
++
++ 1
++
++
++
++
++ 1
++
++
++
++
++ 1
++
++
++
++
++ False
++ False
++ 1
++
++
++
++
++ 1
++
++
++
++
++ True
++ 6
++ GTK_BUTTONBOX_START
++
++
++ True
++ True
++ True
++ Appy System-Wide...
++ 0
++
++
++ False
++ False
++
++
++
++
++ True
++ True
++ True
++ Reset
++ 0
++
++
++ False
++ False
++ 1
++
++
++
++
++ 2
++
++
++
++
++
++
++ True
++ Proxy Configuration
++
++
++ tab
++ False
++
++
++
++
++ True
++ 12
++ 6
++
++
++ True
++ 0
++ <b>Ignore Host List</b>
++
++
++ False
++ False
++
++
++
++
++ True
++
++
++ True
++
++
++
++ False
++ False
++
++
++
++
++ True
++ 2
++ 2
++ 12
++ 6
++
++
++ True
++ True
++
++
++
++
++
++
++
++ True
++ True
++ gtk-add
++ True
++ 0
++
++
++ 1
++ 2
++ GTK_FILL
++
++
++
++
++
++ True
++ True
++ GTK_POLICY_AUTOMATIC
++ GTK_POLICY_AUTOMATIC
++ GTK_SHADOW_IN
++
++
++ True
++ True
++ False
++
++
++
++
++ 1
++ 2
++ GTK_FILL
++
++
++
++
++ True
++ 0
++ 0
++ 0
++
++
++ True
++
++
++ True
++ True
++ gtk-remove
++ True
++ 0
++
++
++
++
++
++
++ 1
++ 2
++ 1
++ 2
++ GTK_FILL
++ GTK_FILL
++
++
++
++
++ 1
++
++
++
++
++ 1
++
++
++
++
++ 1
++
++
++
++
++ True
++ Ignored Hosts
++
++
++ tab
++ 1
++ False
++
++
++
++
++ 1
++
++
++
++
++ True
++ GTK_BUTTONBOX_END
++
++
++ True
++ True
++ True
++ gtk-help
++ True
++ -11
++
++
++
++
++ True
++ True
++ True
++ gtk-close
++ True
++ -7
++
++
++ 1
++
++
++
++
++ False
++ GTK_PACK_END
++
++
++
++
++
++
++ 5
++ HTTP Proxy Details
++ False
++ GDK_WINDOW_TYPE_HINT_DIALOG
++ False
++
++
++ True
++ 2
++
++
++ True
++ 5
++ 6
++
++
++ True
++ True
++ <b>_Use authentication</b>
++ True
++ 0
++ True
++
++
++ False
++ False
++
++
++
++
++ True
++
++
++ True
++
++
++
++ False
++ False
++
++
++
++
++ True
++ False
++ 2
++ 2
++ 12
++ 6
++
++
++ True
++ 0
++ U_sername:
++ True
++ username_entry
++
++
++ GTK_FILL
++
++
++
++
++
++ True
++ 0
++ _Password:
++ True
++ password_entry
++
++
++ 1
++ 2
++ GTK_FILL
++
++
++
++
++
++ True
++ True
++ False
++
++
++ 1
++ 2
++ 1
++ 2
++
++
++
++
++
++ True
++ True
++
++
++ 1
++ 2
++
++
++
++
++
++ 1
++
++
++
++
++ 1
++
++
++
++
++ 1
++
++
++
++
++ True
++ GTK_BUTTONBOX_END
++
++
++ True
++ True
++ True
++ gtk-help
++ True
++ -11
++
++
++
++
++ True
++ True
++ True
++ gtk-close
++ True
++ -7
++
++
++ 1
++
++
++
++
++ False
++ GTK_PACK_END
++
++
++
++
++
+
--- gnome-control-center-2.24.0.1.orig/debian/patches/97_subpixel_hinting_defaults.patch
+++ gnome-control-center-2.24.0.1/debian/patches/97_subpixel_hinting_defaults.patch
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.22.1/capplets/appearance/appearance-font.c gnome-control-center-2.22.1.new/capplets/appearance/appearance-font.c
+--- gnome-control-center-2.22.1/capplets/appearance/appearance-font.c 2008-03-27 13:12:29.000000000 +0000
++++ gnome-control-center-2.22.1.new/capplets/appearance/appearance-font.c 2008-06-04 16:53:06.000000000 +0100
+@@ -956,7 +956,7 @@
+ ANTIALIAS_GRAYSCALE, HINT_FULL);
+ setup_font_pair (glade_xml_get_widget (data->xml, "subpixel_radio"),
+ glade_xml_get_widget (data->xml, "subpixel_sample"),
+- ANTIALIAS_RGBA, HINT_FULL);
++ ANTIALIAS_RGBA, HINT_SLIGHT);
+
+ font_render_load (data->client);
+
--- gnome-control-center-2.24.0.1.orig/debian/patches/25_window_manager_settings.patch
+++ gnome-control-center-2.24.0.1/debian/patches/25_window_manager_settings.patch
@@ -0,0 +1,45 @@
+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 @@
+
+ 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/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
+@@ -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"\" \
--- gnome-control-center-2.24.0.1.orig/debian/patches/107_rr_NULL_output_name.patch
+++ gnome-control-center-2.24.0.1/debian/patches/107_rr_NULL_output_name.patch
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.23.90/capplets/display/xrandr-capplet.c gnome-control-center-2.23.90.new/capplets/display/xrandr-capplet.c
+--- gnome-control-center-2.23.90/capplets/display/xrandr-capplet.c 2008-09-13 00:01:32.000000000 +0100
++++ gnome-control-center-2.23.90.new/capplets/display/xrandr-capplet.c 2008-09-13 00:05:08.000000000 +0100
+@@ -168,7 +168,7 @@
+ char *cur_name =
+ app->current_output? app->current_output->name : NULL;
+
+- if ((cur_name && strcmp (output->name, cur_name) == 0) || !best)
++ if ((cur_name && output->name && strcmp (output->name, cur_name) == 0) || !best)
+ best = output;
+ }
+ }
--- gnome-control-center-2.24.0.1.orig/debian/patches/100_at_properties_readd_gksudo_disable_grab_toggle.patch
+++ gnome-control-center-2.24.0.1/debian/patches/100_at_properties_readd_gksudo_disable_grab_toggle.patch
@@ -0,0 +1,752 @@
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.23.3/capplets/accessibility/at-properties/at-enable-dialog.glade gnome-control-center-2.23.3.new/capplets/accessibility/at-properties/at-enable-dialog.glade
+--- gnome-control-center-2.23.3/capplets/accessibility/at-properties/at-enable-dialog.glade 2008-06-09 18:17:32.000000000 +0200
++++ gnome-control-center-2.23.3.new/capplets/accessibility/at-properties/at-enable-dialog.glade 2008-06-09 18:18:04.000000000 +0200
+@@ -1,313 +1,184 @@
+-
+-
+-
++
++
++
+
+-
+- 5
+- Assistive Technologies Preferences
+- GTK_WINDOW_TOPLEVEL
+- GTK_WIN_POS_NONE
+- False
+- False
+- False
+- True
+- False
+- False
+- GDK_WINDOW_TYPE_HINT_DIALOG
+- GDK_GRAVITY_NORTH_WEST
+- True
+- False
+- False
+-
+-
+-
+- True
+- False
+- 2
+-
+-
+-
+- True
+- GTK_BUTTONBOX_END
+-
+-
+-
+- True
+- True
+- True
+- gtk-help
+- True
+- GTK_RELIEF_NORMAL
+- True
+- -11
+-
+-
+-
+-
+-
+- True
+- False
+- True
+- True
+- GTK_RELIEF_NORMAL
+- True
+- 0
+- Close and _Log Out
+- True
+-
+-
+-
+-
+-
+- True
+- True
+- True
+- True
+- gtk-close
+- True
+- GTK_RELIEF_NORMAL
+- True
+- -7
+-
+-
+-
+-
+- 0
+- False
+- True
+- GTK_PACK_END
+-
+-
+-
+-
+-
+- 5
+- True
+- False
+- 18
+-
+-
+-
+- True
+- False
+- 0
+-
+-
+-
+- True
+- False
+- 6
+-
+-
+-
+- True
+- <b>Assistive Technologies</b>
+- False
+- True
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0
+- 0.5
+- 0
+- 0
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+-
+- True
+- False
+- 12
+-
+-
+-
+- True
+- 0.5
+- 0
+- 0
+- 0
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+-
+- True
+- False
+- 6
+-
+-
+-
+- True
+- True
+- GTK_RELIEF_NORMAL
+- True
+- _Preferred Applications
+- True
+-
+- Jump to Preferred Applications dialog
+-
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+-
+- True
+- True
+- _Enable assistive technologies
+- True
+- GTK_RELIEF_NORMAL
+- True
+- False
+- False
+- True
+-
+- Changes to enable assistive technologies will not take effect until your next log in.
+-
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+-
+- True
+- False
+- 0
+-
+-
+-
+- True
+- False
+- 6
+-
+-
+-
+- True
+- <b>Preferences</b>
+- False
+- True
+- GTK_JUSTIFY_LEFT
+- False
+- False
+- 0
+- 0.5
+- 0
+- 0
+- PANGO_ELLIPSIZE_NONE
+- -1
+- False
+- 0
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+-
+- True
+- False
+- 12
+-
+-
+-
+- True
+- 0.5
+- 0
+- 0
+- 0
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+-
+- True
+- False
+- 6
+-
+-
+-
+- True
+- False
+- 0
+-
+-
+-
+- True
+- True
+- GTK_RELIEF_NORMAL
+- True
+- _Keyboard Accessibility
+- True
+-
+- Jump to the Keyboard Accessibility dialog
+-
+-
+-
+- 5
+- False
+- False
+-
+-
+-
++
++ 5
++ Assistive Technologies Preferences
++ False
++ GDK_WINDOW_TYPE_HINT_DIALOG
++ False
++
++
++ True
++ 2
++
++
++ True
++ 5
++ 18
++
++
++ True
++
++
++ True
++ 6
++
++
++ True
++ 0
++ <b>Assistive Technologies</b>
++ True
++
++
++ False
++ False
++
++
++
++
++ True
++ 12
++
++
++ True
++ 0
++ gtk-missing-image
++
++
++ False
++ False
++
++
++
++
++ True
++ 6
++
++
++ True
++ True
++ _Preferred Applications
++ True
++ 0
++
++ Jump to Preferred Applications dialog
++
++
++
++ False
++ False
++
++
++
++
++ True
++ True
++ _Enable assistive technologies
++ True
++ 0
++ True
++
++ Changes to enable assistive technologies will not take effect ntil your next log in.
++
++
++
++ False
++ False
++ 1
++
++
++
++
++ True
++ True
++ _Password dialogs as normal windows
++ True
++ 0
++ True
++
++ Changes to enable assistive technologies will not take effect ntil your next log in.
++
++
++
++ False
++ False
++ 2
++
++
++
++
++ 1
++
++
++
++
++ 1
++
++
++
++
++
++
++
++
++ True
++
++
++ True
++ 6
++
++
++ True
++ 0
++ <b>Preferences</b>
++ True
++
++
++ False
++ False
++
++
++
++
++ True
++ 12
++
++
++ True
++ 0
++ gtk-missing-image
++
++
++ False
++ False
++
++
++
++
++ True
++ 6
++
++
++ True
++
++
++ True
++ True
++ _Keyboard Accessibility
++ True
++ 0
++
++ Jump to the Keyboard Accessibility dialog
++
++
++
++ False
++ False
++ 5
++
++
+
+
+ True
+@@ -326,69 +197,106 @@
+ False
+
+
+-
+-
+-
+- True
+- True
+- GTK_RELIEF_NORMAL
+- True
+- Accessible Lo_gin
+- True
+-
+- Jump to the Accessible Login dialog
+-
+-
+-
+- 5
+- False
+- False
+-
+-
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+- 0
+- True
+- True
+-
+-
+-
+-
+- 0
+- False
+- False
+-
+-
+-
+-
+-
+-
++
++
++ True
++ True
++ Accessible Lo_gin
++ True
++ 0
++
++ Jump to the Accessible Login dialog
++
++
++
++ False
++ False
++ 1
++
++
++
++
++ False
++ False
++
++
++
++
++ 1
++
++
++
++
++ 1
++
++
++
++
++ False
++ False
++
++
++
++
++ 1
++
++
++
++
++ False
++ False
++ 1
++
++
++
++
++ True
++ GTK_BUTTONBOX_END
++
++
++ True
++ True
++ True
++ gtk-help
++ True
++ -11
++
++
++
++
++ True
++ False
++ True
++ True
++ Close and _Log Out
++ True
++ 0
++
++
++ 1
++
++
++
++
++ True
++ True
++ True
++ True
++ gtk-close
++ True
++ -7
++
++
++ 2
++
++
++
++
++ False
++ GTK_PACK_END
++
++
++
++
++
+
+diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.23.3/capplets/accessibility/at-properties/main.c gnome-control-center-2.23.3.new/capplets/accessibility/at-properties/main.c
+--- gnome-control-center-2.23.3/capplets/accessibility/at-properties/main.c 2008-06-09 18:17:32.000000000 +0200
++++ gnome-control-center-2.23.3.new/capplets/accessibility/at-properties/main.c 2008-06-09 18:17:38.000000000 +0200
+@@ -9,6 +9,9 @@
+
+ #define ACCESSIBILITY_KEY "/desktop/gnome/interface/accessibility"
+ #define ACCESSIBILITY_KEY_DIR "/desktop/gnome/interface"
++#define GKSU_NO_GRAB_KEY "/apps/gksu/disable-grab"
++#define GKSU_NO_GRAB_KEY_DIR "/apps/gksu"
++
+
+ static gboolean initial_state;
+
+@@ -143,6 +146,42 @@
+ }
+
+ static void
++at_gksudo_update (GConfClient *client,
++ GladeXML *dialog)
++{
++ gboolean is_enabled = gconf_client_get_bool (client, GKSU_NO_GRAB_KEY, NULL);
++
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("at_gksudo_toggle")),
++ is_enabled);
++
++}
++
++
++static void
++at_gksudo_changed (GConfClient *client,
++ guint cnxn_id,
++ GConfEntry *entry,
++ gpointer user_data)
++{
++ at_gksudo_update (client, user_data);
++}
++
++
++static void
++at_gksudo_toggled (GtkToggleButton *toggle_button,
++ GladeXML *dialog)
++{
++ GConfClient *client = gconf_client_get_default ();
++ gboolean is_enabled = gtk_toggle_button_get_active (toggle_button);
++
++ gconf_client_set_bool (client, GKSU_NO_GRAB_KEY,
++ is_enabled,
++ NULL);
++ g_object_unref (client);
++}
++
++
++static void
+ setup_dialog (GladeXML *dialog)
+ {
+ GConfClient *client;
+@@ -150,6 +189,26 @@
+ GObject *peditor;
+
+ client = gconf_client_get_default ();
++
++ //Password grab toggle
++ gconf_client_add_dir (client, GKSU_NO_GRAB_KEY_DIR,
++ GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
++
++ widget = WID ("at_gksudo_toggle");
++
++ g_signal_connect (widget, "toggled",
++ G_CALLBACK (at_gksudo_toggled),
++ dialog);
++
++ peditor = gconf_peditor_new_boolean (NULL, GKSU_NO_GRAB_KEY,
++ widget,
++ NULL);
++
++ at_gksudo_update (client, dialog);
++
++ gconf_client_notify_add (client, GKSU_NO_GRAB_KEY_DIR,
++ at_gksudo_changed,
++ dialog, NULL, NULL);
+
+ gconf_client_add_dir (client, ACCESSIBILITY_KEY_DIR,
+ GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
--- gnome-control-center-2.24.0.1.orig/debian/visual-effects_extra.svg
+++ gnome-control-center-2.24.0.1/debian/visual-effects_extra.svg
@@ -0,0 +1,1137 @@
+
+
+
--- gnome-control-center-2.24.0.1.orig/debian/compat
+++ gnome-control-center-2.24.0.1/debian/compat
@@ -0,0 +1 @@
+5
--- gnome-control-center-2.24.0.1.orig/debian/control.in
+++ gnome-control-center-2.24.0.1/debian/control.in
@@ -0,0 +1,140 @@
+Source: gnome-control-center
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Desktop Team
+XSBC-Original-Maintainer: Marco Cabizza
+Uploaders: @GNOME_TEAM@
+Standards-Version: 3.7.3
+Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/gnome-control-center/ubuntu
+Build-Depends: cdbs (>= 0.4.41),
+ gnome-pkg-tools (>= 0.10),
+ dpkg-dev (>= 1.13.19),
+ debhelper (>= 5.0.0),
+ libgtk2.0-dev (>= 2.11.6),
+ libgnomeui-dev (>= 2.16.0-2),
+ intltool (>= 0.35.5),
+ libglade2-dev (>= 2.4.0-1),
+ libgnome-desktop-dev (>= 1:2.24.0-0ubuntu2),
+ zlib1g-dev,
+ flex,
+ libmetacity-dev (>= 1:2.23.1),
+ libxcursor-dev,
+ libbonobo2-dev (>= 2.6.2-6),
+ libnautilus-extension-dev (>= 1:2.21.6),
+ libxrandr-dev,
+ docbook-to-man,
+ libgstreamer0.10-dev (>= 0.10.1.2),
+ libgstreamer-plugins-base0.10-dev (>= 0.10.1.2),
+ autotools-dev,
+ libxss-dev,
+ libxinerama-dev,
+ libxft-dev (>= 2.1.2),
+ libxxf86misc-dev,
+ libxkbfile-dev,
+ libebook1.2-dev (>= 1.7.90),
+ 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 (>= 2.21.4.1),
+ shared-mime-info,
+ libpango1.0-dev (>= 1.17),
+ libgnomekbdui-dev (>= 2.21.4.1),
+ scrollkeeper,
+ libxklavier12-dev (>= 3.6),
+ libeel2-dev,
+ gnome-settings-daemon-dev (>= 2.22.0),
+ libcanberra-gtk-dev
+
+Package: gnome-control-center
+Architecture: any
+Section: gnome
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ capplets-data (>= ${gnome:Version}),
+ capplets-data (<< ${gnome:NextVersion}),
+ libgnome-window-settings1 (= ${binary:Version}),
+ gnome-settings-daemon,
+ gnome-menus (>= 2.12.0),
+ gnome-desktop-data,
+ gnome-icon-theme (>= 2.16),
+ desktop-file-utils,
+ gconf2-common (>= 2.23.2-0ubuntu3),
+ ubuntu-system-service (>= 0.1.10)
+Recommends: bzip2,
+ evolution-data-server,
+ gnome-user-guide,
+ mousetweaks,
+ gnome-session,
+ screen-resolution-extra
+Replaces: capplets
+Conflicts: capplets,
+ gnome-session (<< 2.22.0)
+Suggests: esound-clients,
+ gnome-screensaver | xscreensaver,
+ xbase-clients,
+ gstreamer0.10-alsa | gstreamer0.10-audiosink,
+ xrdb
+Description: utilities to configure the GNOME desktop
+ This package contains configuration applets for the GNOME desktop,
+ allowing to set accessibility configuration, desktop fonts, keyboard
+ and mouse properties, sound setup, desktop theme and background, user
+ interface properties, screen resolution, and other GNOME parameters.
+ .
+ It also contains a front end to these applets, which can also be
+ accessed with the GNOME panel or the Nautilus file manager.
+
+Package: capplets-data
+Architecture: all
+Section: gnome
+Depends: scrollkeeper, ${misc:Depends}
+Recommends: gnome-control-center (>= ${source:Version})
+Description: configuration applets for GNOME 2 - data files
+ This package contains data files (icons, pixmaps, locales files) needed by
+ the configuration applets in the gnome-control-center package.
+
+Package: libgnome-window-settings1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: gnome-control-center (<< 1:2.14.1-1),
+ capplets
+Conflicts: capplets
+Description: Utility library for getting window manager settings
+ This package contains the libwindow-settings library, which is used by
+ the GNOME window managers.
+
+Package: libgnome-window-settings-dev
+Architecture: all
+Section: libdevel
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libgnome-window-settings1 (>= ${source:Version})
+Replaces: gnome-control-center (<< 1:2.14.1-1)
+Description: Utility library for getting window manager settings (headers)
+ This package contains the libwindow-settings library header files.
+
+Package: gnome-control-center-dev
+Architecture: all
+Section: devel
+Conflicts: libgnome-settings-daemon-dev
+Replaces: libgnome-settings-daemon-dev
+Depends: ${misc:Depends}
+Description: utilities to configure the GNOME desktop
+ This package contains the file required to get the keydirs location
+
--- gnome-control-center-2.24.0.1.orig/debian/copyright
+++ gnome-control-center-2.24.0.1/debian/copyright
@@ -0,0 +1,26 @@
+This package was debianized by Jim Pick jim@jimpick.com on
+Sat, 14 Mar 1998 20:12:23 -0800.
+
+It was downloaded from:
+ http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/
+
+Copyright: 1998,99,2000 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
--- gnome-control-center-2.24.0.1.orig/debian/changelog
+++ gnome-control-center-2.24.0.1/debian/changelog
@@ -0,0 +1,2234 @@
+gnome-control-center (1:2.24.0.1-0ubuntu6) intrepid; urgency=low
+
+ * Rebuild due to x11proto-input fix in 283921
+
+ -- Bryce Harrington Sat, 18 Oct 2008 01:30:31 -0700
+
+gnome-control-center (1:2.24.0.1-0ubuntu5) intrepid; urgency=low
+
+ * debian/patches/95_desktop-effects-integration.patch:
+ - change by Bruce Cowan to allow selecting the desktop effects only when
+ the compiz binary is installed (lp: #159996)
+
+ -- Sebastien Bacher Wed, 15 Oct 2008 15:19:28 +0200
+
+gnome-control-center (1:2.24.0.1-0ubuntu4) intrepid; urgency=low
+
+ * debian/patches/28_fixup_touchpad_config.patch: Update to new property API.
+ (LP: #274728)
+ - Don't use XQueryDeviceProperty to determine if a property exists - it is
+ no longer.
+
+ -- William Grant Fri, 10 Oct 2008 19:26:20 +1100
+
+gnome-control-center (1:2.24.0.1-0ubuntu3) intrepid; urgency=low
+
+ * debian/patches/109_screen_resolution_extra.patch:
+ - replace what 106_screen-res-extra-support.patch did with a more
+ polished process (in screen-package.c).
+ * debian/110_screen_resolution_package.patch:
+ - make it possible to use Synaptic to install screen-resolution-extra
+ from xrandr-capplet.c
+ * debian/patches/105_cc-randr12-ubuntu-colors.patch:
+ - remove the patch for good
+ * debian/control.in:
+ - build-depends on libgnome-desktop-dev (>= 1:2.24.0-0ubuntu2)
+
+ -- Alberto Milone (tseliot) Tue, 07 Oct 2008 12:15:08 +0200
+
+gnome-control-center (1:2.24.0.1-0ubuntu2) intrepid; urgency=low
+
+ * debian/patches/51_ubuntu_system_keyboard.patch:
+ - fix crash if the keyboard has no xkb option set (LP: #272280)
+
+ -- Michael Vogt Mon, 29 Sep 2008 11:21:52 +0200
+
+gnome-control-center (1:2.24.0.1-0ubuntu1) intrepid; urgency=low
+
+ * New upstream version
+ * debian/patches/96_gnome_appearance_properties_doesnt_crash.patch:
+ - not required the issue is fixed in the new version
+
+ -- Sebastien Bacher Wed, 24 Sep 2008 21:54:06 +0200
+
+gnome-control-center (1:2.24.0-0ubuntu2) intrepid; urgency=low
+
+ * debian/patches/96_gnome_appearance_properties_doesnt_crash.patch:
+ - don't call refresh_thumbnail using a null value to fix a crasher
+
+ -- Sebastien Bacher Wed, 24 Sep 2008 17:11:20 +0200
+
+gnome-control-center (1:2.24.0-0ubuntu1) intrepid; urgency=low
+
+ * New upstream release
+ * debian/patches/105_cc-randr12-ubuntu-colors.patch:
+ - removed, the code in question disappeared
+ * debian/patches/50_ubuntu_systemwide_prefs.patch:
+ - updated the current glade file
+
+ -- Michael Vogt Tue, 23 Sep 2008 12:12:50 +0200
+
+gnome-control-center (1:2.23.90-0ubuntu12) intrepid; urgency=low
+
+ * debian/patches/50_ubuntu_systemwide_prefs.patch:
+ - fix reseting the proxy environment (LP: #271108)
+
+ -- Michael Vogt Tue, 23 Sep 2008 10:01:28 +0200
+
+gnome-control-center (1:2.23.90-0ubuntu11) intrepid; urgency=low
+
+ [ James Westby ]
+ * debian/patches/50_ubuntu_systemwide_prefs.patch:
+ - fix typo (LP: #269328)
+ * debian/patches/107_rr_NULL_output_name.patch
+ - handle output->name being NULL in on_screen_changed
+ in the xrandr capplet. (LP: #269595)
+
+ [ Michael Vogt ]
+ * debian/control.in:
+ - add missing gconf2-common (>= 2.23.2-0ubuntu3) to ensure
+ that the gconf system default stuff is working
+
+ -- Michael Vogt Sat, 20 Sep 2008 00:09:11 +0200
+
+gnome-control-center (1:2.23.90-0ubuntu10) intrepid; urgency=low
+
+ * debian/patches/50_ubuntu_systemwide_prefs.patch:
+ - run gconf_client_suggest_sync() before calling SetSystem
+ * debian/patches/95_desktop-effects-integration.patch:
+ - update the gconf key to the new gnome-session location
+
+ -- Michael Vogt Thu, 11 Sep 2008 21:34:08 +0200
+
+gnome-control-center (1:2.23.90-0ubuntu9) intrepid; urgency=low
+
+ * debian/patches/50_ubuntu_systemwide_prefs.patch:
+ - make use of the org.gnome.Default.GConf interface
+ - simplify the UI again
+ - add "Reset" button
+ * debian/control.in:
+ - depend on the latest ubuntu-system-service package
+
+ -- Michael Vogt Thu, 11 Sep 2008 20:13:45 +0200
+
+gnome-control-center (1:2.23.90-0ubuntu8) intrepid; urgency=low
+
+ * Rebuild due to the libgnomekbd soname change
+
+ -- Sebastien Bacher Wed, 10 Sep 2008 22:22:06 +0200
+
+gnome-control-center (1:2.23.90-0ubuntu7) intrepid; urgency=low
+
+ * debian/patches/51_ubuntu_system_keyboard.patch:
+ - fix a crash in the new "make system default" keyboard
+ - Use wording "Apply System-Wide..."
+ - update the glade file to match the design by
+ Matthew Paul Thomas
+
+ -- Michael Vogt Wed, 10 Sep 2008 11:22:49 +0200
+
+gnome-control-center (1:2.23.90-0ubuntu6) intrepid; urgency=low
+
+ * move packaging into bzr
+ * cleanup cruft from -0ubuntu1 upload
+ * debian/patches/51_ubuntu_system_keyboard.patch:
+ - add patch that implements the global keyboard spec at
+ https://wiki.ubuntu.com/DefaultKeyboardSettings
+ * debian/control:
+ - add vcs-bzr header
+ - depend on latest ubuntu-system-service package
+
+ -- Michael Vogt Tue, 09 Sep 2008 12:26:40 +0200
+
+gnome-control-center (1:2.23.90-0ubuntu5) intrepid; urgency=low
+
+ * control: Add screen-resolution-extra to Recommends now that it is
+ in main.
+
+ -- Bryce Harrington Thu, 04 Sep 2008 18:14:12 -0700
+
+gnome-control-center (1:2.23.90-0ubuntu4) intrepid; urgency=low
+
+ * debian/patches/28_fixup_touchpad_config.patch: Check for the
+ "Synaptics Off" XInput property to determine if a device is a
+ touchpad. (LP: #207781)
+
+ -- William Grant Sun, 31 Aug 2008 17:06:55 +1000
+
+gnome-control-center (1:2.23.90-0ubuntu3) intrepid; urgency=low
+
+ [Alberto Milone]
+ * patches/106_screen-res-extra-support.patch: Add use of
+ screen-resolution-extra for automatically configuring Virtual
+ setting. (LP: #220563)
+
+ -- Bryce Harrington Fri, 29 Aug 2008 13:09:13 -0700
+
+gnome-control-center (1:2.23.90-0ubuntu2) intrepid; urgency=low
+
+ * 80_aspect_in_dropdown.patch: add aspect ratio to display selection
+ drop-down menu (http://bugzilla.gnome.org/show_bug.cgi?id=549642).
+
+ -- Kees Cook Wed, 27 Aug 2008 14:00:08 -0700
+
+gnome-control-center (1:2.23.90-0ubuntu1) intrepid; urgency=low
+
+ * New upstream version:
+ Appearance:
+ - Make theme installation from GIO-supported sources work (including
+ drag and drop) (Jens Granseuer) (#545335)
+ Default Applications:
+ - Fix custom commands for mail default application (James Westby)
+ Display:
+ - Add a check box to turn on and off display icon (Soren Sandmann)
+ - Draw rotated outputs rotated (Soren Sandmann)
+ General:
+ - Move directory deletion code from appearance capplet into common
+ code (Bastien Nocera)
+ - Make the file transfer dialog work with GFiles instead of gchar
+ paths internally (Jens Granseuer)
+ - Don't set notification theme to "standard" if the metatheme loaded
+ doesn't define one (Jens Granseuer) (#546036)
+ Keybindings:
+ - When trying to assign a shortcut that is already in use, ask the user
+ whether to reassign it instead of refusing to do anything (Denis
+ Washington) (#133318)
+ Shell:
+ - Don't do thumbnailing, let Nautilus do it (Federico Mena Quintero)
+ - Fix a build warning (Cosimo Cecchi) (#544538)
+ Sound:
+ - Remove separate bell settings tab (Bastien Nocera)
+ - Remove libsounds dependency (Bastien Nocera)
+ - Add freedesktop sound theme support through libcanberra (Bastien Nocera)
+ - Fix property passing (Lennart Poettering)
+ - Plug some leaks (Jens Granseuer)
+ - Add some filtering for OSS devices and create more useful device
+ descriptions (Alexander Schwenn) (#545275)
+ Translations:
+ - ar (Djihed Afifi)
+ - es (Jorge Gonzalez)
+ - gl (Ignacio Casal Quinteiro)
+ - nb (Kjartan Maraas)
+ - pt_BR (Leonardo Ferreira Fontenelle)
+ - sv (Daniel Nylander)
+
+ -- Michael Vogt Tue, 19 Aug 2008 12:52:43 +0200
+
+gnome-control-center (1:2.23.6-0ubuntu5) intrepid; urgency=low
+
+ * debian/patches/50_ubuntu_systemwide_prefs.patch:
+ - show system wide defaults
+
+ -- Michael Vogt Tue, 19 Aug 2008 12:36:24 +0200
+
+gnome-control-center (1:2.23.6-0ubuntu4) intrepid; urgency=low
+
+ * debian/patches/50_ubuntu_systemwide_prefs.patch:
+ - add patch to allow setting of the system proxy settings
+ * debian/control:
+ - add depends to ubuntu-system-service dbus backend
+
+ -- Michael Vogt Mon, 18 Aug 2008 18:44:27 +0200
+
+gnome-control-center (1:2.23.6-0ubuntu3) intrepid; urgency=low
+
+ * 95_desktop-effects-integration.patch:
+ - update for the new gnome-session (new gconf location).
+ Thanks to Mehdi Abaakouk (LP: #2536606)
+
+ -- Michael Vogt Mon, 18 Aug 2008 10:55:28 +0200
+
+gnome-control-center (1:2.23.6-0ubuntu2) intrepid; urgency=low
+
+ * debian/capplets-data.gconf-defaults:
+ - don't set a keycode for multimedia keys there, the corresponding schemas
+ is in gnome-settings-daemon now and already has keysyms set
+
+ -- Sebastien Bacher Wed, 13 Aug 2008 23:50:57 +0200
+
+gnome-control-center (1:2.23.6-0ubuntu1) intrepid; urgency=low
+
+ * New upstream version:
+ Appearance:
+ - Make theme installation from GIO-supported sources work (including
+ drag and drop)
+ Default Applications:
+ - Fix custom commands for mail default application (lp: #252253)
+ Display:
+ - Add a check box to turn on and off display icon
+ - Draw rotated outputs rotated
+ General:
+ - Move directory deletion code from appearance capplet into common code
+ - Make the file transfer dialog work with GFiles instead of gchar
+ paths internally
+ - Don't set notification theme to "standard" if the metatheme loaded
+ doesn't define one
+ Keybindings:
+ - When trying to assign a shortcut that is already in use, ask the user
+ whether to reassign it instead of refusing to do anything
+ Shell:
+ - Don't do thumbnailing, let Nautilus do it
+ - Fix a build warning
+ Sound:
+ - Remove separate bell settings tab
+ - Remove libsounds dependency
+ - Add freedesktop sound theme support through libcanberra
+ - Fix property passing
+ - Plug some leaks
+ - Add some filtering for OSS devices and create more useful device
+ descriptions (lp: #252814)
+ * debian/control.in:
+ - build-depends on libcanberra-gtk-dev
+ * debian/patches/90_from_svn_use_gio_for_themes_copies.patch:
+ - the change is in the new version
+ * debian/patches/105_cc-randr12-ubuntu-colors.patch:
+ - change the color only there
+
+ -- Sebastien Bacher Wed, 06 Aug 2008 11:46:57 +0200
+
+gnome-control-center (1:2.23.5-0ubuntu2) intrepid; urgency=low
+
+ * debian/patches/90_from_svn_use_gio_for_themes_copies.patch:
+ - change from svn to fix non local themes installation (lp: #252885)
+
+ -- Sebastien Bacher Wed, 30 Jul 2008 10:07:18 +0200
+
+gnome-control-center (1:2.23.5-0ubuntu1) intrepid; urgency=low
+
+ * New upstream version:
+ General:
+ - Remove VFS methods code
+ - Intltool churn
+ - Use standard icon names from icon naming spec
+ Appearance Capplet:
+ - Don't delete ~/.icons when deleting the last icon theme
+ - Add notification themes to the metatheme format
+ Display Capplet:
+ - New RandR 1.2 based capplet with support for dual screens and stuff.
+ Default Applications:
+ - Use -x instead of -e as exec_flag for Terminator.
+ - Install the default apps list in the default-apps subdirectory
+ - Make it possible for apps to install additional XML files to
+ extend the list of available applications
+ Mouse Capplet:
+ - Decrease lower boundary of dwell delay to 0.2
+ * debian/capplets-data.preinst:
+ - clean the gnomevfs conffile on upgrade
+ * debian/control.in:
+ - updated libgnome-desktop requirement
+ * debian/capplets-data.install, debian/gnome-control-center.install,
+ debian/rules:
+ - updated to the new version changes
+ * debian/patches/101_cc-add-randr12-capplet.patch,
+ debian/patches/102_cc-randr12-makefile.patch,
+ debian/patches/104_cc-randr12-enable-i18n.patch,
+ debian/patches/106_cc-randr12-capplet-icon.patch,
+ debian/patches/107_cc-randr12-check-version.patch,
+ debian/patches/108_cc-randr12-capplet-font-layout.patch,
+ debian/patches/109_cc-randr12-gui-shrinkage.patch,
+ debian/patches/110_cc-randr12-revert-dialog.patch,
+ debian/patches/112_cc-randr12-potfiles.patch,
+ debian/patches/113_cc-randr12-fix-clone-checkbox.patch,
+ debian/patches/113_cc-randr12-remove_g_prints.patch,
+ debian/patches/114_cc-randr12-handle_rw_screen_new_failure.patch,
+ debian/patches/115_cc-randr12-fix-rebuild-gui.patch,
+ debian/patches/116_cc-randr12-handle-screen-NULL-in-on_screen_changed.patch,
+ debian/patches/117_cc-randr12-disable-help-button.patch,
+ debian/patches/118_cc-randr12-translate-extra-strings.patch:
+ - dropped, the new version version has the xrandr capplet now
+
+ -- Sebastien Bacher Fri, 25 Jul 2008 14:56:36 +0200
+
+gnome-control-center (1:2.23.4-0ubuntu2) intrepid; urgency=low
+
+ * debian/control.in:
+ - updated gnome-desktop requirement
+
+ -- Sebastien Bacher Tue, 17 Jun 2008 17:43:53 +0200
+
+gnome-control-center (1:2.23.4-0ubuntu1) intrepid; urgency=low
+
+ * New upstream version:
+ default applications:
+ - Convert to use GConfPropertyEditor and remove a lot of duplicated code in
+ the process
+ - Provide a Tango style application icon
+ typing break:
+ - When postponing a voluntary break, go back to the state before taking the
+ break instead of going to warn state
+ general:
+ - Increased gnome-desktop requirement
+
+ -- Sebastien Bacher Tue, 17 Jun 2008 09:17:15 +0200
+
+gnome-control-center (1:2.23.3-0ubuntu1) intrepid; urgency=low
+
+ * New upstream version:
+ appearance:
+ - Remove the last traces of gnome-vfs
+ - Fix theme deletion
+ - Update to match API changes in gnome-desktop
+ - Fix "zoom" mode
+ - Use URIs instead of paths for drag and drop
+ - Delay creation of the wallaper file chooser for increased startup
+ performance
+ default-applications:
+ - Major refactoring to use GConfPropertyEditor and reduce code duplication
+ keybindings:
+ - Don't use deprecated GTK+ symbol
+ - Add support for editing custom keybindings (create/delete not yet
+ implemented)
+ general:
+ - Remove themus vfs-method
+ - Minor cleanup in capplet-util and gconf-property-editor
+ about-me:
+ - Fix image scaling on the photo button
+ - Fix build on Solaris
+ - Properly handle errors when no icon is available
+ - Fix handling of Home and Work email addresses
+ - Close a memory leak
+ appearance:
+ - Convert some more parts to gio
+ - Show errors for incomplete control themes
+ - Add support for installing missing GTK+ theme engines via PackageKit
+ keyboard:
+ - Don't close the Keyboard Layout Options window when the Help button is
+ clicked
+ - Access keyboard layouts by country or language
+ network;
+ - Drop gnome-vfs dependency
+ sound:
+ - Add support for OSS4 mixers
+ general:
+ - libbackground is no longer needed
+ - Remove iso-codes dependency again
+ - Require libxklavier 3.6
+ - Port theme handling code from gnome-vfs to gio
+ about-me:
+ - Launch the error dialog with the proper parent
+ accessibility:
+ - Add button to launch mouse accessibility properties
+ - Don't show the "accessible login" button if gdmsetup is not available
+ - Open the preferred applications dialog on the a11y page
+ appearance:
+ - Allow the user to revert a font change proposed by a metatheme
+ - Add a custom cell renderer for metatheme names to allow rounded corners on
+ the selection indicator
+ - Replace gnome-vfs with gio
+ - Show a warning message when the selected theme is incomplete
+ default applications:
+ - Add -p/--show-page to open the dialog on a specific page
+ keybindings:
+ - Fix mismatched modifier mapping between egg and GTK
+ - Fix Esc and Backspace being bindable when Caps Lock is on
+ - Get rid of unneeded sort model indirection
+ keyboard:
+ - Fix various string and layout issues
+ mouse:
+ - Add support for starting the capplet on the appearance tab
+ - Remove unused custom widget
+ network:
+ - Renamce "Advanced configuration" tab to "Ignored hosts"
+ sound:
+ - Don't mention esd
+ - Sort mixer devices alphabitically
+ themus:
+ - Handle failed thumbnailing attempts properly
+ windows:
+ - Add "Maximize Vertically" and "Maximize Horizontally"
+ to possible double-click
+ actions
+ - Require metacity <= 2.23.1
+ general:
+ - Figure out where GTK+ expects its theme engines and make
+ that info available to interested capplets
+ - Introduce dependency on iso-codes
+ updated translations
+ * Sync on Debian
+ * debian/control.in:
+ - don't Build-Depends on libslab-dev, type-handling
+ - gnome-control-center recommends mousetweaks
+ - the source name is gnome-control-center now
+ - updated build requirements
+ - updated maintainer information
+ * debian/gnome-control-center.install:
+ - updated nautilus versionning
+ * debian/index.theme:
+ - drop the Debian specific Default theme entry, it's confusing
+ (Ubuntu: #15268).
+ * debian/patches/01_fix_libslab_build.patch:
+ - don't build with the gnome-main-menu libslab for Ubuntu
+ * debian/patches/01_remove_debian_default_applications.patch:
+ - remove the debian specific entries
+ * debian/patches/16_preferred_applications_list_cleanup.patch:
+ - don't list mozilla alternative as "Mozilla Mail"
+ * debian/patches/17_default_applications_firefox_3.patch:
+ - use the correct firefox3 icon
+ * debian/patches/26_add_touchpad_to_mouse_settings.patch:
+ - Recreate touchpad page in glade, the previous file didn't work there
+ for some reason; attempt to make a slight UI improvement in the process.
+ - Add setting to enable/disable touchpad and callbacks to toggle the
+ sensitivity of the other widgets accordingly.
+ * debian/patches/28_fixup_touchpad_config.patch:
+ - add touchpad configuration
+ * debian/patches/71_at_properties_gksudo_gdmsetup.patch:
+ - use gksu to run the gdmsetup command
+ * debian/patches/95_desktop-effects-integration.patch,
+ debian/patches/99_autoreconf.patch,
+ debian/visual-effects_custom.svg,
+ debian/visual-effects_extra.svg,
+ debian/visual-effects_none.svg,
+ debian/visual-effects_normal.svg,
+ debian/rules:
+ - add desktop effects tab to the appearance capplet
+ * debian/patches/97_subpixel_hinting_defaults.patch:
+ - Controversial patch time. Change the default hinting level for
+ subpixel rendering from "Full" to "Slight".
+
+ Rationale: hinting is corrupting the shape of the rendered font to
+ better fix the pixel grid. With subpixel LCD filtering, we have
+ effectively three times the resolution in which to render the font,
+ so there's no need to align them to the pixel grid - indeed, doing
+ that defeats the point of doing things by subpixel at all.
+
+ The outcome of this patch is that the shapes of the fonts will appear
+ much better when using Subpixel rendering. Some people will complain
+ about colour fringing, but those people who can detect subpixel
+ sub-conciously should be using Best Shapes or Best Contrast anyway.
+ * debian/patches/100_at_properties_readd_gksudo_disable_grab_toggle.patch:
+ - "no gksu/disable-grab option per gui in gnome-at-properties"
+ * debian/patches/101_cc-add-randr12-capplet.patch,
+ debian/patches/102_cc-randr12-makefile.patch,
+ debian/patches/104_cc-randr12-enable-i18n.patch,
+ debian/patches/105_cc-randr12-ubuntu-colors.patch,
+ debian/patches/106_cc-randr12-capplet-icon.patch,
+ debian/patches/107_cc-randr12-check-version.patch,
+ debian/patches/108_cc-randr12-capplet-font-layout.patch,
+ debian/patches/109_cc-randr12-gui-shrinkage.patch,
+ debian/patches/110_cc-randr12-revert-dialog.patch,
+ debian/patches/112_cc-randr12-potfiles.patch,
+ debian/patches/113_cc-randr12-fix-clone-checkbox.patch,
+ debian/patches/113_cc-randr12-remove_g_prints.patch,
+ debian/patches/114_cc-randr12-handle_rw_screen_new_failure.patch,
+ debian/patches/115_cc-randr12-fix-rebuild-gui.patch,
+ debian/patches/116_cc-randr12-handle-screen-NULL-in-on_screen_changed.patch,
+ debian/patches/117_cc-randr12-disable-help-button.patch,
+ debian/patches/118_cc-randr12-translate-extra-strings.patch:
+ - new xrandr capplet
+
+ -- Sebastien Bacher Fri, 06 Jun 2008 15:04:15 +0200
+
+control-center (1:2.22.2.1-1) unstable; urgency=low
+
+ [ Josselin Mouette ]
+ * Suggest gstreamer0.10-alsa | gstreamer0.10-audiosink.
+ Closes: #482794.
+
+ [ Sebastian Dröge ]
+ * New upstream bugfix release:
+ + debian/patches/70_relibtoolize.patch:
+ - Updated to apply cleanly again.
+ + debian/rules:
+ - Run touch on every file to fix up timestamps.
+
+ -- Sebastian Dröge Thu, 29 May 2008 10:32:54 +0200
+
+control-center (1:2.22.1-1) unstable; urgency=low
+
+ * New upstream bugfix release:
+ + debian/patches/70_relibtoolize.patch:
+ - Updated for the new version.
+
+ -- Sebastian Dröge Wed, 16 Apr 2008 11:03:33 +0200
+
+control-center (1:2.22.0-2) unstable; urgency=low
+
+ * Upload to unstable.
+ * debian/control.in,
+ debian/gnome-control-center.install:
+ + Use nautilus 2.20 for now.
+
+ -- Sebastian Dröge Wed, 19 Mar 2008 02:14:49 +0100
+
+control-center (1:2.22.0-1) experimental; urgency=low
+
+ * New upstream stable release:
+ + Upload to experimental first because of intrusive changes.
+ + gnome-settings-daemon moved to it's own source package.
+ + Update build dependencies and dependencies.
+
+ -- Sebastian Dröge Sat, 15 Mar 2008 19:06:48 +0100
+
+control-center (1:2.20.3-3) unstable; urgency=low
+
+ [ Josselin Mouette ]
+ * Conflict against gnome-session << 2.20.3-2 because earlier versions
+ require the dbus service file.
+
+ [ Sebastian Dröge ]
+ * debian/control.in:
+ + Build depend on libxklavier12-dev | libxklavier-dev and rebuild against
+ the new soname.
+
+ -- Sebastian Dröge Thu, 28 Feb 2008 10:03:20 +0100
+
+control-center (1:2.20.3-2) unstable; urgency=low
+
+ * capplets-data.install: don’t install the dbus service file, as g-s-d
+ should not be started through dbus.
+ * gnome-keyboard-properties.1:
+ + Fix missing space.
+ + Fix whatis entry.
+ * gnome-control-center.dirs: removed.
+ * Don’t run dh_makeshlibs for g-c-c.
+ * Update menu entry to the latest menu layout.
+
+ -- Josselin Mouette Sat, 16 Feb 2008 14:58:03 +0100
+
+control-center (1:2.20.3-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+ * debian/control.in:
+ + Update Standards-Version to 3.7.3, no additional changes needed.
+ * debian/patches/70_relibtoolize.patch:
+ + Updated for the new version.
+
+ -- Sebastian Dröge Sat, 12 Jan 2008 07:34:06 +0100
+
+control-center (1:2.20.1-2) unstable; urgency=high
+
+ [ Josselin Mouette ]
+ * 30_pkgconfig-path.patch: provide the path to the
+ gnome-settings-daemon binary in the pkgconfig file.
+
+ [ Loic Minier ]
+ * Upload with urgency high as we need this minor change for next
+ gnome-session.
+
+ -- Loic Minier Tue, 27 Nov 2007 13:57:27 +0100
+
+control-center (1:2.20.1-1) unstable; urgency=low
+
+ * New upstream bugfix release:
+ + debian/patches/70_relibtoolize.patch:
+ - Regenerated for the new version.
+
+ -- Sebastian Dröge Thu, 25 Oct 2007 19:45:06 +0200
+
+control-center (1:2.20.0.1-1) unstable; urgency=low
+
+ [ Loic Minier ]
+ * gnome-settings-daemon is in /usr/lib/control-center, not
+ gnome-control-center; closes: #443997.
+ * Drop the version of the scrollkeeper dependency.
+
+ [ Josselin Mouette ]
+ * Run dh_installmime for capplets-data, otherwise cdbs runs it before
+ dh_install.
+
+ [ Sven Arvidsson ]
+ * Add man page for gnome-keyboard-properties (Closes: #345818)
+
+ [ Sebastian Dröge ]
+ * New upstream bugfix release:
+ + debian/patches/70_relibtoolize.patch:
+ - Updated for the new version.
+
+ -- Sebastian Dröge Fri, 05 Oct 2007 08:45:45 +0200
+
+control-center (1:2.20.0-1) unstable; urgency=low
+
+ [ Loic Minier ]
+ * Bump up gnome-icon-theme dep to >= 2.16 for applications-internet etc.
+ * Bump up libpango1.0-dev b-dep to >= 1.17 to help experimental's sbuild to
+ install libgtk2.0-dev >= 2.11.
+
+ [ Sebastian Dröge ]
+ * New upstream release:
+ + debian/patches/27_nobashizms.patch:
+ - Dropped, merged upstream.
+ + 70_relibtoolize.patch:
+ - Updated for the new version.
+ * Upload to unstable, drop check-dist include.
+
+ -- Sebastian Dröge Sat, 22 Sep 2007 11:06:14 +0200
+
+control-center (1:2.19.6-1) experimental; urgency=low
+
+ * New upstream development release; no API change.
+ - Bump up libgtk2.0-dev build-dep to >= 2.11.6.
+ - Relibtoolize.
+ - Drop 99_ltmain_as-needed; fails to apply and not easy to update for me.
+
+ -- Loic Minier Fri, 03 Aug 2007 10:28:44 +0200
+
+control-center (1:2.19.5-2) experimental; urgency=low
+
+ * Update defaults to string type by explicitely quoting them;
+ closes: #432933.
+
+ -- Loic Minier Fri, 13 Jul 2007 11:14:52 +0200
+
+control-center (1:2.19.5-1) experimental; urgency=low
+
+ [ Josselin Mouette ]
+ * capplets-data.gconf-defaults: set the default keybindings, formerly
+ in patches/07_default_keys.patch.
+ * patches/07_default_keys.patch: removed.
+ * 99_ltmain_as-needed.patch: get --as-needed back to work.
+
+ [ Loic Minier ]
+ * Drop DEB_CONFIGURE_LOCALSTATEDIR which seems to be useless since forever.
+ * Drop Marc Dequènes (Duck) from Uploaders; thanks!
+ * Cleanups.
+ * New upstream release series; these are development releases, the API may
+ still change incompatibly; no API change in this release though.
+ - Target at experimental; include check-dist.
+ - Set GNOME_MODULE and update watch and copyright files as the upstream
+ module was renamed to gnome-control-center; update debian/*.install and
+ *.links files for new pathnames.
+ - Update patch 01_fix_libslab_build.
+ - Update patch 02_xrdb to only patch
+ gnome-settings-daemon/gnome-settings-xrdb.c (same as Ubuntu package).
+ - Update patch 09_locate_pointer (from Ubuntu package).
+ - Drop patch 10_eggaccelerators, merged upstream.
+ - Drop patch 15_gconf_peditor which has no documentation and seems
+ completely obsolete.
+ - Update patch 19_extra_keybindings (from the Ubuntu package).
+ - Drop patch 24_theme_dont_require_metacity, deprecated with the new
+ version (from the Ubuntu package).
+ - Drop patch 36-compiz-keybindings-support, deprecated with the new
+ version (from the Ubuntu package).
+ - Update relibtoolizing patch, 70_relibtoolize.
+ - Drop patch 90_workaround_gnome_doc_utils_bug, workaround not required
+ anymore.
+ - Bump up libglib2.0-dev build-dep to >> 2.13.
+ - Drop private icon dir and png pixmaps from capplets-data.install.
+ - Drop gnome-font-properties, gnome-background-properties,
+ gnome-theme-manager, and gnome-ui-properties from
+ gnome-control-center.install.
+ - Add a (libxklavier11-dev >= 3.2) build-dep.
+ - Update GConf defaults for the music and calculator keybindings and bind
+ the rhythmbox command to the default media player.
+ - Install gnome-keybindings.pc in libgnome-settings-daemon-dev.
+ - Misc updates to *.install files.
+ - New patch, 27_nobashizms, fixes a bashism in gnome-at-commandline; found
+ in the Ubuntu package.
+ - Install all files under usr/bin to gnome-control-center to ease handling
+ of its install file.
+
+ -- Loic Minier Tue, 10 Jul 2007 18:55:45 +0200
+
+control-center (1:2.18.1-1) unstable; urgency=low
+
+ [ Marco Cabizza ]
+ * New upstream release:
+ - gswitchit should be working as most of the keyboard-releated stuff
+ has been moved to libgnomekbd ( therefore depending on it ).
+ - dropping 12_sort_entries.patch, 22_bkg_capplet_follow_symlink.patch,
+ and 23_menu_files_conflict.patch due to code reorganisation.
+ - dropping 28_thunderbird-no-compose-flag.patch and
+ 29_iceweasel-icedove-preferred-apps.patch as they're merged upstream.
+ - fixing 02_xrdb.patch for the new upstream.
+ - don't create the libslab* packages, depend on gnome-main-menu's
+ libslab-dev.
+ - don't install the control-center schema as it's provided by slab.
+ * Fixing the .install files.
+
+ [ Riccardo Setti ]
+ * Built with the libslab-dev package provided by gnome-main-menu
+ instead of the libslab shipped in the source
+ - 01_fix_libslab_build.patch
+ * Removed 06_disable_update_mime_at_install.patch. Use
+ --disable-update-mimedb directly from the configure switch.
+ * Updated 04_path_xtra.patch, 02_xrdb.patch
+ * Added 05_autotools.patch
+ * Dropped 30_pulseaudio.patch, merged upstream.
+ * Added 07_default_keys.patch (patch taken from the ubuntu package)
+ * Added 91_from_svn_fix_gstreamer_warning.patch:
+ patch from SVN, "Initialise threads early, and fix option context
+ translation". (patch taken from the ubuntu package)
+
+ [ Loic Minier ]
+ * Drop commented out DEB_BUILDDIR completely; seems useless; cleanups.
+ * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on
+ cdbs >= 0.4.41.
+ * New upstream release has API additions in gnome-settings-client.h, bump up
+ shlibs to >= 2.17.5.
+ * Suggest xrdb.
+ * Bump up intltool build-dep to 0.35.5.
+ * Build-depend on libpango1.0-dev, libgnomekbdui-dev.
+ * Drop build-dep on liborbit2-dev, libxklavier11-dev.
+ * Bump up dep on gnome-menus to >= 2.12.0.
+ * Version the libgnomekbd and libgnomekbdui build-deps to >= 0.1.
+ * New upstream release; no API change in libgnome-window-settings.
+ - Apply update to patch 07_default_keys, found in the Ubuntu package.
+ - Drop patch 91_from_svn_fix_gstreamer_warning, merged upstream.
+ - Rename patch 05_autotools to 70_relibtoolize and update it.
+ - New patch, 90_workaround_gnome_doc_utils_bug, works around a build
+ failure with newer gnome-doc-utils; from the Ubuntu package.
+ * New patch, 36-compiz-keybindings-support, permits configuring keybindings
+ when using compiz as window manager; from the Ubuntu package.
+ * Upload to unstable; drop check-dist include.
+ * Wrap build-deps and deps.
+ * Fix URL in copyright.
+ * Build-depend on scrollkeeper.
+
+ -- Loic Minier Sun, 22 Apr 2007 13:48:12 +0200
+
+control-center (1:2.16.3-1) experimental; urgency=low
+
+ [ Sven Arvidsson ]
+ * New patch, 30_pulseaudio.patch, Polypaudio is now PulseAudio;
+ thanks Mike Hommey.
+
+ [ Loic Minier ]
+ * Merge 1:2.14.2-6 and 1:2.14.2-7; SVN r7995:8671.
+ * New upstream stable release; bug fixes and translations.
+ - Update patch 25_window_manager_settings.
+ - Drop patch 30_null-terminate-font-list, merged upstream.
+ - Update patch 30_pulseaudio.
+ - Build-depend on scrollkeeper.
+
+ -- Loic Minier Sat, 17 Mar 2007 15:49:26 +0100
+
+control-center (1:2.16.2-3) experimental; urgency=low
+
+ * Add a get-orig-source target to retrieve the upstream tarball.
+ * Include the new check-dist Makefile to prevent accidental uploads to
+ unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
+ * Build-depend on libgtk2.0-dev >= 2.10 for multihead support and to build
+ typing-break which uses GtkStatusIcon, par of the 2.10 API.
+ * Bump up libgnomeui-dev build-dep to >= 2.16.0-2 to get a Gtk 2.10
+ transitionned version.
+
+ -- Loic Minier Sun, 4 Feb 2007 13:22:54 +0100
+
+control-center (1:2.16.2-2) experimental; urgency=low
+
+ * Conflict with gnome-session < 2.16.
+
+ -- Josselin Mouette Mon, 27 Nov 2006 20:55:48 +0100
+
+control-center (1:2.16.2-1) experimental; urgency=low
+
+ [ Marco Cabizza ]
+ * New upstream release:
+ - gnome-settings-daemon doesn't crash anymore, hooray! (Closes: #372873)
+ - dropping merged patches 26_ignore_pmu_permissions.patch and 27_bzip2.patch
+ - adapting 19_extra_keybindings.patch
+ * Bumping dependencies: libgtk2.0-dev, libxklavier11-dev, libebook-dev
+ * Build-Depends on hal and dbus
+ * Splitting off some stuff (gnome-window-settings.pc and its headers) into
+ libgnome-window-settings-dev, and thus including the dbus .service in
+ capplets-data
+ * Updated the watch file
+
+ [ Loic Minier ]
+ * Fix watch file to track stable releases and use HTTP.
+
+ [ Josselin Mouette ]
+ * Merge 2.14.2-5.
+ * rules: call clean-la.mk.
+ * Build-depend on gnome-pkg-tools 0.7.
+ * 29_iceweasel-icedove-preferred-apps.patch: remove the tons of
+ useless translations of iceweasel and icedove by themselves.
+
+ -- Josselin Mouette Sun, 26 Nov 2006 21:38:20 +0100
+
+control-center (1:2.14.2-7) unstable; urgency=medium
+
+ * Add a get-orig-source target to retrieve the upstream tarball.
+ * New patch, 30_null-terminate-font-list, fixes crash triggerred by missing
+ NULL terminator in name list; GNOME #356435.
+
+ -- Loic Minier Mon, 26 Feb 2007 11:00:38 +0100
+
+control-center (1:2.14.2-6) unstable; urgency=low
+
+ * Update patch 29_iceweasel-icedove-preferred-apps to drop the -compose
+ flag, as in 28_thunderbird-no-compose-flag.
+
+ -- Loic Minier Mon, 27 Nov 2006 16:52:30 +0100
+
+control-center (1:2.14.2-5) unstable; urgency=low
+
+ * Update patch 29_iceweasel-icedove-preferred-apps to change the mixed case
+ IceWeasel in Iceweasel.
+
+ -- Loic Minier Sat, 25 Nov 2006 13:34:41 +0100
+
+control-center (1:2.14.2-4) unstable; urgency=low
+
+ * New patch, 29_iceweasel-icedove-preferred-apps, to offer IceWeasel and
+ Icedove in the list of preferred applications; thanks Sven Arvidsson;
+ closes: #393549.
+
+ -- Loic Minier Sat, 25 Nov 2006 11:41:26 +0100
+
+control-center (1:2.14.2-3) unstable; urgency=low
+
+ [ Loic Minier ]
+ * New patch, 28_thunderbird-no-compose-flag, to fix the way browsers invoke
+ Thunderbird (drop the -compose flag which is added automatically for
+ mailto: URLs); thanks Manuel Bilderbeek. (Closes: #380284)
+ * Recommend gnome-user-guide instead of gnome2-user-guide; thanks Luk Claes.
+ (Closes: #378718)
+
+ [ Marco Cabizza ]
+ * Set the correct path for bzip2 adding patches/27_bzip2.patch, and
+ Recommends: bzip2, (Closes: #378141)
+
+ [ Josselin Mouette ]
+ * Suggest gnome-screensaver first, xscreensaver second.
+ * Make libgnome-window-settings-dev tolerate binNMUs.
+ * Depend on gnome-pkg-tools 0.6.
+ * Use ${gnome:Version} and ${gnome:NextVersion}.
+ * Call gnome-version.mk in rules.
+
+ -- Josselin Mouette Fri, 1 Sep 2006 21:24:32 +0200
+
+control-center (1:2.14.2-2) unstable; urgency=high
+
+ [ Marco Cabizza ]
+ * debian/control, debian/control.in:
+ - libgnome-window-settings1 replaces capplets (Closes: #372804)
+
+ [ Sjoerd Simons ]
+ * debian/patches/26_ignore_pmu_permissions.patch
+ - Added. Ignore errors when we can't open or use the pmu device for
+ brightness settings. A better fix would be to use hal instead.
+ (Closes: #373146)
+
+ [ Loic Minier ]
+ * Fix versioned dependency of capplets-data on gnome-control-center.
+ * Let libgnome-window-settings1 conflict with capplets too.
+ * Drop capplets Provides.
+
+ -- Loic Minier Fri, 7 Jul 2006 22:28:58 +0200
+
+control-center (1:2.14.2-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control, debian/control.in:
+ - libgnome-window-settings1, libgnome-window-settings-dev Replaces
+ gnome-control-center << 1:2.14.0-1 (Closes: #370211)
+ - New maintainer
+ * compat, libgnome-window-settings1.install, gnome-control-center.install:
+ - Debhelper compatibility is 5
+ - Fixed some missing files errors
+
+ -- Marco Cabizza Sun, 28 May 2006 18:53:48 +0200
+
+control-center (1:2.14.1-1) unstable; urgency=low
+
+ [ Marco Cabizza ]
+ * New upstream release.
+ - fixed the xkb releated bugs (Closes: #348809, #349399, #351798)
+ - evdev doesn't crash gnome-settings-daemon any more
+ (Closes: #362107, #362563)
+ - fixed the gnome-settings-daemon crash at startup (Closes: #347796)
+ * debian/control, debian/control.in:
+ - dropped the dependency on xlibs due to its deprecation and since
+ libxklavier depends on xkb-data (Closes: 342536, #365977)
+ - standards version is 3.7.2
+ - Build-depend on libgtk2.0-dev (>= 2.8.12) and
+ libgstreamer-plugins-base0.10-dev
+ * debian/rules:
+ - append --enable-gstreamer=0.10 to configure
+ * debian/capplets-data.install:
+ - added usr/share/desktop-directories to the list
+ * debian/patches/02_xrdb.patch:
+ - updated to fit upstream
+ * debian/patches/08_pmu_fix.patch:
+ - dropped; already merged upstream
+ * New packages:
+ - Move libgnome-window-settings.so.1 in the newly created
+ libgnome-window-settings1 and add libgnome-window-settings1.shlibs
+ - Move the libwindow-settings' header files in the newly created
+ libgnome-window-settings-dev
+ * debian/patches/25_window_manager_settings.patch:
+ - rename /usr/lib/window-manager-settings to
+ /usr/lib/libgnome-window-settings1.
+
+ [ Josselin Mouette ]
+ * Make the package binNMU-safe.
+ + Build-depend on dpkg-dev 1.13.19.
+ + Use ${source:Version}.
+
+ -- Marco Cabizza Sat, 6 May 2006 17:01:39 +0200
+
+control-center (1:2.12.3-2) unstable; urgency=medium
+
+ * Build-depend on libxrender-dev, libx11-dev, and libxt-dev explicitely as
+ these are used in configure.in, fixes FTBFS.
+ [debian/control, debian/control.in]
+ * Add missing build-deps on libgconf2-dev, libbonoboui2-dev, libesd0-dev,
+ libgnomevfs2-dev, libfontconfig1-dev, libfreetype6-dev, libglib2.0-dev.
+ [debian/control, debian/control.in]
+ * Fix old changelog entries:
+ - Fix the bug number closed in 1:2.12.1-2.
+ - Explain Marillat's joke in 1:2.4.0-8. (Closes: #244288)
+
+ -- Loic Minier Tue, 21 Feb 2006 11:38:12 +0100
+
+control-center (1:2.12.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Recommend evolution-data-server since gnome-about-me seems to require it.
+ (Closes: #340419)
+ [debian/control, debian/control.in]
+
+ -- Loic Minier Mon, 20 Feb 2006 18:27:00 +0100
+
+control-center (1:2.12.2-2) unstable; urgency=low
+
+ [ Gustavo Noronha Silva ]
+ * debian/control.in:
+ - increased debhelper b-dep to >= 4.1.0, because of cdbs
+
+ [ Josselin Mouette ]
+ * Rebuild to get rid of libgamin0 dependency (closes: #348347).
+
+ -- Josselin Mouette Mon, 16 Jan 2006 20:47:30 +0100
+
+control-center (1:2.12.2-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control.in:
+ - removed duplicated build-dep on libgnome-menu-dev, leaving
+ the bigger one (>= 2.12), thanks to Kurt Roeckx
+ for pointing out
+
+ -- Gustavo Noronha Silva Sun, 8 Jan 2006 12:02:37 -0200
+
+control-center (1:2.12.1-2) UNRELEASED; urgency=low
+
+ * Only install /usr/share/applications/*.desktop, not
+ /usr/share/applications in capplets-data, and rm -rf
+ /usr/share/applications/mimeinfo.cache in
+ binary-post-install/capplets-data:: to be completely safe (the
+ update-desktop-database can't be deactivated via configure).
+ (Closes: #346062)
+ [debian/capplets-data.install, debian/rules]
+
+ -- Loic Minier Sat, 7 Jan 2006 15:30:16 +0100
+
+control-center (1:2.12.1-1) experimental; urgency=low
+
+ [ Loic Minier ]
+ * New upstream releases.
+ - Update watch file. [debian/watch]
+ - Don't run scrollkeeper. [debian/rules]
+ - Bump libgtk2.0-dev build-dep to >= 2.6.0.
+ [debian/control, debian/control.in]
+ - Add a libxft-dev build-dep on >= 2.1.2.
+ [debian/control, debian/control.in]
+ - Version libgnome-menu-dev build-dep on >= 2.10.1.
+ [debian/control, debian/control.in]
+ - Enable about-me capplet.
+ . Update configure flags. [debian/rules]
+ . Add libebook1.2-dev build-dep. [debian/control, debian/control.in]
+ - Suggest gnome-screensaver. [debian/control, debian/control.in]
+ * Add CDBS' utils. [debian/rules]
+ * Don't overwrite DEB_CONFIGURE_EXTRA_FLAGS and
+ DEB_INSTALL_MANPAGES_gnome-control-center. [debian/rules]
+
+ [ Sjoerd Simons ]
+ * debian/patches/12_sort_entries.patch
+ - Updated for new upstream
+ * debian/patches/20_gswitchit_dont_crash_when_no_xkb_config.patch
+ - Removed. fixed upstream
+ * debian/patches/22_bkg_capplet_follow_symlink.patch
+ - Updated for new upstream (from the ubuntu package)
+ * debian/patches/23_menu_files_conflict.patch
+ - Update for new upstream
+ * debian/patches/99_reautogenization.patch
+ - Removed
+ * Updated build-depends
+ * Install gnome-about-me and the nautilus extensions
+ * Use upstream versions of gnome-font-viewer.desktop and
+ themus-theme-applier.desktop
+
+ -- Sjoerd Simons Mon, 21 Nov 2005 18:21:32 +0000
+
+control-center (1:2.10.2-1) unstable; urgency=low
+
+ [ Josselin Mouette ]
+ * Use again --as-needed.
+
+ [ Marc Dequènes (Duck) ]
+ * New upstream release.
+ * Applied patch for gnome-font-viewer 'fonts:///' url capability from
+ Sam Morris (Closes: #316188).
+ * Fixed 'Apply theme' contextual entry in 'themes://' (corrected
+ 'debian/themus-theme-applier.desktop') (Closes #298360).
+ * Regenerated and merged reautogenization patches.
+
+ -- Marc Dequènes (Duck) Fri, 30 Sep 2005 15:08:27 +0200
+
+control-center (1:2.10.1-6) unstable; urgency=medium
+
+ * Urgency medium because of FTBFS on sparc and alpha (binutils issue).
+ * Remove --as-needed from LD_FLAGS.
+
+ -- Loic Minier Wed, 10 Aug 2005 12:48:11 +0200
+
+control-center (1:2.10.1-5) unstable; urgency=high
+
+ * Urgency high because of RC bugfix and because this holds the GNOME 2.10
+ transition.
+ * Add missing build-deps on libxss-dev (Closes: #319971) and
+ libxinerama-dev.
+
+ -- Loic Minier Tue, 26 Jul 2005 09:52:43 +0200
+
+control-center (1:2.10.1-4) unstable; urgency=medium
+
+ * Don't overwrite DEB_CONFIGURE_SCRIPT_ENV completely.
+ * 24_theme_dont_require_metacity.patch: make gnome-theme-manager work
+ without metacity being installed (closes: #315730).
+ * Use type-handling's Provides: feature to avoid hacking the control file.
+ * Remove the capplets package, which doesn't have a purpose anymore. Move
+ all package contents back to gnome-control-center.
+ * Remove most Replaces: and Conflicts:, not useful anymore.
+ * Standards-version is 3.6.2.
+
+ -- Josselin Mouette Sat, 25 Jun 2005 19:11:37 +0200
+
+control-center (1:2.10.1-3) unstable; urgency=low
+
+ * Fix menu files conflict (renaming 'preferences.menu' to 'gnome-
+ preferences.menu') (causing control-center summary window to be
+ empty).
+ * Now building in 'debian/build/' directory (cleaner & avoid non-
+ idempotency hackerie).
+ * Updated 'debian/copyright' download URL.
+ * 'debian/rules' spring-cleaning.
+
+ -- Marc Dequènes (Duck) Wed, 15 Jun 2005 00:47:05 +0200
+
+control-center (1:2.10.1-2) unstable; urgency=low
+
+ * Upload to unstable (GNOME Team upload) (Closes: #313217).
+ * Fixed in 2.10 :
+ + crashes at startup when loading settings (Closes: #251126).
+ + installing files from ~/.themes fails (Closes: #166983).
+ + bad icon themes install path (Closes: #257241).
+ + installing bad theme fails silently (Closes: #166982).
+ + incorrect position of volume dialog (Closes: #260277).
+ + cannot turn off sound events (Closes: #216927).
+ and probably some more...
+ * Buildsys not idempotent breaking next build because of missing
+ schema '.in' file worked around in clean rule (GNOME people should
+ really learn to test before releasing...).
+
+ -- Marc Dequènes (Duck) Sun, 12 Jun 2005 19:43:28 +0200
+
+control-center (1:2.10.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/control.in:
+ - Updated build-dependencies
+ * debian/patches:
+ - 01_gnome-default-applications-properties-structs.c.patch: Removed as
+ Debian's default applications are included upstream
+ - 03_gsd_actions_makefile.am.patch: Not more needed
+ - 05_path_xtra-2.patch: Regenerated
+ - 06_disable_update_mime_at_install.patch:
+ - 07_disable_update_mime_at_install-2.patch:
+ Don't call update-desktop-database
+ - 11_sleepkey.patch: patch taken to seb128's package to use gdm-signal
+ - 12_sort_entries.patch: Sort entries in each categories
+ when suspending from keyboard key
+ - 21_show_xkb_warning_one_time.patch: should not be needed anymore
+ - 21_show_xkb_warning_one_time.patch: updated
+ - 17_locate_pointer.patch:
+ - 23_infinite_loop_theme_manager.patch:
+ This upstream version has theses patches
+
+ -- Arnaud Patard Sat, 9 Apr 2005 01:00:12 +0200
+
+control-center (1:2.8.2-3) unstable; urgency=medium
+
+ * 20_gswitchit_dont_crash_when_no_xkb_config.patch:
+ + Reverse a wrong test condition.
+ + Don't check the "options" key (closes: #296434).
+
+ -- Josselin Mouette Thu, 17 Mar 2005 22:28:32 +0100
+
+control-center (1:2.8.2-2) unstable; urgency=low
+
+ * debian/control:
+ - fixes the Build-Depends (Closes: #299753).
+
+ -- Sebastien Bacher Wed, 16 Mar 2005 23:29:27 +0100
+
+control-center (1:2.8.2-1) unstable; urgency=low
+
+ * New upstream version:
+ - Fix theme thumbnailing
+ - Fix widget expansion in the keyboard preferences
+ - Handle backspace in multilayout setups correctly
+ - theme-thumbnailer doesn't require an absolute path
+ * debian/patches:
+ - 05_relibtoolised.patch : Removed as no more accurate
+ - 06_gst-fix.patch: Merged
+ - 14_gst-mixer-grab.patch : Merged
+ - 16_disable_text_editor_tab.patch: Merged
+ - 18_logout.patch: Merged
+ - 04_path_xtra.patch: Updated to patch only the configure.in file. The
+ configure update is now in 05_path_xtra.patch-2.patch
+ - 23_infinite_loop_theme_manager.patch: Forgotten patch in the 2.8.2
+ release
+ * debian/rules:
+ - Pass --as-needed to LDFLAGS to reduce dependencies and removes
+ dependency upon libhowl0. (Closes: 298805)
+ * debian/control.in:
+ - Depends on libgnomeui >= 2.8.1-3 to be sure to remove the dependency on
+ the libhowl0
+
+ -- Arnaud Patard Wed, 9 Mar 2005 23:18:44 +0100
+
+control-center (1:2.8.1-4) unstable; urgency=low
+
+ * debian/patches:
+ - 17_locate_pointer.patch: fix the "locate pointer" when numlock is
+ activated.
+ - 18_logout.patch: fix the logout shortcut (Closes: #289009).
+ - 01_gnome-default-applications-properties-structs.c.patch: Corrected
+ Thunderbird command (Closes: #278762)
+ - Updated 08_pmu_fix.patch with patches from Sjoerd Simons and Sven Luther
+ as a fix for the pmu error message
+ - 19_extra_keybindings.patch: Add bindings for calculator and music
+ multimedia keys (Closes: #291917)
+ - 20_gswitchit_dont_crash_when_no_xkb_config.patch: Patch from kov to
+ prevent crash when used remotely (Closes: #286220)
+ - 21_show_xkb_warning_one_time.patch: Adopt a similar behaviour as for the
+ xmodmap warning (Closes: #287965)
+ - 22_bkg_capplet_follow_symlink.patch: Resolv symlink to generate the
+ thumbnails (Closes: #281657)
+
+ -- Arnaud Patard Sun, 6 Feb 2005 19:13:04 +0100
+
+control-center (1:2.8.1-3) unstable; urgency=low
+
+ * debian/rules:
+ - Corrected erroneous line responsible for not including the .desktop
+ files (Closes: #274401)
+ * debian/patches:
+ - Suppressed 'Text Editor' in the "preferred applications" as it's useless
+ with the new mime type system.
+
+ -- Arnaud Patard Thu, 25 Nov 2004 21:16:04 +0100
+
+control-center (1:2.8.1-2) unstable; urgency=low
+
+ * debian/rules,debian/capplets.install:
+ - Added manually a .desktop for fontilus taken from Gnome's cvs
+ (Closes: #274401)
+ - Added manually a .desktop for themes:///. Thanks to Dan Korostelev
+
+ -- Arnaud Patard Wed, 17 Nov 2004 23:44:21 +0100
+
+control-center (1:2.8.1-1) experimental; urgency=low
+
+ * New upstream release
+ - Some tweaking of the available default applications
+ - Background capplet fixes
+ - keyboard patchs
+ - Patch leak in XKB code
+ - update translations
+ * Update the package with the modifications from the 2.6 package
+ * Added Evolution 2.0 to preferred applications (Closes: 279198)
+ * debian/patches:
+ - Removed 13_drw_monitor.patch
+ - Re-added an updated version of 14_gst-mixer-grab.patch as the bug
+ isn't fixed upstream
+
+ -- Arnaud Patard Tue, 9 Nov 2004 00:24:23 +0100
+
+control-center (1:2.8.0-1) experimental; urgency=low
+
+ * GNOME Team Upload with Rtp's permission.
+ * New upstream release :
+ + fix french typo (Closes: #238387) (or even closed in 2.6).
+ + fix german typo (Closes: #267767)
+ * Removed 07_acme_position.patch and 11_default_app.patch now
+ applied upstream.
+ * Removed part of the 12_custom_browser.patch related to the dead
+ file-types capplet (due to mime system changes).
+ * Corrected 'patch unexpectedly ends in middle of line' in
+ 13_drw_monitor.patch.
+ * Removed 14_gst-mixer-grab.patch recoded upstream.
+ * Updated URL in 'debian/copyright'.
+ * Updated watch file.
+ * 'debian/control.in' : using ${misc:Depends} and updated versions.
+ * Added 'autotools-dev' to build dependencies to take advantage of the
+ CDBS automatic 'config.*' management.
+ * Regenerated relibtoolize patch.
+ * As not (yet) DD i'm not listed as GNOME Team member, so adding
+ myself to Uploaders to avoid this upload to be considered a NMU.
+
+ -- Marc Dequènes (Duck) Wed, 15 Sep 2004 04:20:24 +0200
+
+control-center (1:2.6.1-13) unstable; urgency=low
+
+ * debian/patches:
+ - Added a sanity check on the type of gconf value before calling strcmp in
+ gconf_property_editor (Closes: #272358)
+ - Check that one is on a powerpc with a pmu before reporting that's
+ there is no /dev/pmu in 08_pmu_fix.patch (Closes: #273336)
+ - Updated 01_gnome-default-applications-properties-structs.c.patch to add
+ FireFox and ThunderBird (Closes: #265882)
+ - Added a check on self->priv in 14_gst-mixer-grab.patch in order to
+ provent a crash if something went wrong during initialiastion
+ (Closes: #269429)
+ - Updated 09_locate_pointer.patch XUngrabKeyboard call thanks to Sjoerd
+ Simons (Closes: #275723)
+ * debian/control{,.in},debian/rules:
+ - Patch from Robert Millan to build on kfreebsd-gnu (Closes: #272722)
+
+ -- Arnaud Patard Tue, 12 Oct 2004 13:49:27 +0200
+
+control-center (1:2.6.1-12) unstable; urgency=low
+
+ * debian/patches:
+ - Corrected patch 11_default_app.patch so that it checks the pointer value
+ before calling strlen (Closes: #264288)
+ - Added a patch that close the mixer devices after 4s of inactivity
+ (Closes: #255793)
+
+ -- Arnaud Patard Fri, 13 Aug 2004 12:47:09 +0200
+
+control-center (1:2.6.1-11) unstable; urgency=low
+
+ * debian/patches:
+ - Added a patch for fixing the default applications properties capplet
+ (Closes: #245237)
+ - Added a patch from http://bugzilla.gnome.org/show_bug.cgi?id=123487 for
+ handling http,https, unknow urls with the custom browser setting
+ (Closes: #236297)
+ - Backported a patch from control-center 2.7 for preventing the typing
+ break to starts while watching a movie with totem
+ * debian/control.in:
+ - Updated the libgnomeui-dev build-depends to get gnutls11
+ (Closes: #263609)
+
+ -- Arnaud Patard Thu, 5 Aug 2004 17:46:37 +0200
+
+control-center (1:2.6.1-10) unstable; urgency=low
+
+ * debian/patch
+ - Added a patch so that using the 'locate cursor' mouse option doesn't
+ disable all multimedia keybinding (Closes: #257581)
+ - Corrected the patch for the pmu by suppressing the wrong test, as
+ discussed with upstream (Closes: #258105)
+ - Added a patch from http://bugzilla.gnome.org/show_bug.cgi?id=145271 to
+ ensure that all keysims in shortcuts exists in the keymap (Closes: 254745)
+ * debian
+ - Corrected some errors in the man page.
+
+ -- Arnaud Patard Mon, 12 Jul 2004 23:32:27 +0200
+
+control-center (1:2.6.1-9) unstable; urgency=low
+
+ * debian/patch:
+ - Corrected the patch so that all modified files are in the diff
+ (Closes: #257352)
+ - Modified 06_gst-fix.patch to ensure the usage of the first soundcard on
+ system with multiple soundcards
+
+ -- Arnaud Patard Sat, 3 Jul 2004 12:50:18 +0200
+
+control-center (1:2.6.1-8) unstable; urgency=low
+
+ * debian/capplets-data.install:
+ - Suppressed the line that was reponsible for copying Xresources two times
+ (Closes: #252324).
+ * debian/control.in:
+ - Added libgstreamer-plugins0.8-dev to build-depends
+ - Added some gstreamer sound plugin for the volume keybindings
+ * debian/patch:
+ - Added a patch from Sjoerd Simons to fix the gstreamer volume code
+ (Closes: #251831,#253416)
+ - Added a patch for setting the position of the volume window after
+ showing it (Closes: #254822)
+ - Added a patch for cleaning error messages for /dev/pmu from
+ http://bugzilla.gnome.org/show_bug.cgi?id=132655. It will be merged
+ in 2.7 (Closes: #252460)
+
+ -- Arnaud Patard Thu, 1 Jul 2004 22:16:30 +0200
+
+control-center (1:2.6.1-7) unstable; urgency=high
+
+ * debian/control.in:
+ + removed libgstreamer-plugins0.8-dev from Build-Depends.
+
+ -- Sebastien Bacher Sat, 19 Jun 2004 15:10:37 +0200
+
+control-center (1:2.6.1-6) unstable; urgency=high
+
+ * Rebuilt without gstreamer to try to get control-center in testing fast
+ to fix nautilus' breakage.
+
+ -- Sebastien Bacher Fri, 18 Jun 2004 01:26:12 +0200
+
+control-center (1:2.6.1-5) unstable; urgency=low
+
+ * Rebuilt in a pbuilder, fix the crashe due to linkage with both libxft
+ (Closes: #254076).
+
+ -- Sebastien Bacher Sat, 12 Jun 2004 23:22:42 +0200
+
+control-center (1:2.6.1-4) unstable; urgency=low
+
+ * Gnome Team Upload.
+ * Added a link to the gnome-settings-daemon in /usr/bin (Closes: #251953).
+ * debian/control.in:
+ + Depends on xlibs (Closes: #253287).
+ + Recommends gnome2-user-guide (Closes: #251992).
+
+ -- Sebastien Bacher Thu, 10 Jun 2004 22:28:02 +0200
+
+control-center (1:2.6.1-3) unstable; urgency=low
+
+ * debian/rules :
+ - As gstreamer 0.8 as reached unstable, reactivate the default option to use
+ it with the keybindings.
+ * debian/control.in :
+ - Added build dependency on libgstreamer-plugins0.8-dev
+ - Removes dependency on libgnome-keyring-dev since no more needed.
+ - Added libXrandr-dev as build dependency (Closes: #251429).
+ * debian/patch :
+ - Added a patch for resolving conflictings ALSA_CFLAGS problems (Closes:
+ #249357).
+ - Added a pathc for using Debian's ac_path_xtra
+ - Modified the patch for relibtoolizing
+
+ -- Arnaud Patard Sat, 29 May 2004 18:01:45 +0200
+
+control-center (1:2.6.1-2) unstable; urgency=low
+
+ * GNOME Team Upload.
+ * Upload in unstable.
+
+ -- Sebastien Bacher Wed, 26 May 2004 17:30:32 +0200
+
+control-center (1:2.6.1-1) experimental; urgency=low
+
+ * New upstream release.
+ - Fix uniqueness test for binding special keys with no name
+ - Fix theme manager selection when not running metacity
+ - Match nautilus' interpretation of icons in desktop files
+ - Add Evolution 1.5 and 1.6 to "Preferred Applications" (Closes: #243973).
+ * debian/patches:
+ - Removes patch for keyboards
+ - Updates patch for libtool
+ * debian.control:
+ - Added a dependency on gconf2 for capplets-data (Closes: #243894).
+
+ -- Arnaud Patard Fri, 16 Apr 2004 12:50:54 +0200
+
+control-center (1:2.6.0.3-2) experimental; urgency=low
+
+ * debian/patch:
+ - Added a patch from gnome cvs for fixing issues with multimedia
+ keybindings (see http://bugs.gnome.org/show_bug.cgi?id=139190).
+ - Added a patch to regenerate libtool files.
+
+ -- Arnaud Patard Wed, 7 Apr 2004 01:44:10 +0200
+
+control-center (1:2.6.0.3-1) experimental; urgency=low
+
+ * New upstream release
+ - Fix some keyboard problems
+ (see http://bugzilla.gnome.org/show_bug.cgi?id=138701).
+ * control.in:
+ - Added versionning informations on depend for capplets (needed to ensure
+ having right version of capplets when upgrapding).
+
+ -- Arnaud Patard Sun, 4 Apr 2004 15:39:57 +0200
+
+control-center (1:2.6.0.2-1) experimental; urgency=low
+
+ * New Upstream release.
+ + Disabled GStreamer (as it now depends on it by default and the package
+ is not yet upgraded)
+ * control.in:
+ + Updated dependencies to libnautilus2 2.6.0.
+ + Added a conflict on acme, since it's now a part of control-center
+ + Changed the build dependency on libxrender-dev to libxcursor-dev
+ (Closes #240483)
+
+ -- Arnaud Patard Thu, 1 Apr 2004 00:09:52 +0200
+
+control-center (1:2.5.4-1) experimental; urgency=low
+
+ * New maintainer (Closes: #238876)
+ * New upstream release
+ - fix implicitly conversion (Closes: #226554).
+ - support icon themes now (Closes: #215851).
+ * debian/control.in, debian/rules:
+ - now, it uses cdbs.
+ - adapted for the gnome team packaging.
+ * Modified patch 01_gnome-default-applications-properties-structs.c.patch to
+ fit with new version.
+
+ -- Arnaud Patard Thu, 25 Mar 2004 00:07:35 +0100
+
+control-center (1:2.4.0-9) unstable; urgency=low
+
+ * Debian/control set Maintainer to Debian QA Group
+
+ -- Christian Marillat Sat, 20 Mar 2004 09:34:15 +0100
+
+control-center (1:2.4.0-8) unstable; urgency=low
+
+ * You need
+ * Notes by Loic Minier : the above changelog message was
+ meant to be some sort of joke, a message split between many source
+ packages. No actual change besides orphaning was done in this version.
+ You can read the full story at:
+
+
+ -- Christian Marillat Fri, 19 Mar 2004 15:08:21 +0100
+
+control-center (1:2.4.0-7) unstable; urgency=low
+
+ * debian/control capplets package need to depends on capplets-data (Closes: #237311)
+
+ -- Christian Marillat Thu, 11 Mar 2004 09:07:06 +0100
+
+control-center (1:2.4.0-6) unstable; urgency=low
+
+ * Split the package. The gnome-control-center binary like nautilus is
+ simply a front-end for capplets, thus move all capplets in a separate
+ package (capplets) and add a dependency to 'gnome-control-center |
+ nautilus | gnome-panel' for that package. Also move data files in
+ capplets-data package.
+ * Remove /usr/lib/libgnome-window-settings.{a,la,so},
+ gnome-window-settings-2.0.pc and include files. These files are not
+ needed and should not be packaged (Closes: #221283)
+
+ -- Christian Marillat Sun, 29 Feb 2004 17:40:37 +0100
+
+control-center (1:2.4.0-5) unstable; urgency=low
+
+ * debian/prerm Unregister schemas file from the database.
+ * Patch from bugzilla to fix "symlink" in fontilus (Closes: #231639)
+
+ -- Christian Marillat Thu, 12 Feb 2004 14:35:46 +0100
+
+control-center (1:2.4.0-4) unstable; urgency=low
+
+ * Move Xresources files in /etc/gnome/config and disable all resources.
+
+ -- Christian Marillat Mon, 27 Oct 2003 15:51:37 +0100
+
+control-center (1:2.4.0-3) unstable; urgency=low
+
+ * Update gnome-desktop-data version in Replaces field (Closes: #217284)
+
+ -- Christian Marillat Fri, 24 Oct 2003 18:56:02 +0200
+
+control-center (1:2.4.0-2) unstable; urgency=low
+
+ * Suggest xbase-clients for xrdb
+ * Rebuild to remove liblinc dependency in the -dev package (Closes: #216722)
+ * Don't package .la files for modules (Closes: #182873)
+ * Run libtoolize, I don't know but something is broken in the original tarball.
+
+ -- Christian Marillat Tue, 21 Oct 2003 21:56:55 +0200
+
+control-center (1:2.4.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Conflicts with drwright and fontilus.
+ * Need to Build-Depends on libnautilus2-dev
+ * Add gok and gnopernicus in suggests
+
+ -- Christian Marillat Sat, 18 Oct 2003 16:54:45 +0200
+
+control-center (1:2.2.2-3) unstable; urgency=low
+
+ * debian/control Should suggests xscreensaver (Closes: #212737)
+
+ -- Christian Marillat Fri, 26 Sep 2003 14:39:18 +0200
+
+control-center (1:2.2.2-2) unstable; urgency=low
+
+ * debian/rules fix DEB_BUILD_OPTIONS=noopt (Closes: #199189)
+ * Don't need to depends on xbase-clients
+ * Suggests esound-clients (Closes: #205700)
+ * Create /usr/share/themes/metacity-1 directory to remove warning (Closes: #211182)
+ * Add hack to remove libtool rpath
+ * Add libxrender-dev in Builde-Depends
+
+ -- Christian Marillat Sun, 21 Sep 2003 10:17:00 +0200
+
+control-center (1:2.2.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * New patches :
+ * 02_network-preferences
+ fix range of proxy port (Closes: #195644)
+ * 01_gnome-default-applications-properties-structs.c:
+ add epiphany in ww-browser list (Closes: #192241)
+ * Add icon for Debian menu
+ * Fix linkage bug (Closes: #187368)
+ * debian/control Remove Suggests: xscreensaver-gnome
+
+ -- Christian Marillat Mon, 23 Jun 2003 11:18:45 +0200
+
+control-center (1:2.2.1-2) unstable; urgency=low
+
+ * Update section
+ * Move metacity-properties package in control-center (Closes: #188077)
+
+ -- Christian Marillat Mon, 7 Apr 2003 22:42:55 +0200
+
+control-center (1:2.2.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Christian Marillat Fri, 14 Mar 2003 15:17:56 +0100
+
+control-center (1:2.2.0.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Hack the Icon tag in Advanced.directory (Closes: #179593)
+
+ -- Christian Marillat Wed, 5 Feb 2003 09:49:20 +0100
+
+control-center (1:2.2.0-2) unstable; urgency=low
+
+ * Add flex and autotools-dev in Build-Depends (Closes: #178702)
+ * Move the metacity capplet in a new package metacity-properties
+
+ -- Christian Marillat Thu, 30 Jan 2003 18:40:33 +0100
+
+control-center (1:2.2.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add a default theme. Thanks to Johannes Rohr
+ * Drag and drop for theme work (Closes: #166980)
+ * Themes aren't sorted case-sensitively (Closes: #166981)
+ * Should fix key gnome binding properties and metacity key bindings (Closes: #172380)
+
+ -- Christian Marillat Thu, 23 Jan 2003 16:32:09 +0100
+
+control-center (1:2.0.3.2-3) unstable; urgency=low
+
+ * Remove duplicate advanced-directory.png
+
+ -- Christian Marillat Sat, 18 Jan 2003 11:54:29 +0100
+
+control-center (1:2.0.3.2-2) unstable; urgency=low
+
+ * Use sensible-browser as default browser.
+ * Add replaces with gnome-desktop-data (Closes: #177141, #176977)
+
+ -- Christian Marillat Fri, 17 Jan 2003 16:10:52 +0100
+
+control-center (1:2.0.3.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Christian Marillat Fri, 20 Dec 2002 13:27:59 +0100
+
+control-center (1:2.0.3-2) unstable; urgency=low
+
+ * Should depends on scrollkeeper (Closes: #169850)
+
+ -- Christian Marillat Sun, 24 Nov 2002 16:11:14 +0100
+
+control-center (1:2.0.3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Christian Marillat Sun, 24 Nov 2002 15:27:52 +0100
+
+control-center (1:2.0.2.91-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Christian Marillat Sun, 17 Nov 2002 00:52:21 +0100
+
+control-center (1:2.0.1.1-5) unstable; urgency=low
+
+ * Upload to unstable
+ * Call scrollkeeper-update with -q (Closes: #166625)
+ * New upstream release (Closes: #110004)
+ * keyboard setup are correctly restored (Closes: #156856)
+ * Bugs related to the old interface (Closes: #62491, #81299, #131440, #71042)
+ * No more problem when rescaling an image (Closes: #72602)
+ * Sould build correctly under mips (Closes: #163604)
+ * Can center large image (Closes: #68651)
+
+ -- Christian Marillat Mon, 28 Oct 2002 11:46:53 +0100
+
+control-center (1:2.0.1.1-4) experimental; urgency=low
+
+ * Upload with the new original tarball
+
+ -- Christian Marillat Sun, 29 Sep 2002 17:22:15 +0200
+
+control-center2 (1:2.0.1.1-3) experimental; urgency=low
+
+ * Update package veriosn to 1:2.0.1.1-3 to supersedes the unstable version
+ which is 1:1.4.0.5-6
+
+ -- Christian Marillat Sat, 28 Sep 2002 20:07:45 +0200
+
+control-center2 (2.0.1.1-2) experimental; urgency=low
+
+ * Update to standards version 3.5.7
+ * Upload withtout the 2 suffix
+
+ -- Christian Marillat Sat, 28 Sep 2002 18:05:58 +0200
+
+control-center2 (2.0.1.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * Remove fam from recommends should be in libgnomevfs2-0 package.
+
+ -- Christian Marillat Thu, 22 Aug 2002 15:44:13 +0200
+
+control-center2 (2.0.1-2) experimental; urgency=low
+
+ * Build against the latest libgnomevfs2-dev 2.0.2-4
+
+ -- Christian Marillat Fri, 16 Aug 2002 17:44:03 +0200
+
+control-center2 (2.0.1-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Christian Marillat Wed, 7 Aug 2002 12:33:10 +0200
+
+control-center2 (2.0.0-3) experimental; urgency=low
+
+ * Should recommends fame.
+
+ -- Christian Marillat Thu, 25 Jul 2002 15:28:22 +0200
+
+control-center2 (2.0.0-2) experimental; urgency=low
+
+ * Add x-terminal-emulator in the list of terminal.
+ * Build against the latest libzvt
+
+ -- Christian Marillat Sun, 7 Jul 2002 20:44:23 +0200
+
+control-center2 (2.0.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Add support for DEB_HOST_GNU_TYPE DEB_BUILD_GNU_TYPE and
+ DEB_BUILD_OPTIONS
+
+ -- Christian Marillat Tue, 18 Jun 2002 12:34:40 +0200
+
+control-center2 (1.99.10-2) experimental; urgency=low
+
+ * debian/rules Add GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 in install target.
+ * Install schemas file in postinst.
+ * debian/postinst check if schemas files are present before calling
+ gconftool-2
+ * debian/postrm call scrollkeeper-update with -q
+ * Removed old package in suggests
+ * Update the menu file with the rigth binary name
+
+ -- Christian Marillat Sun, 9 Jun 2002 20:29:30 +0200
+
+control-center2 (1.99.10-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Christian Marillat Sun, 12 May 2002 14:59:06 +0200
+
+control-center2 (1.99.9-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Christian Marillat Tue, 30 Apr 2002 10:47:01 +0200
+
+control-center2 (1.99.7-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Christian Marillat Mon, 22 Apr 2002 18:17:28 +0200
+
+control-center2 (1.99.6-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Christian Marillat Sun, 14 Apr 2002 17:43:36 +0200
+
+control-center2 (1.99.4-3) experimental; urgency=low
+
+ * Need to Depends on gnome-desktop-data
+
+ -- Christian Marillat Wed, 13 Mar 2002 11:17:58 +0100
+
+control-center2 (1.99.4-2) experimental; urgency=low
+
+ * Need to Depends on gnome-session2 (Closes: #137961)
+
+ -- Christian Marillat Wed, 13 Mar 2002 11:05:26 +0100
+
+control-center2 (1.99.4-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Christian Marillat Mon, 11 Mar 2002 14:49:29 +0100
+
+control-center2 (1.99.3-2) experimental; urgency=low
+
+ * Remove duplicate session.desktop file.
+
+ -- Christian Marillat Mon, 25 Feb 2002 18:14:07 +0100
+
+control-center2 (1.99.3-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Christian Marillat Fri, 15 Feb 2002 00:35:49 +0100
+
+control-center2 (1.99.0-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Christian Marillat Sun, 20 Jan 2002 18:08:37 +0100
+
+control-center (1:1.5.11-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Christian Marillat Mon, 17 Dec 2001 17:49:00 +0100
+
+control-center (1:1.5.8-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Christian Marillat Sat, 6 Oct 2001 19:12:41 +0200
+
+control-center (1:1.5.4-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/*.sgml Use docbook 4.1
+
+ -- Christian Marillat Mon, 6 Aug 2001 15:30:44 +0200
+
+control-center (1:1.4.0.1-11) unstable; urgency=low
+
+ * Update config.sub and config.guess (Closes: #103733, #103903)
+ * Remove libtool hack.
+
+ -- Christian Marillat Sun, 8 Jul 2001 11:36:30 +0200
+
+control-center (1:1.4.0.1-10) unstable; urgency=low
+
+ * Switch to debhelper V3
+ * Change the WPrefs location in WindowMaker.desktop (Closes: #101148)
+ * Change libraries versionning to (>= 1:1.4.0.1-6) instead of the latest
+ package number.
+
+ -- Christian Marillat Fri, 22 Jun 2001 16:48:15 +0200
+
+control-center (1:1.4.0.1-9) unstable; urgency=low
+
+ * Rewrote the callbacks.c patch (not complete) (Closes: #98085)
+
+ -- Christian Marillat Sun, 20 May 2001 09:36:48 +0200
+
+control-center (1:1.4.0.1-8) unstable; urgency=low
+
+ * Depends on gnome-bin (Closes: #97677)
+ * Depends on xbase-clients
+
+ -- Christian Marillat Fri, 18 May 2001 00:06:13 +0200
+
+control-center (1:1.4.0.1-7) unstable; urgency=low
+
+ * Patch callbacks.c to reflect change in the new xscreensaver package (3.32-1)
+ and update the suggests field. Thaks to Roderich Schupp. (Closes: #96542)
+
+ -- Christian Marillat Sun, 6 May 2001 22:34:12 +0200
+
+control-center (1:1.4.0.1-6) unstable; urgency=low
+
+ * Build against the latest gnome-libs 1.2.13-5.
+
+ -- Christian Marillat Tue, 24 Apr 2001 12:39:50 +0200
+
+control-center (1:1.4.0.1-5) unstable; urgency=low
+
+ * Typo in build depends (Closes: #93267)
+ * Rewrote Flame.desktop
+
+ -- Christian Marillat Sat, 14 Apr 2001 15:32:28 +0200
+
+control-center (1:1.4.0.1-4) unstable; urgency=low
+
+ * Really add docbook-to-man in build-depends (Closes: #93190)
+ * Replace libungif3g-dev by libungif4-dev in build-depends (Closes: #93197)
+
+ -- Christian Marillat Sat, 7 Apr 2001 12:18:03 +0200
+
+control-center (1:1.4.0.1-3) unstable; urgency=low
+
+ * Remove unused Flame.desktop (Closes: #92850)
+ * Patch po/Makefile.in.in to use DESTDIR
+ * Add scrollkeeper in depends (Closes: #93007)
+
+ -- Christian Marillat Thu, 5 Apr 2001 18:30:35 +0200
+
+control-center (1:1.4.0.1-2) unstable; urgency=low
+
+ * Add docbook-to-man in build-depends (Closes: #92421)
+ * Don't compress control-center.sgml (Closes: #92603)
+ * Call scrollkeeper-update in postinst and prerm for gnome-control-center
+
+ -- Christian Marillat Mon, 2 Apr 2001 21:35:15 +0200
+
+control-center (1:1.4.0.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Write 12 manpages (Closes: #87098)
+
+ -- Christian Marillat Fri, 30 Mar 2001 19:38:51 +0200
+
+control-center (1:1.4.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control build-depends on libgnome-vfs-dev and xml-i18n-tools
+
+ -- Christian Marillat Mon, 19 Mar 2001 11:10:30 +0100
+
+control-center (1:1.2.4-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add libgdk-pixbuf-dev in build-depends (Closes: #87416)
+ * debian/menu The session properties capplet is now on the gnome-core
+ package, remove this menu entry.
+
+ -- Christian Marillat Thu, 8 Mar 2001 00:12:29 +0100
+
+control-center (1:1.2.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Removed locale and callback patchs included by upstream.
+ * No more lockup while closing desktop (Closes: #76215)
+
+ -- Christian Marillat Sun, 18 Feb 2001 15:57:25 +0100
+
+control-center (1:1.2.2-10) unstable; urgency=low
+
+ * Build against the latest gnome-libs 1.2.11
+
+ -- Christian Marillat Mon, 5 Feb 2001 14:53:58 +0100
+
+control-center (1:1.2.2-9) unstable; urgency=low
+
+ * Remove xpm4g-dev from Build-depends (Closes: #82556)
+
+ -- Christian Marillat Wed, 17 Jan 2001 10:04:01 +0100
+
+control-center (1:1.2.2-8) unstable; urgency=low
+
+ * Patch to show the right debian version (Closes: #82391)
+
+ -- Christian Marillat Mon, 15 Jan 2001 15:35:59 +0100
+
+control-center (1:1.2.2-7) unstable; urgency=low
+
+ * Remove imlib-progs from depends. Move gnome-core from depends to Suggests.
+
+ -- Christian Marillat Thu, 30 Nov 2000 11:59:04 +0100
+
+control-center (1:1.2.2-6) unstable; urgency=low
+
+ * Change fonts attribute in callback.dpatch (Closes: #75320)
+ * Install symlinks in /usr/share/doc for -dev package.
+
+ -- Christian Marillat Thu, 2 Nov 2000 17:48:11 +0100
+
+control-center (1:1.2.2-5) unstable; urgency=low
+
+ * Patch all capplets to add a call to setlocale(LC_ALL, "").
+
+ -- Christian Marillat Fri, 20 Oct 2000 15:55:34 +0200
+
+control-center (1:1.2.2-4) unstable; urgency=low
+
+ * Add a patch to display russian and other 8 byte character correctly
+ thanks to ChiDeok Hwang
+ * New version close this old bug (Closes: #58797)
+
+ -- Christian Marillat Wed, 11 Oct 2000 17:54:29 +0200
+
+control-center (1:1.2.2-3) unstable; urgency=low
+
+ * Fix bad symlink in gnome-control-center (Closes: #74279)
+
+ -- Christian Marillat Mon, 9 Oct 2000 15:02:57 +0200
+
+control-center (1:1.2.2-2) unstable; urgency=low
+
+ * Arrange documentation for dhelp.
+
+ -- Christian Marillat Fri, 6 Oct 2000 17:09:54 +0200
+
+control-center (1:1.2.2-1) unstable; urgency=low
+
+ * Return to the 1.2 branch, because 1.3 is ...
+ * Switch to debhelper V2.
+ * New/old GUI (Closes: #71043, #71040, #71039, #71038)
+
+ -- Christian Marillat Mon, 25 Sep 2000 17:33:23 +0200
+
+control-center (1.3.0-5) unstable; urgency=low
+
+ * Add debhelper in Build-Depends (Closes: #70220)
+ * Build against libungif4g (Closes: #71236)
+
+ -- Christian Marillat Sun, 10 Sep 2000 00:48:36 +0200
+
+control-center (1.3.0-4) unstable; urgency=low
+
+ * Patch configure to install session-properties-capplet.
+
+ -- Christian Marillat Thu, 24 Aug 2000 20:35:38 +0200
+
+control-center (1.3.0-3) unstable; urgency=low
+
+ * Install screensaver-properties.desktop in the right place (Closes: #69502).
+ * Install Documents.directory and Session.directory files.
+
+ -- Christian Marillat Mon, 21 Aug 2000 00:59:43 +0200
+
+control-center (1.3.0-2) unstable; urgency=low
+
+ * debian/control Added imlib-progs in the dependencies field (Closes: #69427).
+
+ -- Christian Marillat Sat, 19 Aug 2000 22:31:37 +0200
+
+control-center (1.3.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Christian Marillat Mon, 14 Aug 2000 15:32:43 +0200
+
+control-center (1.2.1-1) unstable; urgency=low
+
+ * New upstrem release.
+ * debian/patches Added 2 patches for IceWM.desktop and WindowMaker.desktop
+ (Closes: #47353, #48099).
+ * New e-mail address.
+ * Removed 2 undocumented manpages (bell-properties-capplet.1, e-conf.1).
+ * Removed property-background patche.
+ * debian/menu removed entry for bell-properties and put all entrys in
+ System/Gnome.
+
+ -- Christian Marillat Wed, 2 Aug 2000 09:03:59 +0200
+
+control-center (1.2.0-2) unstable; urgency=low
+
+ * Updated the Build-depends field. (Closes: #64904)
+
+ -- Christian Marillat Tue, 30 May 2000 10:15:38 +0200
+
+control-center (1.2.0-1) unstable; urgency=low
+
+ * New upstream source (Closes: #64584)
+ * debian/control removed depends libcapplet0 provided by shlibs:Depends.
+ * Updated Standards-Version to 3.1.1.1 added Build-depends field.
+
+ -- Christian Marillat Thu, 25 May 2000 19:21:14 +0200
+
+control-center (1.0.53-1) unstable; urgency=low
+
+ * New upstream source.
+
+ -- Christian Marillat Fri, 31 Mar 2000 11:32:47 +0200
+
+control-center (1.0.51-5) frozen unstable; urgency=low
+
+ * debian/copyright updated to the new directory.
+
+ -- Christian Marillat Wed, 22 Mar 2000 23:17:17 +0100
+
+control-center (1.0.51-4) frozen unstable; urgency=low
+
+ * Apply a patch I wrote to fix the RCB. Closes: #51568
+ * New maintainer. Christian Marillat is taking the package over.
+ I'm sponsoring him for the moment ...
+ * Changed the description. Removed the part about beta software.
+ Closes: #54979
+ * Applied the patch for centering the background picture.
+ Closes: #54285
+ * Added patch-on-the-fly support to debian/rules.
+
+ -- Raphael Hertzog Tue, 21 Mar 2000 20:31:20 +0100
+
+control-center (1.0.51-3) frozen unstable; urgency=low
+
+ * NMU.
+ * Fixes RC bug #56769, WindowMaker wm settings fixed.
+
+ -- Chris McKillop Thu, 3 Feb 2000 07:13:39 -0500
+
+control-center (1.0.51-2) frozen unstable; urgency=low
+
+ * Orphaned.
+
+ -- Michael Alan Dorman Thu, 3 Feb 2000 07:13:29 -0500
+
+control-center (1.0.51-1) unstable; urgency=low
+
+ * Officially claimed as my own.
+ * libcapplet has been stripped for a while (closes: bug#31245)
+ * We've updated... (closes: bug#44136)
+ * Correct xworm definition for screensaver (closes: bug#51514)
+ * The libc/libglib issues are resolved now (closes: bug#37535)
+ * control-center is much more stable, and should work with window-maker (closes: bug#38706)
+ * gnomecc seems to respect current bg color better (closes: bug#38917)
+ * Couldn't reproduce this error with current versions (closes: bug#38995)
+ * Invoking individual capplets seems to work now (closes: bug#39135)
+ * Screensavers seem to be more stable now (closes: bug#41992)
+ * URL handler assignments seems to work now (closes: bug#44983)
+ * Fudged dependency on esd to get rid of versioned depends (closes: bug#52353)
+ * Totally revamped build process (closes: bug#33848, bug#38344)
+ * Appears to have been fixed (closes: bug#33736, bug#33472))
+
+ -- Michael Alan Dorman Mon, 20 Dec 1999 14:19:48 -0500
+
+control-center (1.0.51-0.2) unstable; urgency=low
+
+ * Fix from Christian Marillat for wm-properties
+
+ -- Michael Alan Dorman Tue, 19 Oct 1999 14:22:43 -0400
+
+control-center (1.0.51-0.1) unstable; urgency=low
+
+ * New upstream version. NMU.
+
+ -- Michael Alan Dorman Sun, 10 Oct 1999 16:48:39 -0400
+
+control-center (1.0.50-0.1) unstable; urgency=low
+
+ * New upstream version. NMU
+
+ -- Michael Alan Dorman Thu, 30 Sep 1999 22:24:11 -0400
+
+control-center (1.0.5-2) unstable; urgency=low
+
+ * Actually changed maintainer address in debian/control
+ * Fixed up WindowMaker and IceWM paths for wm-properties
+
+ -- Steve Haslam Thu, 27 May 1999 02:05:10 +0100
+
+control-center (1.0.5-1) unstable; urgency=low
+
+ * New maintainer.
+ * Moved "xscreensaver" to "Suggests:" field. (Bug#32724)
+ * Called dh_strip when making libcapplet-dev
+
+ -- Steve Haslam Thu, 20 May 1999 03:50:25 +0100
+
+control-center (1.0.5-0.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * New upstream version
+
+ -- Steve Haslam Mon, 19 Apr 1999 10:08:13 +0100
+
+control-center (1.0.1-0.1) unstable; urgency=low
+
+ * NMU for GNOME-1.0
+
+ -- Jules Bean Fri, 5 Mar 1999 10:34:56 +0000
+
+control-center (0.99.3-3) unstable; urgency=low
+
+ * Patched to remove #define HAVE_REDHAT_SCREENSAVER_RPM.
+ Also, added Recommends: xscreensaver
+ Fixes: BUG#32462
+
+ -- Jim Pick Wed, 27 Jan 1999 21:40:24 -0800
+
+control-center (0.99.3-2) unstable; urgency=low
+
+ * Recompiled due to dependencies.
+
+ -- Jim Pick Sun, 24 Jan 1999 01:11:12 -0800
+
+control-center (0.99.3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Jim Pick Thu, 21 Jan 1999 21:31:48 -0800
+
+gnome-core (0.30-2) frozen unstable; urgency=low
+
+ * Recompiled with new libs.
+ * Fixed reference to /usr/X11R6 in README.Debian.
+ * Added warnings (Gnome is ALPHA).
+ * Patched dialer_applet to use pon/poff.
+ * Patched drivemount_applet to default to /floppy.
+
+ -- Jim Pick Tue, 24 Nov 1998 10:56:08 -0800
+
+gnome-core (0.30-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Jim Pick Thu, 24 Sep 1998 21:28:02 -0700
+
+gnome-core (0.28.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Hopefully fixes panel applet bug.
+
+ -- Jim Pick Wed, 19 Aug 1998 20:12:25 -0700
+
+gnome-core (0.28-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Jim Pick Mon, 17 Aug 1998 12:59:26 -0700
+
+gnome-core (0.27-1) unstable; urgency=low
+
+ * New upstream release.
+ * Added /usr/doc/gnome
+
+ -- Jim Pick Sat, 15 Aug 1998 14:21:06 -0700
+
+gnome-core (0.25-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Jim Pick Thu, 6 Aug 1998 22:51:22 -0700
+
+gnome-core (0.20-2) unstable; urgency=low
+
+ * Added Debian menu-method for gnome-panel. Fixed Bug #24025
+ (Thanks to Ray Dassen for reporting the bug, and Riku Voipio
+ who wrote the menu method for Gnome 0.12)
+
+ -- Jim Pick Wed, 22 Jul 1998 20:22:00 -0700
+
+gnome-core (0.20-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Jim Pick Mon, 8 Jun 1998 12:00:08 -0700
+
+gnome-core (0.13-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Jim Pick Mon, 16 Mar 1998 15:27:43 -0800
+
+
--- gnome-control-center-2.24.0.1.orig/debian/capplets-data.preinst
+++ gnome-control-center-2.24.0.1/debian/capplets-data.preinst
@@ -0,0 +1,29 @@
+#!/bin/sh
+set -e
+
+rm_conffile() {
+ PKGNAME="$1"
+ CONFFILE="$2"
+ if [ -e "$CONFFILE" ]; then
+ md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+ old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE's/.* //p\"`"
+ if [ "$md5sum" != "$old_md5sum" ]; then
+ echo "Obsolete conffile $CONFFILE has been modified by you."
+ echo "Saving as $CONFFILE.dpkg-bak ..."
+ mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+ else
+ echo "Removing obsolete conffile $CONFFILE ..."
+ rm -f "$CONFFILE"
+ fi
+ fi
+}
+
+case "$1" in
+install|upgrade)
+ if dpkg --compare-versions "$2" le "1:2.23.5-0ubuntu1"; then
+ rm_conffile capplets-data "/etc/gnome-vfs-2.0/modules/font-method.conf"
+ rm_conffile capplets-data "/etc/gnome-vfs-2.0/modules/theme-method.conf"
+ fi
+esac
+
+#DEBHELPER#
--- gnome-control-center-2.24.0.1.orig/debian/visual-effects_custom.svg
+++ gnome-control-center-2.24.0.1/debian/visual-effects_custom.svg
@@ -0,0 +1,767 @@
+
+
+
--- gnome-control-center-2.24.0.1.orig/debian/shlibs.local
+++ gnome-control-center-2.24.0.1/debian/shlibs.local
@@ -0,0 +1 @@
+libgnome-window-settings 1 libgnome-window-settings1 (>= 1:2.17.5)
--- gnome-control-center-2.24.0.1.orig/debian/libgnome-window-settings1.install
+++ gnome-control-center-2.24.0.1/debian/libgnome-window-settings1.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libgnome-window-settings.so.*
+debian/tmp/usr/lib/libgnome-window-settings1/*.so
--- gnome-control-center-2.24.0.1.orig/debian/gnome-control-center.install
+++ gnome-control-center-2.24.0.1/debian/gnome-control-center.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/bin/gnome-control-center
+debian/control-center2.xpm usr/share/pixmaps
+debian/tmp/usr/bin
--- gnome-control-center-2.24.0.1.orig/debian/watch
+++ gnome-control-center-2.24.0.1/debian/watch
@@ -0,0 +1,2 @@
+version=2
+http://ftp.gnome.org/pub/gnome/sources/gnome-control-center/([\d\.]+)[0-9]/gnome-control-center-([\d\.]+)\.tar\.gz
--- gnome-control-center-2.24.0.1.orig/debian/visual-effects_none.svg
+++ gnome-control-center-2.24.0.1/debian/visual-effects_none.svg
@@ -0,0 +1,522 @@
+
+
+
--- gnome-control-center-2.24.0.1.orig/debian/visual-effects_normal.svg
+++ gnome-control-center-2.24.0.1/debian/visual-effects_normal.svg
@@ -0,0 +1,364 @@
+
+
+
--- gnome-control-center-2.24.0.1.orig/debian/gnome-control-center.menu
+++ gnome-control-center-2.24.0.1/debian/gnome-control-center.menu
@@ -0,0 +1,4 @@
+?package(gnome-control-center):needs="X11" section="Applications/System/Administration" \
+ hints="Gnome" title="Gnome Control Center" \
+ icon="/usr/share/pixmaps/control-center2.xpm" \
+ command="/usr/bin/gnome-control-center"
--- gnome-control-center-2.24.0.1.orig/debian/rules
+++ gnome-control-center-2.24.0.1/debian/rules
@@ -0,0 +1,46 @@
+#!/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/utils.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
+include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+GNOME_MODULE := gnome-control-center
+
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-mime-cache \
+ --disable-scrollkeeper \
+ --enable-aboutme \
+ --enable-gstreamer=0.10 \
+ --disable-update-mimedb
+
+DEB_INSTALL_MANPAGES_gnome-control-center += debian/gnome-control-center.1
+
+DEB_DH_MAKESHLIBS_ARGS_gnome-control-center = --no-act
+
+build/gnome-control-center:: $(DEB_INSTALL_MANPAGES_gnome-control-center)
+
+%.1: %.sgml
+ /usr/bin/docbook-to-man $< >$@
+
+pre-build::
+ find . -type f -exec touch '{}' \;
+ find . -type d -exec touch '{}' \;
+
+clean::
+ rm -f $(DEB_INSTALL_MANPAGES_gnome-control-center)
+
+install/capplets-data::
+ cp debian/visual-effects_custom.svg debian/tmp/usr/share/gnome-control-center/pixmaps
+ cp debian/visual-effects_extra.svg debian/tmp/usr/share/gnome-control-center/pixmaps
+ cp debian/visual-effects_none.svg debian/tmp/usr/share/gnome-control-center/pixmaps
+ cp debian/visual-effects_normal.svg debian/tmp/usr/share/gnome-control-center/pixmaps
+
+binary-post-install/capplets-data::
+ rm -rf debian/capplets-data/usr/share/applications/mimeinfo.cache
+ dh_installmime -p$(cdbs_curpkg)
--- gnome-control-center-2.24.0.1.orig/debian/libgnome-settings-daemon-dev.install
+++ gnome-control-center-2.24.0.1/debian/libgnome-settings-daemon-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/include/gnome-settings-daemon-2.0/gnome-settings-daemon/*.h
+debian/tmp/usr/lib/pkgconfig/gnome-settings-daemon.pc
+debian/tmp/usr/share/pkgconfig/gnome-keybindings.pc
--- gnome-control-center-2.24.0.1.orig/debian/capplets-data.install
+++ gnome-control-center-2.24.0.1/debian/capplets-data.install
@@ -0,0 +1,12 @@
+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/default-apps
+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/usr/share/applications/*.desktop
+debian/tmp/usr/share/omf
+debian/tmp/usr/share/desktop-directories
--- gnome-control-center-2.24.0.1.orig/debian/gnome-control-center-dev.install
+++ gnome-control-center-2.24.0.1/debian/gnome-control-center-dev.install
@@ -0,0 +1 @@
+debian/tmp/usr/share/pkgconfig
--- gnome-control-center-2.24.0.1.orig/debian/gnome-keyboard-properties.1
+++ gnome-control-center-2.24.0.1/debian/gnome-keyboard-properties.1
@@ -0,0 +1,54 @@
+.\" Copyright (C) 2007 Sven Arvidsson
+.\"
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2,
+.\" or (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful, but
+.\" WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.\" GNU General Public License for more details.
+.\"
+.\"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.,
+.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+.TH gnome-keyboard-properties 1 "2007\-09\-27" "GNOME"
+.SH NAME
+gnome-keyboard-properties \- manage keyboard behaviour in GNOME
+.SH SYNOPSIS
+.B gnome-keyboard-properties
+.RI [ OPTIONS... ]
+.SH DESCRIPTION
+Keyboard Preferences manages all settings related to the keyboard in a
+GNOME environment. This includes key repeat delay, cursor blinking,
+layouts and layout options. You can also configure a typing break
+which locks the screen and enforces a break from work.
+.SH OPTIONS
+.TP
+.B \-\-apply
+Just apply settings and quit (compatibility only; now handled by daemon)
+.TP
+.B \-\-init\-session\-settings
+Just apply settings and quit (compatibility only; now handled by daemon)
+.TP
+.B \-\-get\-legacy
+Retrieve and store legacy settings
+.TP
+.B \-\-typing-break
+Start the page with the typing break settings showing
+.P
+This program also accepts the standard GNOME and GTK options.
+.SH AUTHORS
+.B gnome-keyboard-properties
+is written by Jonathan Blandford and others.
+.P
+This manual page was written by Sven Arvidsson ,
+for the Debian project (but may be used by others).
+.SH SEE ALSO
+.BR "gtk-options" (7),
+.BR "gnome-options" (7)
+.P
+The online documentation available through the program's
+.I Help
+menu.